132564 2014-05-05 06:45:46 -0700 [CSS Regions] Remove regionLayoutUpdate event 2014-05-09 01:44:25 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED AdobeTracked P2 Normal --- 57312 1 stavila stavila commit-queue esprehn+autocc glenn graouts joepeck kangil.han kondapallykalyan syoichi timothy WebkitBugTracker oldest_to_newest 1006610 0 stavila 2014-05-05 06:45:46 -0700 The regionLayoutUpdate event is deprecated and should be removed. It was replaced by the regionOversetChange event (http://blogs.adobe.com/webplatform/2013/07/15/css-regions-new-working-draft/) 1006638 1 230832 stavila 2014-05-05 09:10:54 -0700 Created attachment 230832 Patch 1006639 2 stavila 2014-05-05 09:11:26 -0700 Latest CSS Regions WD: http://www.w3.org/TR/css3-regions/ 1006687 3 230832 commit-queue 2014-05-05 11:50:23 -0700 Comment on attachment 230832 Patch Clearing flags on attachment: 230832 Committed r168306: <http://trac.webkit.org/changeset/168306> 1006688 4 commit-queue 2014-05-05 11:50:28 -0700 All reviewed patches have been landed. Closing bug. 1007667 5 230832 joepeck 2014-05-08 10:32:40 -0700 Comment on attachment 230832 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230832&action=review To clarify my comments, I only object to a few of the WebInspectorUI changes. The frontend is meant to be backwards compatible with older backends (e.g. iOS 6 and iOS 7). Where possible we should support what the older backends were legitimately capable of doing. Unless something complex changes that would make supporting a legacy case difficult (which I don't believe is the case here), we should strive to maintain backwards compatibility. Eventually if we decide to stop supporting inspecting iOS 7 we can find the COMPATIBILITY comments and remove the associated code. > Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js:-61 > - RegionLayoutUpdated: "dom-tree-manager-region-layout-updated", So this wasn't used? > Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js:-623 > - regionLayoutUpdated: function(flowPayload) > - { > - this._sendNamedFlowUpdateEvents(flowPayload); > - }, These should be left in for legacy. > Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js:-193 > - nameMap.set("webkitregionlayoutupdate", "Region Layout Update"); You could put a COMPATIBILITY comment here. > Source/WebInspectorUI/UserInterface/Protocol/CSSObserver.js:-69 > - regionLayoutUpdated: function(namedFlow) > - { > - WebInspector.domTreeManager.regionLayoutUpdated(namedFlow); > - }, Here in the Observer we should add a comment that this is for legacy only. Something like: // COMPATIBILITY (iOS 7): regionLayoutUpdated has transitioned to regionOversetChanged. > Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json:-2192 > - }, > - { > - "name": "regionLayoutUpdated", > - "parameters": [ > - { "name": "namedFlow", "$ref": "NamedFlow", "description": "The Named Flow whose layout may have changed." } > - ], > - "description": "Fires when a Named Flow's layout may have changed." So technically this still exists in iOS 7 and we should leave it in and handle it for the best debugging experience. 1007926 6 stavila 2014-05-09 01:44:25 -0700 Created https://bugs.webkit.org/show_bug.cgi?id=132731 230832 2014-05-05 09:10:54 -0700 2014-05-08 10:32:40 -0700 Patch 132564.patch text/plain 29863 stavila ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlOTE2ZDBjOC4uNDAxZDc4ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA1 LTA1ICBSYWR1IFN0YXZpbGEgIDxzdGF2aWxhQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NTIFJl Z2lvbnNdIFJlbW92ZSByZWdpb25MYXlvdXRVcGRhdGUgZXZlbnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjU2NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgdGVzdCBmb3IgcmVnaW9uTGF5 b3V0VXBkYXRlIGV2ZW50LgorCisgICAgICAgICogZmFzdC9yZWdpb25zL2F1dG8tc2l6ZS9hdXRv aGVpZ2h0LXJlZ2lvbmxheW91dHVwZGF0ZS1tdWx0aXBsZXRpbWVzLWV4cGVjdGVkLnR4dDogUmVt b3ZlZC4KKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvYXV0by1zaXplL2F1dG9oZWlnaHQtcmVnaW9u bGF5b3V0dXBkYXRlLW11bHRpcGxldGltZXMuaHRtbDogUmVtb3ZlZC4KKwogMjAxNC0wNS0wNSAg QW5kcmVpIEJ1Y3VyICA8YWJ1Y3VyQGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTUmVnaW9uc10g U2xpZGVyIGRpc3BsYXllZCB3cm9uZyBpbiByZWdpb25zCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L3JlZ2lvbnMvYXV0by1zaXplL2F1dG9oZWlnaHQtcmVnaW9ubGF5b3V0dXBkYXRlLW11 bHRpcGxldGltZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL2F1dG8t c2l6ZS9hdXRvaGVpZ2h0LXJlZ2lvbmxheW91dHVwZGF0ZS1tdWx0aXBsZXRpbWVzLWV4cGVjdGVk LnR4dApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNDI5OGY2YS4uMDAwMDAwMAotLS0g YS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvYXV0by1zaXplL2F1dG9oZWlnaHQtcmVnaW9ubGF5 b3V0dXBkYXRlLW11bHRpcGxldGltZXMtZXhwZWN0ZWQudHh0CisrKyAvZGV2L251bGwKQEAgLTEs MTAgKzAsMCBAQAotVGVzdCBmb3IgV2ViS2l0QnVnIDEwMjEwMSBbQ1NTIFJlZ2lvbnNdIHJlZ2lv bmxheW91dHVwZGF0ZSBldmVudCBmaXJlcyBjb250aW51b3VzbHkKLQotT24gc3VjY2VzcywgeW91 IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1Qg Q09NUExFVEUiLgotCi0KLVBBU1MgVGhlIHJlZ2lvbmxheW91dHVwZGF0ZSBmaXJlZCBvbmx5IG9u Y2UuCi1QQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCi0KLVRFU1QgQ09NUExFVEUKLQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL2F1dG8tc2l6ZS9hdXRvaGVpZ2h0 LXJlZ2lvbmxheW91dHVwZGF0ZS1tdWx0aXBsZXRpbWVzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L3JlZ2lvbnMvYXV0by1zaXplL2F1dG9oZWlnaHQtcmVnaW9ubGF5b3V0dXBkYXRlLW11bHRpcGxl dGltZXMuaHRtbApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMzA2NDI3Ny4uMDAwMDAw MAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvYXV0by1zaXplL2F1dG9oZWlnaHQtcmVn aW9ubGF5b3V0dXBkYXRlLW11bHRpcGxldGltZXMuaHRtbAorKysgL2Rldi9udWxsCkBAIC0xLDY1 ICswLDAgQEAKLTwhZG9jdHlwZSBodG1sPgotPGh0bWw+Ci0gICAgPGhlYWQ+Ci0gICAgICAgIDxz Y3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0Pgot ICAgICAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2hlbHBlci5qcyI+PC9zY3JpcHQ+Ci0g ICAgICAgIDxzdHlsZT4KLSAgICAgICAgICAgIC5ub3RWaXNpYmxlIHsgdmlzaWJpbGl0eTogaGlk ZGVuOyB9Ci0gICAgICAgICAgICAuZmxvdyB7IC13ZWJraXQtZmxvdy1pbnRvOiBmbG93OyB9Ci0g ICAgICAgICAgICAjYXJ0aWNsZSB7IHdpZHRoOiA1MHB4OyBoZWlnaHQ6IDUwcHg7IGJhY2tncm91 bmQtY29sb3I6IGdyZWVuOyB9Ci0gICAgICAgICAgICAjcmVnaW9uIHsgLXdlYmtpdC1mbG93LWZy b206IGZsb3c7IH0KLSAgICAgICAgPC9zdHlsZT4KLSAgICA8L2hlYWQ+Ci0gICAgPGJvZHk+Ci0g ICAgICAgIDxkaXYgaWQ9ImV2ZW50Q291bnQiPjwvZGl2PgotICAgICAgICA8ZGl2IGlkPSJhcnRp Y2xlIj48L2Rpdj4KLSAgICAgICAgPGRpdiBpZD0icmVnaW9uIj48L2Rpdj4KLSAgICAgICAgPHNj cmlwdD4KLSAgICAgICAgICAgIGRlc2NyaXB0aW9uKCJUZXN0IGZvciBXZWJLaXRCdWcgMTAyMTAx IFtDU1MgUmVnaW9uc10gcmVnaW9ubGF5b3V0dXBkYXRlIGV2ZW50IGZpcmVzIGNvbnRpbnVvdXNs eSIpOwotCi0gICAgICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKLSAgICAgICAgICAg ICAgICB3aW5kb3cudGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7Ci0gICAgICAgICAgICAgICAgd2lu ZG93LnRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOwotICAgICAgICAgICAgfQotCi0gICAgICAg ICAgICB3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7Ci0KLSAgICAgICAgICAgIHZhciBldmVu dERpc3BhdGNoQ291bnQgPSAwOwotICAgICAgICAgICAgdmFyIHRpbWVvdXRJRDsKLQotICAgICAg ICAgICAgZnVuY3Rpb24gZmxvd1RocmVhZFVwZGF0ZWQoZXZlbnQpIHsKLSAgICAgICAgICAgICAg ICBpZiAoKytldmVudERpc3BhdGNoQ291bnQgPiAxKSB7Ci0gICAgICAgICAgICAgICAgICAgIGVu ZFRlc3QoKTsKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgICAgIH0K LQotICAgICAgICAgICAgICAgIC8vIFVwZGF0aW5nIHRoZSBjb250ZW50IG9mIGV2ZW50Q291bnQg ZWxlbWVudCBzaG91bGQgbm90IHRyaWdnZXIgYSBsYXlvdXQKLSAgICAgICAgICAgICAgICAvLyBv biB0aGUgYXV0by1oZWlnaHQgcmVnaW9uLgotICAgICAgICAgICAgICAgIGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJldmVudENvdW50IikudGV4dENvbnRlbnQgPSBldmVudERpc3BhdGNoQ291bnQ7 Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGZ1bmN0aW9uIHN0YXJ0VGVzdCgpIHsKLSAg ICAgICAgICAgICAgICBnZXRGbG93QnlOYW1lKCJmbG93IikuYWRkRXZlbnRMaXN0ZW5lcigid2Vi a2l0cmVnaW9ubGF5b3V0dXBkYXRlIiwgZmxvd1RocmVhZFVwZGF0ZWQpOwotICAgICAgICAgICAg ICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJhcnRpY2xlIikuY2xhc3NOYW1lID0gImZsb3ci OwotICAgICAgICAgICAgICAgIHRpbWVvdXRJRCA9IHdpbmRvdy5zZXRUaW1lb3V0KGVuZFRlc3Qs IDUwMCk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGZ1bmN0aW9uIGVuZFRlc3QoKSB7 Ci0gICAgICAgICAgICAgICAgd2luZG93LmNsZWFyVGltZW91dCh0aW1lb3V0SUQpOwotICAgICAg ICAgICAgICAgIGdldEZsb3dCeU5hbWUoImZsb3ciKS5yZW1vdmVFdmVudExpc3RlbmVyKCJ3ZWJr aXRyZWdpb25sYXlvdXR1cGRhdGUiLCBmbG93VGhyZWFkVXBkYXRlZCk7Ci0KLSAgICAgICAgICAg ICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZXZlbnRDb3VudCIpLmNsYXNzTmFtZSA9ICJu b3RWaXNpYmxlIjsKLSAgICAgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVn aW9uIikuY2xhc3NOYW1lID0gIm5vdFZpc2libGUiOwotCi0gICAgICAgICAgICAgICAgaWYgKGV2 ZW50RGlzcGF0Y2hDb3VudCA+IDEpCi0gICAgICAgICAgICAgICAgICAgIGRlYnVnKCJGQUlMIFRo ZSByZWdpb25sYXlvdXR1cGRhdGUgZXZlbnQgZmlyZWQgdHdpY2UgaW5zdGVhZCBvZiBvbmNlLiIp Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBkZWJ1ZygiUEFTUyBU aGUgcmVnaW9ubGF5b3V0dXBkYXRlIGZpcmVkIG9ubHkgb25jZS4iKTsKLSAgICAgICAgICAgICAg ICBmaW5pc2hKU1Rlc3QoKTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgd2luZG93LmFk ZEV2ZW50TGlzdGVuZXIoImxvYWQiLCBzdGFydFRlc3QpOwotPC9zY3JpcHQ+Ci08c2NyaXB0IHNy Yz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Ci08L2JvZHk+ Ci08L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGY4N2Q5Mi4uN2Q4NzBiMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDQ1IEBACisyMDE0LTA1LTA1ICBSYWR1IFN0YXZpbGEgIDxzdGF2aWxhQGFkb2JlLmNv bT4KKworICAgICAgICBbQ1NTIFJlZ2lvbnNdIFJlbW92ZSByZWdpb25MYXlvdXRVcGRhdGUgZXZl bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjU2 NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBy ZWdpb25MYXlvdXRVcGRhdGUgZXZlbnQgd2FzIHJlbW92ZWQgZnJvbSB0aGUgcmVnaW9ucyBzcGVj IGFuZCB3YXMgcmVwbGFjZWQgYnkgdHdvIG90aGVyIGV2ZW50czogCisgICAgICAgIHJlZ2lvbk92 ZXJzZXRDaGFuZ2UgYW5kIHJlZ2lvbkZyYWdtZW50Q2hhbmdlLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyBuZWVkZWQsIHRoaXMgcGF0Y2ggcmVtb3ZlcyBhIGZlYXR1cmUuCisKKyAgICAgICAgKiBk b20vRXZlbnROYW1lcy5oOgorICAgICAgICAqIGRvbS9XZWJLaXROYW1lZEZsb3cuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6V2ViS2l0TmFtZWRGbG93OjpkaXNwYXRjaFJlZ2lvbkxheW91dFVwZGF0 ZUV2ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKiBkb20vV2ViS2l0TmFtZWRGbG93Lmg6CisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckNTU0FnZW50OjpyZXNldE5vblBlcnNpc3RlbnREYXRhKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckNTU0FnZW50Ojp3aWxsUmVtb3ZlTmFtZWRGbG93KToKKyAgICAgICAg KFdlYkNvcmU6OlVwZGF0ZVJlZ2lvbkxheW91dFRhc2s6OlVwZGF0ZVJlZ2lvbkxheW91dFRhc2sp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6VXBkYXRlUmVnaW9uTGF5b3V0VGFzazo6c2No ZWR1bGVGb3IpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6VXBkYXRlUmVnaW9uTGF5b3V0 VGFzazo6dW5zY2hlZHVsZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpVcGRhdGVSZWdp b25MYXlvdXRUYXNrOjpyZXNldCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpVcGRhdGVS ZWdpb25MYXlvdXRUYXNrOjp0aW1lckZpcmVkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckNTU0FnZW50OjpkaWRVcGRhdGVSZWdpb25MYXlvdXQpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ1NTQWdlbnQ6OnJlZ2lvbkxheW91dFVwZGF0ZWQpOiBE ZWxldGVkLgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDU1NBZ2VudC5oOgorICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRVcGRhdGVSZWdpb25MYXlvdXRJbXBs KTogRGVsZXRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u Lmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFVwZGF0 ZVJlZ2lvbkxheW91dCk6IERlbGV0ZWQuCisgICAgICAgICogaW5zcGVjdG9yL3Byb3RvY29sL0NT Uy5qc29uOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dGcmFnbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJOYW1lZEZsb3dGcmFnbWVudDo6dXBkYXRlT3ZlcnNl dFN0YXRlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93VGhyZWFkLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck5hbWVkRmxvd1RocmVhZDo6UmVuZGVyTmFtZWRGbG93 VGhyZWFkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck5hbWVkRmxvd1RocmVhZDo6cmVtb3Zl UmVnaW9uRnJvbVRocmVhZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJOYW1lZEZsb3dUaHJl YWQ6OmxheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OmRp c3BhdGNoUmVnaW9uTGF5b3V0VXBkYXRlRXZlbnRJZk5lZWRlZCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OnJlZ2lvbkxheW91dFVwZGF0ZUV2ZW50 VGltZXJGaXJlZCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxv d1RocmVhZC5oOgorCiAyMDE0LTA1LTA1ICBBbmRyZWkgQnVjdXIgIDxhYnVjdXJAYWRvYmUuY29t PgogCiAgICAgICAgIFtDU1NSZWdpb25zXSBTbGlkZXIgZGlzcGxheWVkIHdyb25nIGluIHJlZ2lv bnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudE5hbWVzLmggYi9Tb3VyY2Uv V2ViQ29yZS9kb20vRXZlbnROYW1lcy5oCmluZGV4IDk3MmI4NjEuLjNiNjg1NjcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudE5hbWVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL0V2ZW50TmFtZXMuaApAQCAtMjYxLDggKzI2MSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICBtYWNybyh3ZWJraXRwb2ludGVybG9ja2NoYW5nZSkgXAogICAgIG1hY3JvKHdlYmtpdHBv aW50ZXJsb2NrZXJyb3IpIFwKICAgICBcCi0gICAgbWFjcm8od2Via2l0cmVnaW9ubGF5b3V0dXBk YXRlKSBcCi0gICAgXAogICAgIG1hY3JvKHdlYmtpdHJlZ2lvbm92ZXJzZXRjaGFuZ2UpIFwKICAg ICBcCiAgICAgbWFjcm8od2Via2l0bmV0d29ya2luZm9jaGFuZ2UpIFwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9XZWJLaXROYW1lZEZsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L1dlYktpdE5hbWVkRmxvdy5jcHAKaW5kZXggZTA5YTk5OC4uYWMxNGIwOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL1dlYktpdE5hbWVkRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvZG9tL1dlYktpdE5hbWVkRmxvdy5jcHAKQEAgLTIwOCwxNyArMjA4LDYgQEAgdm9pZCBXZWJL aXROYW1lZEZsb3c6OnNldFJlbmRlcmVyKFJlbmRlck5hbWVkRmxvd1RocmVhZCogcGFyZW50Rmxv d1RocmVhZCkKICAgICBtX3BhcmVudEZsb3dUaHJlYWQgPSBwYXJlbnRGbG93VGhyZWFkOwogfQog Ci12b2lkIFdlYktpdE5hbWVkRmxvdzo6ZGlzcGF0Y2hSZWdpb25MYXlvdXRVcGRhdGVFdmVudCgp Ci17Ci0gICAgQVNTRVJUKCFOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnREaXNwYXRj aEZvcmJpZGRlbigpKTsKLQotICAgIC8vIElmIHRoZSBmbG93IGlzIGluIHRoZSAiTlVMTCIgc3Rh dGUgdGhlIGV2ZW50IHNob3VsZCBub3QgYmUgZGlzcGF0Y2hlZCBhbnkgbW9yZS4KLSAgICBpZiAo Zmxvd1N0YXRlKCkgPT0gRmxvd1N0YXRlTnVsbCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgZGlz cGF0Y2hFdmVudChVSUV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLndlYmtpdHJlZ2lvbmxheW91 dHVwZGF0ZUV2ZW50LCBmYWxzZSwgZmFsc2UsIG1fZmxvd01hbmFnZXItPmRvY3VtZW50KCktPmRl ZmF1bHRWaWV3KCksIDApKTsKLX0KLSAgICAKIHZvaWQgV2ViS2l0TmFtZWRGbG93OjpkaXNwYXRj aFJlZ2lvbk92ZXJzZXRDaGFuZ2VFdmVudCgpCiB7CiAgICAgQVNTRVJUKCFOb0V2ZW50RGlzcGF0 Y2hBc3NlcnRpb246OmlzRXZlbnREaXNwYXRjaEZvcmJpZGRlbigpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9XZWJLaXROYW1lZEZsb3cuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9X ZWJLaXROYW1lZEZsb3cuaAppbmRleCA2YjE2MjVlLi5lNWY0MzE4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vV2ViS2l0TmFtZWRGbG93LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L1dlYktpdE5hbWVkRmxvdy5oCkBAIC03OCw3ICs3OCw2IEBAIHB1YmxpYzoKIAogICAgIEZsb3dT dGF0ZSBmbG93U3RhdGUoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudEZsb3dUaHJlYWQgPyBGbG93 U3RhdGVDcmVhdGVkIDogRmxvd1N0YXRlTnVsbDsgfQogCi0gICAgdm9pZCBkaXNwYXRjaFJlZ2lv bkxheW91dFVwZGF0ZUV2ZW50KCk7CiAgICAgdm9pZCBkaXNwYXRjaFJlZ2lvbk92ZXJzZXRDaGFu Z2VFdmVudCgpOwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckNTU0FnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDU1NBZ2VudC5jcHAKaW5kZXggNjg4Y2NjOS4uMDZlNTRmYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuY3BwCkBAIC0xMDUsNjcgKzEwNSw2 IEBAIHN0YXRpYyB1bnNpZ25lZCBjb21wdXRlUHNldWRvQ2xhc3NNYXNrKEluc3BlY3RvckFycmF5 KiBwc2V1ZG9DbGFzc0FycmF5KQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLWNsYXNzIFVwZGF0 ZVJlZ2lvbkxheW91dFRhc2sgewotcHVibGljOgotICAgIFVwZGF0ZVJlZ2lvbkxheW91dFRhc2so SW5zcGVjdG9yQ1NTQWdlbnQqKTsKLSAgICB2b2lkIHNjaGVkdWxlRm9yKFdlYktpdE5hbWVkRmxv dyosIGludCBkb2N1bWVudE5vZGVJZCk7Ci0gICAgdm9pZCB1bnNjaGVkdWxlKFdlYktpdE5hbWVk RmxvdyopOwotICAgIHZvaWQgcmVzZXQoKTsKLSAgICB2b2lkIHRpbWVyRmlyZWQoVGltZXI8VXBk YXRlUmVnaW9uTGF5b3V0VGFzaz4mKTsKLQotcHJpdmF0ZToKLSAgICBJbnNwZWN0b3JDU1NBZ2Vu dCogbV9jc3NBZ2VudDsKLSAgICBUaW1lcjxVcGRhdGVSZWdpb25MYXlvdXRUYXNrPiBtX3RpbWVy OwotICAgIEhhc2hNYXA8V2ViS2l0TmFtZWRGbG93KiwgaW50PiBtX25hbWVkRmxvd3M7Ci19Owot Ci1VcGRhdGVSZWdpb25MYXlvdXRUYXNrOjpVcGRhdGVSZWdpb25MYXlvdXRUYXNrKEluc3BlY3Rv ckNTU0FnZW50KiBjc3NBZ2VudCkKLSAgICA6IG1fY3NzQWdlbnQoY3NzQWdlbnQpCi0gICAgLCBt X3RpbWVyKHRoaXMsICZVcGRhdGVSZWdpb25MYXlvdXRUYXNrOjp0aW1lckZpcmVkKQotewotfQot Ci12b2lkIFVwZGF0ZVJlZ2lvbkxheW91dFRhc2s6OnNjaGVkdWxlRm9yKFdlYktpdE5hbWVkRmxv dyogbmFtZWRGbG93LCBpbnQgZG9jdW1lbnROb2RlSWQpCi17Ci0gICAgbV9uYW1lZEZsb3dzLmFk ZChuYW1lZEZsb3csIGRvY3VtZW50Tm9kZUlkKTsKLQotICAgIGlmICghbV90aW1lci5pc0FjdGl2 ZSgpKQotICAgICAgICBtX3RpbWVyLnN0YXJ0T25lU2hvdCgwKTsKLX0KLQotdm9pZCBVcGRhdGVS ZWdpb25MYXlvdXRUYXNrOjp1bnNjaGVkdWxlKFdlYktpdE5hbWVkRmxvdyogbmFtZWRGbG93KQot ewotICAgIG1fbmFtZWRGbG93cy5yZW1vdmUobmFtZWRGbG93KTsKLX0KLQotdm9pZCBVcGRhdGVS ZWdpb25MYXlvdXRUYXNrOjpyZXNldCgpCi17Ci0gICAgbV90aW1lci5zdG9wKCk7Ci0gICAgbV9u YW1lZEZsb3dzLmNsZWFyKCk7Ci19Ci0KLXZvaWQgVXBkYXRlUmVnaW9uTGF5b3V0VGFzazo6dGlt ZXJGaXJlZChUaW1lcjxVcGRhdGVSZWdpb25MYXlvdXRUYXNrPiYpCi17Ci0gICAgLy8gVGhlIHRp bWVyIGlzIHN0b3BwZWQgb24gbV9jc3NBZ2VudCBkZXN0cnVjdGlvbiwgc28gdGhpcyBtZXRob2Qg d2lsbCBuZXZlciBiZSBjYWxsZWQgYWZ0ZXIgbV9jc3NBZ2VudCBoYXMgYmVlbiBkZXN0cm95ZWQu Ci0gICAgVmVjdG9yPHN0ZDo6cGFpcjxXZWJLaXROYW1lZEZsb3cqLCBpbnQ+PiBuYW1lZEZsb3dz OwotCi0gICAgZm9yIChIYXNoTWFwPFdlYktpdE5hbWVkRmxvdyosIGludD46Oml0ZXJhdG9yIGl0 ID0gbV9uYW1lZEZsb3dzLmJlZ2luKCksIGVuZCA9IG1fbmFtZWRGbG93cy5lbmQoKTsgaXQgIT0g ZW5kOyArK2l0KQotICAgICAgICBuYW1lZEZsb3dzLmFwcGVuZChzdGQ6Om1ha2VfcGFpcihpdC0+ a2V5LCBpdC0+dmFsdWUpKTsKLQotICAgIGZvciAodW5zaWduZWQgaSA9IDAsIHNpemUgPSBuYW1l ZEZsb3dzLnNpemUoKTsgaSA8IHNpemU7ICsraSkgewotICAgICAgICBXZWJLaXROYW1lZEZsb3cq IG5hbWVkRmxvdyA9IG5hbWVkRmxvd3MuYXQoaSkuZmlyc3Q7Ci0gICAgICAgIGludCBkb2N1bWVu dE5vZGVJZCA9IG5hbWVkRmxvd3MuYXQoaSkuc2Vjb25kOwotCi0gICAgICAgIGlmIChtX25hbWVk Rmxvd3MuY29udGFpbnMobmFtZWRGbG93KSkgewotICAgICAgICAgICAgbV9jc3NBZ2VudC0+cmVn aW9uTGF5b3V0VXBkYXRlZChuYW1lZEZsb3csIGRvY3VtZW50Tm9kZUlkKTsKLSAgICAgICAgICAg IG1fbmFtZWRGbG93cy5yZW1vdmUobmFtZWRGbG93KTsKLSAgICAgICAgfQotICAgIH0KLQotICAg IGlmICghbV9uYW1lZEZsb3dzLmlzRW1wdHkoKSAmJiAhbV90aW1lci5pc0FjdGl2ZSgpKQotICAg ICAgICBtX3RpbWVyLnN0YXJ0T25lU2hvdCgwKTsKLX0KLQogY2xhc3MgQ2hhbmdlUmVnaW9uT3Zl cnNldFRhc2sgewogcHVibGljOgogICAgIENoYW5nZVJlZ2lvbk92ZXJzZXRUYXNrKEluc3BlY3Rv ckNTU0FnZW50Kik7CkBAIC01NDEsOCArNDgwLDYgQEAgdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6 cmVzZXQoKQogdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6cmVzZXROb25QZXJzaXN0ZW50RGF0YSgp CiB7CiAgICAgbV9uYW1lZEZsb3dDb2xsZWN0aW9uc1JlcXVlc3RlZC5jbGVhcigpOwotICAgIGlm IChtX3VwZGF0ZVJlZ2lvbkxheW91dFRhc2spCi0gICAgICAgIG1fdXBkYXRlUmVnaW9uTGF5b3V0 VGFzay0+cmVzZXQoKTsKICAgICBpZiAobV9jaGFuZ2VSZWdpb25PdmVyc2V0VGFzaykKICAgICAg ICAgbV9jaGFuZ2VSZWdpb25PdmVyc2V0VGFzay0+cmVzZXQoKTsKICAgICByZXNldFBzZXVkb1N0 YXRlcygpOwpAQCAtNTgwLDM3ICs1MTcsMTIgQEAgdm9pZCBJbnNwZWN0b3JDU1NBZ2VudDo6d2ls bFJlbW92ZU5hbWVkRmxvdyhEb2N1bWVudCogZG9jdW1lbnQsIFdlYktpdE5hbWVkRmxvdyoKICAg ICBpZiAoIWRvY3VtZW50Tm9kZUlkKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV91cGRh dGVSZWdpb25MYXlvdXRUYXNrKQotICAgICAgICBtX3VwZGF0ZVJlZ2lvbkxheW91dFRhc2stPnVu c2NoZWR1bGUobmFtZWRGbG93KTsKLQogICAgIGlmIChtX2NoYW5nZVJlZ2lvbk92ZXJzZXRUYXNr KQogICAgICAgICBtX2NoYW5nZVJlZ2lvbk92ZXJzZXRUYXNrLT51bnNjaGVkdWxlKG5hbWVkRmxv dyk7CiAKICAgICBtX2Zyb250ZW5kRGlzcGF0Y2hlci0+bmFtZWRGbG93UmVtb3ZlZChkb2N1bWVu dE5vZGVJZCwgbmFtZWRGbG93LT5uYW1lKCkuc3RyaW5nKCkpOwogfQogCi12b2lkIEluc3BlY3Rv ckNTU0FnZW50OjpkaWRVcGRhdGVSZWdpb25MYXlvdXQoRG9jdW1lbnQqIGRvY3VtZW50LCBXZWJL aXROYW1lZEZsb3cqIG5hbWVkRmxvdykKLXsKLSAgICBpbnQgZG9jdW1lbnROb2RlSWQgPSBkb2N1 bWVudE5vZGVXaXRoUmVxdWVzdGVkRmxvd3NJZChkb2N1bWVudCk7Ci0gICAgaWYgKCFkb2N1bWVu dE5vZGVJZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKCFtX3VwZGF0ZVJlZ2lvbkxheW91 dFRhc2spCi0gICAgICAgIG1fdXBkYXRlUmVnaW9uTGF5b3V0VGFzayA9IHN0ZDo6bWFrZV91bmlx dWU8VXBkYXRlUmVnaW9uTGF5b3V0VGFzaz4odGhpcyk7Ci0gICAgbV91cGRhdGVSZWdpb25MYXlv dXRUYXNrLT5zY2hlZHVsZUZvcihuYW1lZEZsb3csIGRvY3VtZW50Tm9kZUlkKTsKLX0KLQotdm9p ZCBJbnNwZWN0b3JDU1NBZ2VudDo6cmVnaW9uTGF5b3V0VXBkYXRlZChXZWJLaXROYW1lZEZsb3cq IG5hbWVkRmxvdywgaW50IGRvY3VtZW50Tm9kZUlkKQotewotICAgIGlmIChuYW1lZEZsb3ctPmZs b3dTdGF0ZSgpID09IFdlYktpdE5hbWVkRmxvdzo6Rmxvd1N0YXRlTnVsbCkKLSAgICAgICAgcmV0 dXJuOwotCi0gICAgRXJyb3JTdHJpbmcgZXJyb3JTdHJpbmc7Ci0gICAgUmVmPFdlYktpdE5hbWVk Rmxvdz4gcHJvdGVjdCgqbmFtZWRGbG93KTsKLQotICAgIG1fZnJvbnRlbmREaXNwYXRjaGVyLT5y ZWdpb25MYXlvdXRVcGRhdGVkKGJ1aWxkT2JqZWN0Rm9yTmFtZWRGbG93KCZlcnJvclN0cmluZywg bmFtZWRGbG93LCBkb2N1bWVudE5vZGVJZCkpOwotfQotCiB2b2lkIEluc3BlY3RvckNTU0FnZW50 OjpkaWRDaGFuZ2VSZWdpb25PdmVyc2V0KERvY3VtZW50KiBkb2N1bWVudCwgV2ViS2l0TmFtZWRG bG93KiBuYW1lZEZsb3cpCiB7CiAgICAgaW50IGRvY3VtZW50Tm9kZUlkID0gZG9jdW1lbnROb2Rl V2l0aFJlcXVlc3RlZEZsb3dzSWQoZG9jdW1lbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNTU0FnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaAppbmRleCAzNzVlYjQ2Li4zNjUyMzdmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ1NTQWdlbnQuaApAQCAtNjAsNyArNjAsNiBA QCBjbGFzcyBOb2RlOwogY2xhc3MgTm9kZUxpc3Q7CiBjbGFzcyBTdHlsZVJlc29sdmVyOwogY2xh c3MgU3R5bGVSdWxlOwotY2xhc3MgVXBkYXRlUmVnaW9uTGF5b3V0VGFzazsKIGNsYXNzIENoYW5n ZVJlZ2lvbk92ZXJzZXRUYXNrOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKQEAgLTEwNSw4ICsx MDQsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBtZWRpYVF1ZXJ5UmVzdWx0Q2hhbmdlZCgpOwogICAg IHZvaWQgZGlkQ3JlYXRlTmFtZWRGbG93KERvY3VtZW50KiwgV2ViS2l0TmFtZWRGbG93Kik7CiAg ICAgdm9pZCB3aWxsUmVtb3ZlTmFtZWRGbG93KERvY3VtZW50KiwgV2ViS2l0TmFtZWRGbG93Kik7 Ci0gICAgdm9pZCBkaWRVcGRhdGVSZWdpb25MYXlvdXQoRG9jdW1lbnQqLCBXZWJLaXROYW1lZEZs b3cqKTsKLSAgICB2b2lkIHJlZ2lvbkxheW91dFVwZGF0ZWQoV2ViS2l0TmFtZWRGbG93KiwgaW50 IGRvY3VtZW50Tm9kZUlkKTsKICAgICB2b2lkIGRpZENoYW5nZVJlZ2lvbk92ZXJzZXQoRG9jdW1l bnQqLCBXZWJLaXROYW1lZEZsb3cqKTsKICAgICB2b2lkIHJlZ2lvbk92ZXJzZXRDaGFuZ2VkKFdl YktpdE5hbWVkRmxvdyosIGludCBkb2N1bWVudE5vZGVJZCk7CiAgICAgdm9pZCBkaWRSZWdpc3Rl ck5hbWVkRmxvd0NvbnRlbnRFbGVtZW50KERvY3VtZW50KiwgV2ViS2l0TmFtZWRGbG93KiwgTm9k ZSogY29udGVudEVsZW1lbnQsIE5vZGUqIG5leHRDb250ZW50RWxlbWVudCA9IG51bGxwdHIpOwpA QCAtMTgyLDcgKzE3OSw2IEBAIHByaXZhdGU6CiAgICAgRG9jdW1lbnRUb1ZpYUluc3BlY3RvclN0 eWxlU2hlZXQgbV9kb2N1bWVudFRvSW5zcGVjdG9yU3R5bGVTaGVldDsKICAgICBOb2RlSWRUb0Zv cmNlZFBzZXVkb1N0YXRlIG1fbm9kZUlkVG9Gb3JjZWRQc2V1ZG9TdGF0ZTsKICAgICBIYXNoU2V0 PGludD4gbV9uYW1lZEZsb3dDb2xsZWN0aW9uc1JlcXVlc3RlZDsKLSAgICBzdGQ6OnVuaXF1ZV9w dHI8VXBkYXRlUmVnaW9uTGF5b3V0VGFzaz4gbV91cGRhdGVSZWdpb25MYXlvdXRUYXNrOwogICAg IHN0ZDo6dW5pcXVlX3B0cjxDaGFuZ2VSZWdpb25PdmVyc2V0VGFzaz4gbV9jaGFuZ2VSZWdpb25P dmVyc2V0VGFzazsKIAogICAgIGludCBtX2xhc3RTdHlsZVNoZWV0SWQ7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCmluZGV4 IGMwMzBiZjUuLmYxNTFhYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCkBAIC0yMjAsMTIgKzIyMCw2IEBAIHZvaWQg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVtb3ZlTmFtZWRGbG93SW1wbChJbnN0cnVt ZW50aW5nQWdlbnRzKiBpbnN0CiAgICAgICAgIGNzc0FnZW50LT53aWxsUmVtb3ZlTmFtZWRGbG93 KGRvY3VtZW50LCBuYW1lZEZsb3cpOwogfQogCi12b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkVXBkYXRlUmVnaW9uTGF5b3V0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVt ZW50aW5nQWdlbnRzLCBEb2N1bWVudCogZG9jdW1lbnQsIFdlYktpdE5hbWVkRmxvdyogbmFtZWRG bG93KQotewotICAgIGlmIChJbnNwZWN0b3JDU1NBZ2VudCogY3NzQWdlbnQgPSBpbnN0cnVtZW50 aW5nQWdlbnRzLT5pbnNwZWN0b3JDU1NBZ2VudCgpKQotICAgICAgICBjc3NBZ2VudC0+ZGlkVXBk YXRlUmVnaW9uTGF5b3V0KGRvY3VtZW50LCBuYW1lZEZsb3cpOwotfQotCiB2b2lkIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6ZGlkQ2hhbmdlUmVnaW9uT3ZlcnNldEltcGwoSW5zdHJ1bWVudGlu Z0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgRG9jdW1lbnQqIGRvY3VtZW50LCBXZWJLaXRO YW1lZEZsb3cqIG5hbWVkRmxvdykKIHsKICAgICBpZiAoSW5zcGVjdG9yQ1NTQWdlbnQqIGNzc0Fn ZW50ID0gaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yQ1NTQWdlbnQoKSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAppbmRl eCAxNjljZmFkLi5kNTQxMDE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCkBAIC0xMjcsNyArMTI3LDYgQEAgcHVibGljOgog ICAgIHN0YXRpYyB2b2lkIHdpbGxQb3BTaGFkb3dSb290KEVsZW1lbnQqIGhvc3QsIFNoYWRvd1Jv b3QqKTsKICAgICBzdGF0aWMgdm9pZCBkaWRDcmVhdGVOYW1lZEZsb3coRG9jdW1lbnQqLCBXZWJL aXROYW1lZEZsb3cqKTsKICAgICBzdGF0aWMgdm9pZCB3aWxsUmVtb3ZlTmFtZWRGbG93KERvY3Vt ZW50KiwgV2ViS2l0TmFtZWRGbG93Kik7Ci0gICAgc3RhdGljIHZvaWQgZGlkVXBkYXRlUmVnaW9u TGF5b3V0KERvY3VtZW50KiwgV2ViS2l0TmFtZWRGbG93Kik7CiAgICAgc3RhdGljIHZvaWQgZGlk Q2hhbmdlUmVnaW9uT3ZlcnNldChEb2N1bWVudCosIFdlYktpdE5hbWVkRmxvdyopOwogICAgIHN0 YXRpYyB2b2lkIGRpZFJlZ2lzdGVyTmFtZWRGbG93Q29udGVudEVsZW1lbnQoRG9jdW1lbnQqLCBX ZWJLaXROYW1lZEZsb3cqLCBOb2RlKiBjb250ZW50RWxlbWVudCwgTm9kZSogbmV4dENvbnRlbnRF bGVtZW50ID0gbnVsbHB0cik7CiAgICAgc3RhdGljIHZvaWQgZGlkVW5yZWdpc3Rlck5hbWVkRmxv d0NvbnRlbnRFbGVtZW50KERvY3VtZW50KiwgV2ViS2l0TmFtZWRGbG93KiwgTm9kZSogY29udGVu dEVsZW1lbnQpOwpAQCAtMzI2LDcgKzMyNSw2IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQg d2lsbFBvcFNoYWRvd1Jvb3RJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCBFbGVtZW50KiBob3N0 LCBTaGFkb3dSb290Kik7CiAgICAgc3RhdGljIHZvaWQgZGlkQ3JlYXRlTmFtZWRGbG93SW1wbChJ bnN0cnVtZW50aW5nQWdlbnRzKiwgRG9jdW1lbnQqLCBXZWJLaXROYW1lZEZsb3cqKTsKICAgICBz dGF0aWMgdm9pZCB3aWxsUmVtb3ZlTmFtZWRGbG93SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzKiwg RG9jdW1lbnQqLCBXZWJLaXROYW1lZEZsb3cqKTsKLSAgICBzdGF0aWMgdm9pZCBkaWRVcGRhdGVS ZWdpb25MYXlvdXRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMqLCBEb2N1bWVudCosIFdlYktpdE5h bWVkRmxvdyopOwogICAgIHN0YXRpYyB2b2lkIGRpZENoYW5nZVJlZ2lvbk92ZXJzZXRJbXBsKElu c3RydW1lbnRpbmdBZ2VudHMqLCBEb2N1bWVudCosIFdlYktpdE5hbWVkRmxvdyopOwogICAgIHN0 YXRpYyB2b2lkIGRpZFJlZ2lzdGVyTmFtZWRGbG93Q29udGVudEVsZW1lbnRJbXBsKEluc3RydW1l bnRpbmdBZ2VudHMqLCBEb2N1bWVudCosIFdlYktpdE5hbWVkRmxvdyosIE5vZGUqIGNvbnRlbnRF bGVtZW50LCBOb2RlKiBuZXh0Q29udGVudEVsZW1lbnQgPSBudWxscHRyKTsKICAgICBzdGF0aWMg dm9pZCBkaWRVbnJlZ2lzdGVyTmFtZWRGbG93Q29udGVudEVsZW1lbnRJbXBsKEluc3RydW1lbnRp bmdBZ2VudHMqLCBEb2N1bWVudCosIFdlYktpdE5hbWVkRmxvdyosIE5vZGUqIGNvbnRlbnRFbGVt ZW50KTsKQEAgLTY5MCwxOCArNjg4LDYgQEAgaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjp3aWxsUmVtb3ZlTmFtZWRGbG93KERvY3VtZW50KiBkb2N1bWVudCwgV2UKICNlbmRp ZgogfQogCi1pbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFVwZGF0ZVJl Z2lvbkxheW91dChEb2N1bWVudCogZG9jdW1lbnQsIFdlYktpdE5hbWVkRmxvdyogbmFtZWRGbG93 KQotewotI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRF TkRTKHZvaWQoKSk7Ci0gICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdB Z2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yRG9jdW1lbnQoZG9jdW1lbnQpKQotICAgICAg ICBkaWRVcGRhdGVSZWdpb25MYXlvdXRJbXBsKGluc3RydW1lbnRpbmdBZ2VudHMsIGRvY3VtZW50 LCBuYW1lZEZsb3cpOwotI2Vsc2UKLSAgICBVTlVTRURfUEFSQU0oZG9jdW1lbnQpOwotICAgIFVO VVNFRF9QQVJBTShuYW1lZEZsb3cpOwotI2VuZGlmCi19Ci0KIGlubGluZSB2b2lkIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6ZGlkQ2hhbmdlUmVnaW9uT3ZlcnNldChEb2N1bWVudCogZG9jdW1l bnQsIFdlYktpdE5hbWVkRmxvdyogbmFtZWRGbG93KQogewogI2lmIEVOQUJMRShJTlNQRUNUT1Ip CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvQ1NTLmpzb24g Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvcHJvdG9jb2wvQ1NTLmpzb24KaW5kZXggZjljMjYy OS4uY2E5MGNmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL3Byb3RvY29s L0NTUy5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9DU1MuanNv bgpAQCAtNDAxLDEzICs0MDEsNiBAQAogICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkZpcmVz IHdoZW4gYSBOYW1lZCBGbG93IGlzIHJlbW92ZWQ6IGhhcyBubyBhc3NvY2lhdGVkIGNvbnRlbnQg bm9kZXMgYW5kIHJlZ2lvbnMuIgogICAgICAgICB9LAogICAgICAgICB7Ci0gICAgICAgICAgICAi bmFtZSI6ICJyZWdpb25MYXlvdXRVcGRhdGVkIiwKLSAgICAgICAgICAgICJwYXJhbWV0ZXJzIjog WwotICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibmFtZWRGbG93IiwgIiRyZWYiOiAiTmFtZWRG bG93IiwgImRlc2NyaXB0aW9uIjogIlRoZSBOYW1lZCBGbG93IHdob3NlIGxheW91dCBtYXkgaGF2 ZSBjaGFuZ2VkLiIgfQotICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6 ICJGaXJlcyB3aGVuIGEgTmFtZWQgRmxvdydzIGxheW91dCBtYXkgaGF2ZSBjaGFuZ2VkLiIKLSAg ICAgICAgfSwKLSAgICAgICAgewogICAgICAgICAgICAgIm5hbWUiOiAicmVnaW9uT3ZlcnNldENo YW5nZWQiLAogICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJuYW1lZEZsb3ciLCAiJHJlZiI6ICJOYW1lZEZsb3ciLCAiZGVzY3JpcHRpb24iOiAi VGhlIE5hbWVkIEZsb3cgY29udGFpbmluZyB0aGUgcmVnaW9ucyB3aG9zZSByZWdpb25PdmVyc2V0 IHZhbHVlcyBjaGFuZ2VkLiIgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJOYW1lZEZsb3dGcmFnbWVudC5jcHAKaW5kZXggOTJjOGRmNi4uNTVkODYzNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQu Y3BwCkBAIC0zMjMsMTIgKzMyMyw3IEBAIHZvaWQgUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQ6OnVw ZGF0ZU92ZXJzZXRTdGF0ZSgpCiAgICAgCiAgICAgc2V0UmVnaW9uT3ZlcnNldFN0YXRlKHN0YXRl KTsKIAotICAgIC8vIERldGVybWluZSB3aGV0aGVyIHRoZSBOYW1lZEZsb3cgb2JqZWN0IHNob3Vs ZCBkaXNwYXRjaCBhIHJlZ2lvbkxheW91dFVwZGF0ZSBldmVudAotICAgIGlmIChwcmV2aW91c1N0 YXRlICE9IHN0YXRlCi0gICAgICAgIHx8IHN0YXRlID09IFJlZ2lvbkZpdAotICAgICAgICB8fCBz dGF0ZSA9PSBSZWdpb25PdmVyc2V0KQotICAgICAgICBmbG93VGhyZWFkLT5zZXREaXNwYXRjaFJl Z2lvbkxheW91dFVwZGF0ZUV2ZW50KHRydWUpOwotICAgIAorICAgIC8vIERldGVybWluZSB3aGV0 aGVyIHRoZSBOYW1lZEZsb3cgb2JqZWN0IHNob3VsZCBkaXNwYXRjaCBhIHJlZ2lvbk92ZXJzZXRD aGFuZ2UgZXZlbnQKICAgICBpZiAocHJldmlvdXNTdGF0ZSAhPSBzdGF0ZSkKICAgICAgICAgZmxv d1RocmVhZC0+c2V0RGlzcGF0Y2hSZWdpb25PdmVyc2V0Q2hhbmdlRXZlbnQodHJ1ZSk7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93VGhyZWFk LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dUaHJlYWQuY3Bw CmluZGV4IGI5MTc3YjUuLjI1ODEwZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJOYW1lZEZsb3dUaHJlYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJOYW1lZEZsb3dUaHJlYWQuY3BwCkBAIC00OCwxMCArNDgsOCBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiBSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OlJlbmRlck5hbWVkRmxvd1RocmVh ZChEb2N1bWVudCYgZG9jdW1lbnQsIFBhc3NSZWY8UmVuZGVyU3R5bGU+IHN0eWxlLCBQYXNzUmVm PFdlYktpdE5hbWVkRmxvdz4gbmFtZWRGbG93KQogICAgIDogUmVuZGVyRmxvd1RocmVhZChkb2N1 bWVudCwgc3RkOjptb3ZlKHN0eWxlKSkKICAgICAsIG1faGFzUmVnaW9uc1dpdGhTdHlsaW5nKGZh bHNlKQotICAgICwgbV9kaXNwYXRjaFJlZ2lvbkxheW91dFVwZGF0ZUV2ZW50KGZhbHNlKQogICAg ICwgbV9kaXNwYXRjaFJlZ2lvbk92ZXJzZXRDaGFuZ2VFdmVudChmYWxzZSkKICAgICAsIG1fbmFt ZWRGbG93KHN0ZDo6bW92ZShuYW1lZEZsb3cpKQotICAgICwgbV9yZWdpb25MYXlvdXRVcGRhdGVF dmVudFRpbWVyKHRoaXMsICZSZW5kZXJOYW1lZEZsb3dUaHJlYWQ6OnJlZ2lvbkxheW91dFVwZGF0 ZUV2ZW50VGltZXJGaXJlZCkKICAgICAsIG1fcmVnaW9uT3ZlcnNldENoYW5nZUV2ZW50VGltZXIo dGhpcywgJlJlbmRlck5hbWVkRmxvd1RocmVhZDo6cmVnaW9uT3ZlcnNldENoYW5nZUV2ZW50VGlt ZXJGaXJlZCkKIHsKIH0KQEAgLTI3MSwxMCArMjY5LDcgQEAgdm9pZCBSZW5kZXJOYW1lZEZsb3dU aHJlYWQ6OnJlbW92ZVJlZ2lvbkZyb21UaHJlYWQoUmVuZGVyUmVnaW9uKiByZW5kZXJSZWdpb24p CiAgICAgaWYgKGNhbkJlRGVzdHJveWVkKCkpCiAgICAgICAgIHNldE1hcmtGb3JEZXN0cnVjdGlv bigpOwogCi0gICAgLy8gQWZ0ZXIgcmVtb3ZpbmcgYWxsIHRoZSByZWdpb25zIGluIHRoZSBmbG93 IHRoZSBmb2xsb3dpbmcgbGF5b3V0IG5lZWRzIHRvIGRpc3BhdGNoIHRoZSByZWdpb25MYXlvdXRV cGRhdGUgZXZlbnQKLSAgICBpZiAobV9yZWdpb25MaXN0LmlzRW1wdHkoKSkKLSAgICAgICAgc2V0 RGlzcGF0Y2hSZWdpb25MYXlvdXRVcGRhdGVFdmVudCh0cnVlKTsKLSAgICBlbHNlIGlmICh3YXNG aXJzdCkKKyAgICBpZiAoIW1fcmVnaW9uTGlzdC5pc0VtcHR5KCkgJiYgd2FzRmlyc3QpCiAgICAg ICAgIHVwZGF0ZVdyaXRpbmdNb2RlKCk7CiAKICAgICBpbnZhbGlkYXRlUmVnaW9ucygpOwpAQCAt NDE2LDggKzQxMSw2IEBAIHZvaWQgUmVuZGVyTmFtZWRGbG93VGhyZWFkOjpsYXlvdXQoKQogICAg ICAgICBzZXREaXNwYXRjaFJlZ2lvbk92ZXJzZXRDaGFuZ2VFdmVudCh0cnVlKTsKICAgICAgICAg dXBkYXRlUHJldmlvdXNSZWdpb25Db3VudCgpOwogICAgIH0KLQotICAgIGRpc3BhdGNoUmVnaW9u TGF5b3V0VXBkYXRlRXZlbnRJZk5lZWRlZCgpOwogfQogCiB2b2lkIFJlbmRlck5hbWVkRmxvd1Ro cmVhZDo6ZGlzcGF0Y2hOYW1lZEZsb3dFdmVudHMoKQpAQCAtNTU1LDE4ICs1NDgsNiBAQCBib29s IFJlbmRlck5hbWVkRmxvd1RocmVhZDo6aXNDaGlsZEFsbG93ZWQoY29uc3QgUmVuZGVyT2JqZWN0 JiBjaGlsZCwgY29uc3QgUmVuZAogICAgIHJldHVybiB0b0VsZW1lbnQob3JpZ2luYWxQYXJlbnQp LT5yZW5kZXJlcigpLT5pc0NoaWxkQWxsb3dlZChjaGlsZCwgc3R5bGUpOwogfQogCi12b2lkIFJl bmRlck5hbWVkRmxvd1RocmVhZDo6ZGlzcGF0Y2hSZWdpb25MYXlvdXRVcGRhdGVFdmVudElmTmVl ZGVkKCkKLXsKLSAgICBpZiAoIW1fZGlzcGF0Y2hSZWdpb25MYXlvdXRVcGRhdGVFdmVudCkKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgbV9kaXNwYXRjaFJlZ2lvbkxheW91dFVwZGF0ZUV2ZW50ID0g ZmFsc2U7Ci0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRVcGRhdGVSZWdpb25MYXlv dXQoJmRvY3VtZW50KCksICZuYW1lZEZsb3coKSk7Ci0KLSAgICBpZiAoIW1fcmVnaW9uTGF5b3V0 VXBkYXRlRXZlbnRUaW1lci5pc0FjdGl2ZSgpICYmIG5hbWVkRmxvdygpLmhhc0V2ZW50TGlzdGVu ZXJzKCkpCi0gICAgICAgIG1fcmVnaW9uTGF5b3V0VXBkYXRlRXZlbnRUaW1lci5zdGFydE9uZVNo b3QoMCk7Ci19Ci0KIHZvaWQgUmVuZGVyTmFtZWRGbG93VGhyZWFkOjpkaXNwYXRjaFJlZ2lvbk92 ZXJzZXRDaGFuZ2VFdmVudElmTmVlZGVkKCkKIHsKICAgICBpZiAoIW1fZGlzcGF0Y2hSZWdpb25P dmVyc2V0Q2hhbmdlRXZlbnQpCkBAIC01NzksMTEgKzU2MCw2IEBAIHZvaWQgUmVuZGVyTmFtZWRG bG93VGhyZWFkOjpkaXNwYXRjaFJlZ2lvbk92ZXJzZXRDaGFuZ2VFdmVudElmTmVlZGVkKCkKICAg ICAgICAgbV9yZWdpb25PdmVyc2V0Q2hhbmdlRXZlbnRUaW1lci5zdGFydE9uZVNob3QoMCk7CiB9 CiAKLXZvaWQgUmVuZGVyTmFtZWRGbG93VGhyZWFkOjpyZWdpb25MYXlvdXRVcGRhdGVFdmVudFRp bWVyRmlyZWQoVGltZXI8UmVuZGVyTmFtZWRGbG93VGhyZWFkPiYpCi17Ci0gICAgbmFtZWRGbG93 KCkuZGlzcGF0Y2hSZWdpb25MYXlvdXRVcGRhdGVFdmVudCgpOwotfQotCiB2b2lkIFJlbmRlck5h bWVkRmxvd1RocmVhZDo6cmVnaW9uT3ZlcnNldENoYW5nZUV2ZW50VGltZXJGaXJlZChUaW1lcjxS ZW5kZXJOYW1lZEZsb3dUaHJlYWQ+JikKIHsKICAgICBuYW1lZEZsb3coKS5kaXNwYXRjaFJlZ2lv bk92ZXJzZXRDaGFuZ2VFdmVudCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck5hbWVkRmxvd1RocmVhZC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck5hbWVkRmxvd1RocmVhZC5oCmluZGV4IDgyZjczZWUuLjAxZDdjZWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJOYW1lZEZsb3dUaHJlYWQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTmFtZWRGbG93VGhyZWFkLmgKQEAgLTk2LDcg Kzk2LDYgQEAgcHVibGljOgogICAgIExheW91dFVuaXQgZmxvd0NvbnRlbnRCb3R0b20oKSBjb25z dCB7IHJldHVybiBtX2Zsb3dDb250ZW50Qm90dG9tOyB9CiAgICAgdm9pZCBkaXNwYXRjaE5hbWVk Rmxvd0V2ZW50cygpOwogCi0gICAgdm9pZCBzZXREaXNwYXRjaFJlZ2lvbkxheW91dFVwZGF0ZUV2 ZW50KGJvb2wgdmFsdWUpIHsgbV9kaXNwYXRjaFJlZ2lvbkxheW91dFVwZGF0ZUV2ZW50ID0gdmFs dWU7IH0KICAgICB2b2lkIHNldERpc3BhdGNoUmVnaW9uT3ZlcnNldENoYW5nZUV2ZW50KGJvb2wg dmFsdWUpIHsgbV9kaXNwYXRjaFJlZ2lvbk92ZXJzZXRDaGFuZ2VFdmVudCA9IHZhbHVlOyB9CiAK ICAgICB2aXJ0dWFsIGJvb2wgYWJzb2x1dGVRdWFkc0ZvckJveChWZWN0b3I8RmxvYXRRdWFkPiYs IGJvb2wqLCBjb25zdCBSZW5kZXJCb3gqLCBmbG9hdCwgZmxvYXQpIGNvbnN0IG92ZXJyaWRlOwpA QCAtMTEyLDcgKzExMSw2IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVPdmVy ZmxvdyhMYXlvdXRVbml0LCBib29sID0gZmFsc2UpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9p ZCBsYXlvdXQoKSBvdmVycmlkZSBmaW5hbDsKIAotICAgIHZvaWQgZGlzcGF0Y2hSZWdpb25MYXlv dXRVcGRhdGVFdmVudElmTmVlZGVkKCk7CiAgICAgdm9pZCBkaXNwYXRjaFJlZ2lvbk92ZXJzZXRD aGFuZ2VFdmVudElmTmVlZGVkKCk7CiAKICAgICBib29sIGRlcGVuZHNPbihSZW5kZXJOYW1lZEZs b3dUaHJlYWQqIG90aGVyUmVuZGVyRmxvd1RocmVhZCkgY29uc3Q7CkBAIC0xMjQsNyArMTIyLDYg QEAgcHJpdmF0ZToKICAgICB2b2lkIGNoZWNrSW52YWxpZFJlZ2lvbnMoKTsKIAogICAgIGJvb2wg Y2FuQmVEZXN0cm95ZWQoKSBjb25zdCB7IHJldHVybiBtX2ludmFsaWRSZWdpb25MaXN0LmlzRW1w dHkoKSAmJiBtX3JlZ2lvbkxpc3QuaXNFbXB0eSgpICYmIG1fY29udGVudEVsZW1lbnRzLmlzRW1w dHkoKTsgfQotICAgIHZvaWQgcmVnaW9uTGF5b3V0VXBkYXRlRXZlbnRUaW1lckZpcmVkKFRpbWVy PFJlbmRlck5hbWVkRmxvd1RocmVhZD4mKTsKICAgICB2b2lkIHJlZ2lvbk92ZXJzZXRDaGFuZ2VF dmVudFRpbWVyRmlyZWQoVGltZXI8UmVuZGVyTmFtZWRGbG93VGhyZWFkPiYpOwogICAgIHZvaWQg Y2xlYXJDb250ZW50RWxlbWVudHMoKTsKICAgICB2b2lkIHVwZGF0ZVdyaXRpbmdNb2RlKCk7CkBA IC0xNTAsMTMgKzE0NywxMSBAQCBwcml2YXRlOgogICAgIFJlbmRlclJlZ2lvbkxpc3QgbV9pbnZh bGlkUmVnaW9uTGlzdDsKIAogICAgIGJvb2wgbV9oYXNSZWdpb25zV2l0aFN0eWxpbmcgOiAxOwot ICAgIGJvb2wgbV9kaXNwYXRjaFJlZ2lvbkxheW91dFVwZGF0ZUV2ZW50IDogMTsKICAgICBib29s IG1fZGlzcGF0Y2hSZWdpb25PdmVyc2V0Q2hhbmdlRXZlbnQgOiAxOwogCiAgICAgLy8gVGhlIERP TSBPYmplY3QgdGhhdCByZXByZXNlbnRzIGEgbmFtZWQgZmxvdy4KICAgICBSZWY8V2ViS2l0TmFt ZWRGbG93PiBtX25hbWVkRmxvdzsKIAotICAgIFRpbWVyPFJlbmRlck5hbWVkRmxvd1RocmVhZD4g bV9yZWdpb25MYXlvdXRVcGRhdGVFdmVudFRpbWVyOwogICAgIFRpbWVyPFJlbmRlck5hbWVkRmxv d1RocmVhZD4gbV9yZWdpb25PdmVyc2V0Q2hhbmdlRXZlbnRUaW1lcjsKIAogICAgIExheW91dFVu aXQgbV9mbG93Q29udGVudEJvdHRvbTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc0OTJh ZTcuLjZhMDdkMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisy MDE0LTA1LTA1ICBSYWR1IFN0YXZpbGEgIDxzdGF2aWxhQGFkb2JlLmNvbT4KKworICAgICAgICBb Q1NTIFJlZ2lvbnNdIFJlbW92ZSByZWdpb25MYXlvdXRVcGRhdGUgZXZlbnQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjU2NAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSByZWdpb25MYXlvdXRVcGRh dGUgZXZlbnQgd2FzIHJlbW92ZWQgZnJvbSB0aGUgcmVnaW9ucyBzcGVjIGFuZCB3YXMgcmVwbGFj ZWQgYnkgdHdvIG90aGVyIGV2ZW50czogCisgICAgICAgIHJlZ2lvbk92ZXJzZXRDaGFuZ2UgYW5k IHJlZ2lvbkZyYWdtZW50Q2hhbmdlLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9s bGVycy9ET01UcmVlTWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlTWFu YWdlci5wcm90b3R5cGUuZ2V0IHJlZ2lvbkxheW91dFVwZGF0ZWQpOiBEZWxldGVkLgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1NjcmlwdFRpbWVsaW5lUmVjb3JkLmpzOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvQ1NTT2JzZXJ2ZXIuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuQ1NTT2JzZXJ2ZXIucHJvdG90eXBlLnJlZ2lvbkxheW91dFVwZGF0ZWQpOiBEZWxl dGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvTGVnYWN5LzcuMC9JbnNwZWN0 b3JXZWJCYWNrZW5kQ29tbWFuZHMuanM6CisgICAgICAgICogVmVyc2lvbnMvSW5zcGVjdG9yLWlP Uy03LjAuanNvbjoKKwogMjAxNC0wNS0wMiAgSm9ubyBXZWxscyAgPGpvbm93ZWxsc0BhcHBsZS5j b20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ29kZU1pcnJvciA0IENTUyBtb2RlIG5ldyBz dGF0ZSBkYXRhIHN0cnVjdHVyZSBicmVha3MgaGVscGVycy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NVHJl ZU1hbmFnZXIuanMKaW5kZXggNGE3MWFlYS4uZjRiODQyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9N VHJlZU1hbmFnZXIuanMKQEAgLTU4LDcgKzU4LDYgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5h Z2VyLkV2ZW50ID0gewogICAgIENvbnRlbnRGbG93TGlzdFdhc1VwZGF0ZWQ6ICJkb20tdHJlZS1t YW5hZ2VyLWNvbnRlbnQtZmxvdy1saXN0LXdhcy11cGRhdGVkIiwKICAgICBDb250ZW50Rmxvd1dh c0FkZGVkOiAiZG9tLXRyZWUtbWFuYWdlci1jb250ZW50LWZsb3ctd2FzLWFkZGVkIiwKICAgICBD b250ZW50Rmxvd1dhc1JlbW92ZWQ6ICJkb20tdHJlZS1tYW5hZ2VyLWNvbnRlbnQtZmxvdy13YXMt cmVtb3ZlZCIsCi0gICAgUmVnaW9uTGF5b3V0VXBkYXRlZDogImRvbS10cmVlLW1hbmFnZXItcmVn aW9uLWxheW91dC11cGRhdGVkIiwKICAgICBSZWdpb25PdmVyc2V0Q2hhbmdlZDogImRvbS10cmVl LW1hbmFnZXItcmVnaW9uLW92ZXJzZXQtY2hhbmdlZCIKIH07CiAKQEAgLTYxNywxMSArNjE2LDYg QEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhp cy5fdXBkYXRlQ29udGVudEZsb3dGcm9tUGF5bG9hZCh0aGlzLl9mbG93cy5nZXQoZmxvd0tleSks IGZsb3dQYXlsb2FkKTsKICAgICB9LAogCi0gICAgcmVnaW9uTGF5b3V0VXBkYXRlZDogZnVuY3Rp b24oZmxvd1BheWxvYWQpCi0gICAgewotICAgICAgICB0aGlzLl9zZW5kTmFtZWRGbG93VXBkYXRl RXZlbnRzKGZsb3dQYXlsb2FkKTsKLSAgICB9LAotCiAgICAgcmVnaW9uT3ZlcnNldENoYW5nZWQ6 IGZ1bmN0aW9uKGZsb3dQYXlsb2FkKQogICAgIHsKICAgICAgICAgdGhpcy5fc2VuZE5hbWVkRmxv d1VwZGF0ZUV2ZW50cyhmbG93UGF5bG9hZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0VGltZWxpbmVSZWNvcmQuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0VGltZWxpbmVSZWNv cmQuanMKaW5kZXggZWY2MjFiNC4uNDU4MDBkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NjcmlwdFRpbWVsaW5lUmVjb3JkLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9TY3JpcHRUaW1lbGlu ZVJlY29yZC5qcwpAQCAtMTkwLDcgKzE5MCw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGlu ZVJlY29yZC5FdmVudFR5cGUuZGlzcGxheU5hbWUgPSBmdW5jdGlvbihldmVudFR5cGUsIGRlCiAg ICAgICAgIG5hbWVNYXAuc2V0KCJ3ZWJraXRwbGF5YmFja3RhcmdldGF2YWlsYWJpbGl0eWNoYW5n ZWQiLCAiUGxheWJhY2sgVGFyZ2V0IEF2YWlsYWJpbGl0eSBDaGFuZ2VkIik7CiAgICAgICAgIG5h bWVNYXAuc2V0KCJ3ZWJraXRwb2ludGVybG9ja2NoYW5nZSIsICJQb2ludGVyIExvY2sgQ2hhbmdl Iik7CiAgICAgICAgIG5hbWVNYXAuc2V0KCJ3ZWJraXRwb2ludGVybG9ja2Vycm9yIiwgIlBvaW50 ZXIgTG9jayBFcnJvciIpOwotICAgICAgICBuYW1lTWFwLnNldCgid2Via2l0cmVnaW9ubGF5b3V0 dXBkYXRlIiwgIlJlZ2lvbiBMYXlvdXQgVXBkYXRlIik7CiAgICAgICAgIG5hbWVNYXAuc2V0KCJ3 ZWJraXRyZWdpb25vdmVyc2V0Y2hhbmdlIiwgIlJlZ2lvbiBPdmVyc2V0IENoYW5nZSIpOwogICAg ICAgICBuYW1lTWFwLnNldCgid2Via2l0cmVtb3Zlc291cmNlYnVmZmVyIiwgIlJlbW92ZSBTb3Vy Y2UgQnVmZmVyIik7CiAgICAgICAgIG5hbWVNYXAuc2V0KCJ3ZWJraXRyZXNvdXJjZXRpbWluZ2J1 ZmZlcmZ1bGwiLCAiUmVzb3VyY2UgVGltaW5nIEJ1ZmZlciBGdWxsIik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9DU1NPYnNlcnZlci5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0NTU09ic2Vy dmVyLmpzCmluZGV4IGE0YjczNjAuLmExODQxNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0NTU09ic2VydmVyLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0NTU09ic2VydmVyLmpzCkBA IC02MywxMSArNjMsNiBAQCBXZWJJbnNwZWN0b3IuQ1NTT2JzZXJ2ZXIucHJvdG90eXBlID0gewog ICAgICAgICBXZWJJbnNwZWN0b3IuZG9tVHJlZU1hbmFnZXIubmFtZWRGbG93UmVtb3ZlZChkb2N1 bWVudE5vZGVJZCwgZmxvd05hbWUpOwogICAgIH0sCiAKLSAgICByZWdpb25MYXlvdXRVcGRhdGVk OiBmdW5jdGlvbihuYW1lZEZsb3cpCi0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuZG9tVHJl ZU1hbmFnZXIucmVnaW9uTGF5b3V0VXBkYXRlZChuYW1lZEZsb3cpOwotICAgIH0sCi0KICAgICBy ZWdpb25PdmVyc2V0Q2hhbmdlZDogZnVuY3Rpb24obmFtZWRGbG93KQogICAgIHsKICAgICAgICAg V2ViSW5zcGVjdG9yLmRvbVRyZWVNYW5hZ2VyLnJlZ2lvbk92ZXJzZXRDaGFuZ2VkKG5hbWVkRmxv dyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90 b2NvbC9MZWdhY3kvNy4wL0luc3BlY3RvcldlYkJhY2tlbmRDb21tYW5kcy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS83LjAvSW5zcGVjdG9y V2ViQmFja2VuZENvbW1hbmRzLmpzCmluZGV4IDkzYjQ0NzkuLjFiYWRiMTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS83LjAv SW5zcGVjdG9yV2ViQmFja2VuZENvbW1hbmRzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL0xlZ2FjeS83LjAvSW5zcGVjdG9yV2ViQmFja2VuZENv bW1hbmRzLmpzCkBAIC0yMDMsNyArMjAzLDYgQEAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2 ZW50KCJDU1MubWVkaWFRdWVyeVJlc3VsdENoYW5nZWQiLCBbXSk7CiBJbnNwZWN0b3JCYWNrZW5k LnJlZ2lzdGVyRXZlbnQoIkNTUy5zdHlsZVNoZWV0Q2hhbmdlZCIsIFsic3R5bGVTaGVldElkIl0p OwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50KCJDU1MubmFtZWRGbG93Q3JlYXRlZCIs IFsibmFtZWRGbG93Il0pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckV2ZW50KCJDU1MubmFt ZWRGbG93UmVtb3ZlZCIsIFsiZG9jdW1lbnROb2RlSWQiLCAiZmxvd05hbWUiXSk7Ci1JbnNwZWN0 b3JCYWNrZW5kLnJlZ2lzdGVyRXZlbnQoIkNTUy5yZWdpb25MYXlvdXRVcGRhdGVkIiwgWyJuYW1l ZEZsb3ciXSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiQ1NTLmVuYWJsZSIs IFtdLCBbXSk7CiBJbnNwZWN0b3JCYWNrZW5kLnJlZ2lzdGVyQ29tbWFuZCgiQ1NTLmRpc2FibGUi LCBbXSwgW10pOwogSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckNvbW1hbmQoIkNTUy5nZXRNYXRj aGVkU3R5bGVzRm9yTm9kZSIsIFt7Im5hbWUiOiAibm9kZUlkIiwgInR5cGUiOiAibnVtYmVyIiwg Im9wdGlvbmFsIjogZmFsc2V9LCB7Im5hbWUiOiAiaW5jbHVkZVBzZXVkbyIsICJ0eXBlIjogImJv b2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlfSwgeyJuYW1lIjogImluY2x1ZGVJbmhlcml0ZWQiLCAi dHlwZSI6ICJib29sZWFuIiwgIm9wdGlvbmFsIjogdHJ1ZX1dLCBbIm1hdGNoZWRDU1NSdWxlcyIs ICJwc2V1ZG9FbGVtZW50cyIsICJpbmhlcml0ZWQiXSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVmVyc2lvbnMvSW5zcGVjdG9yLWlPUy03LjAuanNvbiBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9WZXJzaW9ucy9JbnNwZWN0b3ItaU9TLTcuMC5qc29uCmluZGV4IGQwNTMyMDku LjRiYjU3MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9WZXJzaW9ucy9JbnNw ZWN0b3ItaU9TLTcuMC5qc29uCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9WZXJzaW9ucy9J bnNwZWN0b3ItaU9TLTcuMC5qc29uCkBAIC0yMTgzLDEzICsyMTgzLDYgQEAKICAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJmbG93TmFtZSIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlw dGlvbiI6ICJJZGVudGlmaWVyIG9mIHRoZSByZW1vdmVkIE5hbWVkIEZsb3cuIiB9CiAgICAgICAg ICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRmlyZXMgd2hlbiBh IE5hbWVkIEZsb3cgaXMgcmVtb3ZlZDogaGFzIG5vIGFzc29jaWF0ZWQgY29udGVudCBub2RlcyBh bmQgcmVnaW9ucy4iCi0gICAgICAgICAgICB9LAotICAgICAgICAgICAgewotICAgICAgICAgICAg ICAgICJuYW1lIjogInJlZ2lvbkxheW91dFVwZGF0ZWQiLAotICAgICAgICAgICAgICAgICJwYXJh bWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogIm5hbWVkRmxvdyIsICIk cmVmIjogIk5hbWVkRmxvdyIsICJkZXNjcmlwdGlvbiI6ICJUaGUgTmFtZWQgRmxvdyB3aG9zZSBs YXlvdXQgbWF5IGhhdmUgY2hhbmdlZC4iIH0KLSAgICAgICAgICAgICAgICBdLAotICAgICAgICAg ICAgICAgICJkZXNjcmlwdGlvbiI6ICJGaXJlcyB3aGVuIGEgTmFtZWQgRmxvdydzIGxheW91dCBt YXkgaGF2ZSBjaGFuZ2VkLiIKICAgICAgICAgICAgIH0KICAgICAgICAgXQogICAgIH0sCg==