192091 2018-11-28 11:45:54 -0800 Web Inspector: REGRESSION(r238599): Multiple Selection: restoring selection when opening WebInspector puts the TreeElement into a permanent selected state 2018-12-03 15:16:36 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=192112 https://devinrousso.com/demo/WebKit/test.html InRadar P2 Normal --- 191483 1 hi mattbaker commit-queue hi inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1482561 0 hi 2018-11-28 11:45:54 -0800 * STEPS TO REPRODUCE: 1. open WebInspector 2. enable the Audit tab 3. select any audit test/group 4. close WebInspector 5. reopen WebInspector 6. select a different audit test/group => both of the `WI.TreeElement` from (3) and (6) are selected 1482668 1 355917 mattbaker 2018-11-28 14:25:11 -0800 Created attachment 355917 Patch 1482669 2 webkit-bug-importer 2018-11-28 14:27:19 -0800 <rdar://problem/46321795> 1482686 3 355917 hi 2018-11-28 15:12:43 -0800 Comment on attachment 355917 Patch r-, this doesn't fix the issue. Another reproduction case: 1. open WebInspector 2. enable the Audit tab 3. select "Demo Audit" > "Result Data" > "data-domNodes" 4. close WebInspector 5. reopen WebInspector 6. select "Demo Audit" > "Result Levels" > "level-unsupported" => both "data-domNodes" and "level-unsupported" are selected 1482700 4 hi 2018-11-28 15:26:03 -0800 This also is the case for the Elements tab: 1. open WebInspector 2. go to the Elements tab 3. select the <body> 4. close WebInspector 5. reopen WebInspector 6. expand the <body> by clicking on the disclosure arrow 6. select any <div> that is a child of <body> => both the <div> and <body> are selected 1484223 5 356347 mattbaker 2018-12-02 13:36:10 -0800 Created attachment 356347 Patch 1484224 6 mattbaker 2018-12-02 13:41:17 -0800 This addresses additional defects in SelectionController and TreeOutline, one of which fixes an issue where traversing the tree using the up/down arrow keys would fail to select the previous/next element when the element was on a different level of the tree. 1484242 7 356347 hi 2018-12-02 20:07:02 -0800 Comment on attachment 356347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=356347&action=review r=me > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:400 > this._cachedNumberOfDescendents++; Aside: we should assert that `_cachedNumberOfDescendants` is equal to the sum of the length of every value in `_knownTreeElements`, or even just set it to be that value (in the case that `treeElement` has already been remembered in the past : console.assert(this._cachedNumberOfDescendents === Object.values(this._knownTreeElements).reduce((accumulator, current) => accumulator + current.length, 0)); > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:416 > this._cachedNumberOfDescendents--; Ditto (400) > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:994 > _indexOfTreeElement(treeElement) Aside: the uses of this in `selectionControllerNextSelectableIndex` and `selectionControllerPreviousSelectableIndex` repeat a lot of work, as they both iterate over the tree using `traverseNextTreeElement`. Perhaps consider combining/reworking them (followup)? > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:1010 > + return NaN; We should add a "not-reached" assertion: console.assert(false, "Unable to get index for tree element", treeElement, this); 1484487 8 356347 mattbaker 2018-12-03 13:55:33 -0800 Comment on attachment 356347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=356347&action=review >> Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:400 >> this._cachedNumberOfDescendents++; > > Aside: we should assert that `_cachedNumberOfDescendants` is equal to the sum of the length of every value in `_knownTreeElements`, or even just set it to be that value (in the case that `treeElement` has already been remembered in the past : > > console.assert(this._cachedNumberOfDescendents === Object.values(this._knownTreeElements).reduce((accumulator, current) => accumulator + current.length, 0)); I'd like to avoid doing work every time an element is remembered/forgotten. I'll fix the bug where `_cachedNumberOfDescendents` is incremented even if the element had been remembered previously. 1484492 9 356402 mattbaker 2018-12-03 13:57:03 -0800 Created attachment 356402 Patch for landing 1484532 10 commit-queue 2018-12-03 14:46:51 -0800 The commit-queue encountered the following flaky tests while processing attachment 356402: inspector/model/stack-trace.html bug 192332 (authors: drousso@apple.com and joepeck@webkit.org) The commit-queue is continuing to process your patch. 1484535 11 commit-queue 2018-12-03 14:46:59 -0800 The commit-queue encountered the following flaky tests while processing attachment 356402: inspector/unit-tests/linked-list.html bug 192333 (authors: joepeck@webkit.org and nvasilyev@apple.com) The commit-queue is continuing to process your patch. 1484557 12 commit-queue 2018-12-03 15:13:45 -0800 The commit-queue encountered the following flaky tests while processing attachment 356402: workers/bomb.html bug 192050 (author: fpizlo@apple.com) The commit-queue is continuing to process your patch. 1484562 13 commit-queue 2018-12-03 15:14:00 -0800 The commit-queue encountered the following flaky tests while processing attachment 356402: inspector/unit-tests/event-listener.html bug 192338 (authors: bburg@apple.com and drousso@apple.com) imported/w3c/web-platform-tests/html/syntax/parsing/html5lib_webkit01.html bug 192339 (authors: cdumez@apple.com and youennf@gmail.com) The commit-queue is continuing to process your patch. 1484565 14 356402 commit-queue 2018-12-03 15:16:34 -0800 Comment on attachment 356402 Patch for landing Clearing flags on attachment: 356402 Committed r238825: <https://trac.webkit.org/changeset/238825> 1484566 15 commit-queue 2018-12-03 15:16:36 -0800 All reviewed patches have been landed. Closing bug. 355917 2018-11-28 14:25:11 -0800 2018-12-02 13:36:08 -0800 Patch bug-192091-20181128142510.patch text/plain 3509 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl M2EwZjAxMWExZjU4Y2U4Zjk2MjU5NDE2ZDg4YTZhMjhlMDFjZWUzLi43MWJiOGY1Y2I5MTg3NDhk MTY4NGY2NjYzZmEwMGMzNzc1ZmZkYTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxOC0xMS0yOCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTXVsdGlwbGUgU2VsZWN0aW9uOiByZXN0b3Jpbmcg c2VsZWN0aW9uIHdoZW4gb3BlbmluZyBXZWJJbnNwZWN0b3IgcHV0cyB0aGUgVHJlZUVsZW1lbnQg aW50byBhIHBlcm1hbmVudCBzZWxlY3RlZCBzdGF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyMDkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1NlbGVj dGlvbkNvbnRyb2xsZXIuanM6CisgICAgICAgIChXSS5TZWxlY3Rpb25Db250cm9sbGVyLnByb3Rv dHlwZS5kaWRJbnNlcnRJdGVtKToKKyAgICAgICAgRml4IGEgYnVnIGNhdXNpbmcgc2VsZWN0ZWQg aW5kZXhlcyB0byBiZSBvdmVyd3JpdHRlbiBieSB0aGUgaW5zZXJ0ZWQgaW5kZXguCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV0kuVHJl ZU91dGxpbmUucHJvdG90eXBlLmluc2VydENoaWxkKToKKyAgICAgICAgVXBkYXRlIFNlbGVjdGlv bkNvbnRyb2xsZXIgYmVmb3JlIGF0dGFjaGluZyB0aGUgVHJlZUVsZW1lbnQuCisgICAgICAgIFVz ZSB0aGUgaW5kZXggb2YgdGhlIGluc2VydGVkIGl0ZW0sIGluc3RlYWQgb2YgaXRzIHByZXZpb3Vz IHNpYmxpbmcuCisKIDIwMTgtMTEtMjggIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29t PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSB1bnVzZWQgRGF0YUdyaWQgYW5kIFRy ZWVPdXRsaW5lIGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL1NlbGVjdGlvbkNvbnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9TZWxlY3Rpb25Db250cm9sbGVyLmpz CmluZGV4IDk0NTY5MDU4MWI3Zjg3NWJmMTEzYmRiMzc1NGRmNTJmZTJhZWI3MGMuLmVhOWUzYmZm NWE0ZmMyZTkxYzU3YTczNWVhODU4ODYyNDk4YWUzMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1NlbGVjdGlvbkNvbnRyb2xsZXIu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMv U2VsZWN0aW9uQ29udHJvbGxlci5qcwpAQCAtMjAzLDggKzIwMyw4IEBAIFdJLlNlbGVjdGlvbkNv bnRyb2xsZXIgPSBjbGFzcyBTZWxlY3Rpb25Db250cm9sbGVyIGV4dGVuZHMgV0kuT2JqZWN0CiAg ICAgewogICAgICAgICBsZXQgY3VycmVudCA9IHRoaXMuX3NlbGVjdGVkSW5kZXhlcy5sYXN0SW5k ZXg7CiAgICAgICAgIHdoaWxlIChjdXJyZW50ID49IGluZGV4KSB7Ci0gICAgICAgICAgICB0aGlz Ll9zZWxlY3RlZEluZGV4ZXMuZGVsZXRlKGluZGV4KTsKLSAgICAgICAgICAgIHRoaXMuX3NlbGVj dGVkSW5kZXhlcy5hZGQoaW5kZXggKyAxKTsKKyAgICAgICAgICAgIHRoaXMuX3NlbGVjdGVkSW5k ZXhlcy5kZWxldGUoY3VycmVudCk7CisgICAgICAgICAgICB0aGlzLl9zZWxlY3RlZEluZGV4ZXMu YWRkKGN1cnJlbnQgKyAxKTsKIAogICAgICAgICAgICAgY3VycmVudCA9IHRoaXMuX3NlbGVjdGVk SW5kZXhlcy5pbmRleExlc3NUaGFuKGN1cnJlbnQpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpz CmluZGV4IDRiZDkwZGY5YjgxZDgzOTEwMjJjYWI0YTViNmIyYTM0NTk0ZDE2MzMuLjU4ODc5ZjAw ZTA1MTc5NTRmN2Q5Y2NkNWQzNDJlYjY5ZDMwODk0YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCkBAIC0y OTMsNiArMjkzLDEyIEBAIFdJLlRyZWVPdXRsaW5lID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5k cyBXSS5PYmplY3QKICAgICAgICAgaWYgKGNoaWxkLmhhc0NoaWxkcmVuICYmIGNoaWxkLnRyZWVP dXRsaW5lLl90cmVlRWxlbWVudHNFeHBhbmRlZFN0YXRlW2NoaWxkLmlkZW50aWZpZXJdICE9PSB1 bmRlZmluZWQpCiAgICAgICAgICAgICBjaGlsZC5leHBhbmRlZCA9IGNoaWxkLnRyZWVPdXRsaW5l Ll90cmVlRWxlbWVudHNFeHBhbmRlZFN0YXRlW2NoaWxkLmlkZW50aWZpZXJdOwogCisgICAgICAg IC8vIFVwZGF0ZSB0aGUgU2VsZWN0aW9uQ29udHJvbGxlciBiZWZvcmUgYXR0YWNoaW5nIHRoZSBU cmVlRWxlbWVudC4KKyAgICAgICAgLy8gQXR0YWNoaW5nIHRoZSBUcmVlRWxlbWVudCBjYW4gY2F1 c2UgaXQgdG8gYmVjb21lIHNlbGVjdGVkLCBhbmQKKyAgICAgICAgLy8gYWRkZWQgdG8gdGhlIFNl bGVjdGlvbkNvbnRyb2xsZXIuCisgICAgICAgIGxldCBpbnNlcnRpb25JbmRleCA9IHRoaXMudHJl ZU91dGxpbmUuX2luZGV4T2ZUcmVlRWxlbWVudChjaGlsZCkgfHwgMDsKKyAgICAgICAgdGhpcy50 cmVlT3V0bGluZS5fc2VsZWN0aW9uQ29udHJvbGxlci5kaWRJbnNlcnRJdGVtKGluc2VydGlvbklu ZGV4KTsKKwogICAgICAgICBpZiAodGhpcy5fY2hpbGRyZW5MaXN0Tm9kZSkKICAgICAgICAgICAg IGNoaWxkLl9hdHRhY2goKTsKIApAQCAtMzAxLDkgKzMwNyw2IEBAIFdJLlRyZWVPdXRsaW5lID0g Y2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgICAgICBpZiAoaXNGaXJz dENoaWxkICYmIHRoaXMuZXhwYW5kZWQpCiAgICAgICAgICAgICB0aGlzLmV4cGFuZCgpOwotCi0g ICAgICAgIGxldCBpbnNlcnRpb25JbmRleCA9IHRoaXMudHJlZU91dGxpbmUuX2luZGV4T2ZUcmVl RWxlbWVudChjaGlsZC5wcmV2aW91c1NpYmxpbmcpIHx8IDA7Ci0gICAgICAgIHRoaXMudHJlZU91 dGxpbmUuX3NlbGVjdGlvbkNvbnRyb2xsZXIuZGlkSW5zZXJ0SXRlbShpbnNlcnRpb25JbmRleCk7 CiAgICAgfQogCiAgICAgcmVtb3ZlQ2hpbGRBdEluZGV4KGNoaWxkSW5kZXgsIHN1cHByZXNzT25E ZXNlbGVjdCwgc3VwcHJlc3NTZWxlY3RTaWJsaW5nKQo= 356347 2018-12-02 13:36:10 -0800 2018-12-03 13:57:01 -0800 Patch bug-192091-20181202133605.patch text/plain 6738 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA1 NWUxZGVmMTIyNDk5NjViYmZjNWM4ZDRmM2E0MTRkNTY0MzYwMmRkLi4xMmUzZTk5NTFmZTgwODhk OTI2NzMwMmNhYzg0OTg3ZmY1OTcwZTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMyBAQAorMjAxOC0xMi0wMiAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTihyMjM4NTk5KTogTXVsdGlwbGUg U2VsZWN0aW9uOiByZXN0b3Jpbmcgc2VsZWN0aW9uIHdoZW4gb3BlbmluZyBXZWJJbnNwZWN0b3Ig cHV0cyB0aGUgVHJlZUVsZW1lbnQgaW50byBhIHBlcm1hbmVudCBzZWxlY3RlZCBzdGF0ZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyMDkxCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS80NjMyMTc5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvU2VsZWN0 aW9uQ29udHJvbGxlci5qczoKKyAgICAgICAgKFdJLlNlbGVjdGlvbkNvbnRyb2xsZXIucHJvdG90 eXBlLmRpZEluc2VydEl0ZW0pOgorICAgICAgICBGaXggYSBidWcgd2hlcmUgc2VsZWN0ZWQgaW5k ZXhlcyB3ZXJlIG92ZXJ3cml0dGVuIGJ5IHRoZSBpbnNlcnRlZCBpbmRleC4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanM6CisgICAgICAgIChXSS5UcmVlT3V0 bGluZSk6CisgICAgICAgIChXSS5UcmVlT3V0bGluZS5wcm90b3R5cGUuaW5zZXJ0Q2hpbGQpOgor ICAgICAgICBVcGRhdGUgdGhlIFNlbGVjdGlvbkNvbnRyb2xsZXIgd2l0aCB0aGUgbmV3bHkgaW5z ZXJ0ZWQgaW5kZXggYmVmb3JlCisgICAgICAgIGF0dGFjaGluZyB0aGUgVHJlZUVsZW1lbnQuIEF0 dGFjaGluZyB0aGUgVHJlZUVsZW1lbnQgY2FuIGNhdXNlIGl0IHRvCisgICAgICAgIGJlY29tZSBz ZWxlY3RlZCwgd2hpY2ggd291bGQgYWRkIHRoZSBpbmRleCB0byB0aGUgU2VsZWN0aW9uQ29udHJv bGxlciwKKyAgICAgICAgb25seSB0byBoYXZlIGl0IGltbWVkaWF0ZWx5IGluY3JlbWVudGVkIGJ5 IHRoZSBjYWxsIHRvIGBkaWRJbnNlcnRJdGVtYC4KKyAgICAgICAgQWRkaXRpb25hbGx5LCBjaGFu Z2UgYGluc2VydGlvbkluZGV4YCB0byBiZSB0aGUgaW5kZXggb2YgdGhlIGluc2VydGVkCisgICAg ICAgIGl0ZW0gaW5zdGVhZCBvZiB0aGUgaW5zZXJ0ZWQgaXRlbSdzIHByZXZpb3VzIHNpYmxpbmcu CisKKyAgICAgICAgKFdJLlRyZWVPdXRsaW5lLnByb3RvdHlwZS5fcmVtZW1iZXJUcmVlRWxlbWVu dCk6CisgICAgICAgIChXSS5UcmVlT3V0bGluZS5wcm90b3R5cGUuX2ZvcmdldFRyZWVFbGVtZW50 KToKKyAgICAgICAgKFdJLlRyZWVPdXRsaW5lLnByb3RvdHlwZS5faW5kZXhPZlRyZWVFbGVtZW50 LnByZXZpb3VzRWxlbWVudCk6IERlbGV0ZWQuCisgICAgICAgIEVsaW1pbmF0ZSBUcmVlRWxlbWVu dCBpbmRleCBjYWNoaW5nLCB3aGljaCBjb3VsZCBiZWNvbWUgc3RhbGUgYW5kIGNhdXNlCisgICAg ICAgIHRoZSB3cm9uZyBpbmRleCB0byBiZSBjYWxjdWxhdGVkLiBBZGRpdGlvbmFsbHksIGluc3Rl YWQgb2Ygd2Fsa2luZyB1cCB0aGUKKyAgICAgICAgcGFyZW50IGNoYWluIHRvIGRldGVybWluZSB0 aGUgaW5kZXgsIHN0YXJ0IGF0IHRoZSByb290IGFuZCB1c2UgZXhpc3RpbmcKKyAgICAgICAgbWV0 aG9kIGB0cmF2ZXJzZU5leHRUcmVlRWxlbWVudGAuCisKIDIwMTgtMTEtMzAgIE5pa2l0YSBWYXNp bHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSnVt cGluZyBmcm9tIENvbXB1dGVkIHRvIFN0eWxlcyBzaG91bGQgc2VsZWN0IHByb3BlcnR5CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9T ZWxlY3Rpb25Db250cm9sbGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvU2VsZWN0aW9uQ29udHJvbGxlci5qcwppbmRleCA5NDU2OTA1ODFiN2Y4 NzViZjExM2JkYjM3NTRkZjUyZmUyYWViNzBjLi5lYTllM2JmZjVhNGZjMmU5MWM1N2E3MzVlYTg1 ODg2MjQ5OGFlMzA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9TZWxlY3Rpb25Db250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1NlbGVjdGlvbkNvbnRyb2xsZXIu anMKQEAgLTIwMyw4ICsyMDMsOCBAQCBXSS5TZWxlY3Rpb25Db250cm9sbGVyID0gY2xhc3MgU2Vs ZWN0aW9uQ29udHJvbGxlciBleHRlbmRzIFdJLk9iamVjdAogICAgIHsKICAgICAgICAgbGV0IGN1 cnJlbnQgPSB0aGlzLl9zZWxlY3RlZEluZGV4ZXMubGFzdEluZGV4OwogICAgICAgICB3aGlsZSAo Y3VycmVudCA+PSBpbmRleCkgewotICAgICAgICAgICAgdGhpcy5fc2VsZWN0ZWRJbmRleGVzLmRl bGV0ZShpbmRleCk7Ci0gICAgICAgICAgICB0aGlzLl9zZWxlY3RlZEluZGV4ZXMuYWRkKGluZGV4 ICsgMSk7CisgICAgICAgICAgICB0aGlzLl9zZWxlY3RlZEluZGV4ZXMuZGVsZXRlKGN1cnJlbnQp OworICAgICAgICAgICAgdGhpcy5fc2VsZWN0ZWRJbmRleGVzLmFkZChjdXJyZW50ICsgMSk7CiAK ICAgICAgICAgICAgIGN1cnJlbnQgPSB0aGlzLl9zZWxlY3RlZEluZGV4ZXMuaW5kZXhMZXNzVGhh bihjdXJyZW50KTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwppbmRleCA2MWEzYzQxODdkY2Ez MjIzMjZmYWQ3NTk4ODAzNTRiOGVjNjJhNTlhLi5hODZmYTcyODk0NWJiM2NjZTVlNWU5Njc2Yzlh NTMxNjYzN2Y1MmMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwpAQCAtNTYsNyArNTYsNiBAQCBXSS5UcmVl T3V0bGluZSA9IGNsYXNzIFRyZWVPdXRsaW5lIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAg dGhpcy5fY2FjaGVkTnVtYmVyT2ZEZXNjZW5kZW50cyA9IDA7CiAgICAgICAgIHRoaXMuX3NlbGVj dGlvbkNvbnRyb2xsZXIgPSBuZXcgV0kuU2VsZWN0aW9uQ29udHJvbGxlcih0aGlzKTsKLSAgICAg ICAgdGhpcy5fdHJlZUVsZW1lbnRJbmRleENhY2hlID0gbmV3IE1hcDsKIAogICAgICAgICB0aGlz Ll9pdGVtV2FzU2VsZWN0ZWRCeVVzZXIgPSBmYWxzZTsKICAgICAgICAgdGhpcy5fcHJvY2Vzc2lu Z1NlbGVjdGlvbkNoYW5nZSA9IGZhbHNlOwpAQCAtMjk1LDYgKzI5NCwxMiBAQCBXSS5UcmVlT3V0 bGluZSA9IGNsYXNzIFRyZWVPdXRsaW5lIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIGlmIChj aGlsZC5oYXNDaGlsZHJlbiAmJiBjaGlsZC50cmVlT3V0bGluZS5fdHJlZUVsZW1lbnRzRXhwYW5k ZWRTdGF0ZVtjaGlsZC5pZGVudGlmaWVyXSAhPT0gdW5kZWZpbmVkKQogICAgICAgICAgICAgY2hp bGQuZXhwYW5kZWQgPSBjaGlsZC50cmVlT3V0bGluZS5fdHJlZUVsZW1lbnRzRXhwYW5kZWRTdGF0 ZVtjaGlsZC5pZGVudGlmaWVyXTsKIAorICAgICAgICAvLyBVcGRhdGUgdGhlIFNlbGVjdGlvbkNv bnRyb2xsZXIgYmVmb3JlIGF0dGFjaGluZyB0aGUgVHJlZUVsZW1lbnQuCisgICAgICAgIC8vIEF0 dGFjaGluZyB0aGUgVHJlZUVsZW1lbnQgY2FuIGNhdXNlIGl0IHRvIGJlY29tZSBzZWxlY3RlZCwg YW5kCisgICAgICAgIC8vIGFkZGVkIHRvIHRoZSBTZWxlY3Rpb25Db250cm9sbGVyLgorICAgICAg ICBsZXQgaW5zZXJ0aW9uSW5kZXggPSB0aGlzLnRyZWVPdXRsaW5lLl9pbmRleE9mVHJlZUVsZW1l bnQoY2hpbGQpIHx8IDA7CisgICAgICAgIHRoaXMudHJlZU91dGxpbmUuX3NlbGVjdGlvbkNvbnRy b2xsZXIuZGlkSW5zZXJ0SXRlbShpbnNlcnRpb25JbmRleCk7CisKICAgICAgICAgaWYgKHRoaXMu X2NoaWxkcmVuTGlzdE5vZGUpCiAgICAgICAgICAgICBjaGlsZC5fYXR0YWNoKCk7CiAKQEAgLTMw Myw5ICszMDgsNiBAQCBXSS5UcmVlT3V0bGluZSA9IGNsYXNzIFRyZWVPdXRsaW5lIGV4dGVuZHMg V0kuT2JqZWN0CiAKICAgICAgICAgaWYgKGlzRmlyc3RDaGlsZCAmJiB0aGlzLmV4cGFuZGVkKQog ICAgICAgICAgICAgdGhpcy5leHBhbmQoKTsKLQotICAgICAgICBsZXQgaW5zZXJ0aW9uSW5kZXgg PSB0aGlzLnRyZWVPdXRsaW5lLl9pbmRleE9mVHJlZUVsZW1lbnQoY2hpbGQucHJldmlvdXNTaWJs aW5nKSB8fCAwOwotICAgICAgICB0aGlzLnRyZWVPdXRsaW5lLl9zZWxlY3Rpb25Db250cm9sbGVy LmRpZEluc2VydEl0ZW0oaW5zZXJ0aW9uSW5kZXgpOwogICAgIH0KIAogICAgIHJlbW92ZUNoaWxk QXRJbmRleChjaGlsZEluZGV4LCBzdXBwcmVzc09uRGVzZWxlY3QsIHN1cHByZXNzU2VsZWN0U2li bGluZykKQEAgLTM5NSw3ICszOTcsNiBAQCBXSS5UcmVlT3V0bGluZSA9IGNsYXNzIFRyZWVPdXRs aW5lIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICBfcmVtZW1iZXJUcmVlRWxlbWVudChlbGVtZW50 KQogICAgIHsKLSAgICAgICAgdGhpcy5fdHJlZUVsZW1lbnRJbmRleENhY2hlLmNsZWFyKCk7CiAg ICAgICAgIHRoaXMuX2NhY2hlZE51bWJlck9mRGVzY2VuZGVudHMrKzsKIAogICAgICAgICBpZiAo IXRoaXMuX2tub3duVHJlZUVsZW1lbnRzW2VsZW1lbnQuaWRlbnRpZmllcl0pCkBAIC00MTIsNyAr NDEzLDYgQEAgV0kuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdJLk9i amVjdAogCiAgICAgX2ZvcmdldFRyZWVFbGVtZW50KGVsZW1lbnQpCiAgICAgewotICAgICAgICB0 aGlzLl90cmVlRWxlbWVudEluZGV4Q2FjaGUuY2xlYXIoKTsKICAgICAgICAgdGhpcy5fY2FjaGVk TnVtYmVyT2ZEZXNjZW5kZW50cy0tOwogCiAgICAgICAgIGlmICh0aGlzLnNlbGVjdGVkVHJlZUVs ZW1lbnQgPT09IGVsZW1lbnQpIHsKQEAgLTk5MywzNCArOTkzLDIxIEBAIFdJLlRyZWVPdXRsaW5l ID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgIF9pbmRleE9mVHJl ZUVsZW1lbnQodHJlZUVsZW1lbnQpCiAgICAgewotICAgICAgICBmdW5jdGlvbiBwcmV2aW91c0Vs ZW1lbnQoZWxlbWVudCkgewotICAgICAgICAgICAgaWYgKGVsZW1lbnQucHJldmlvdXNTaWJsaW5n KSB7Ci0gICAgICAgICAgICAgICAgZWxlbWVudCA9IGVsZW1lbnQucHJldmlvdXNTaWJsaW5nOwot ICAgICAgICAgICAgICAgIGlmIChlbGVtZW50LmNoaWxkcmVuLmxlbmd0aCkKLSAgICAgICAgICAg ICAgICAgICAgZWxlbWVudCA9IGVsZW1lbnQuY2hpbGRyZW4ubGFzdFZhbHVlOwotICAgICAgICAg ICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgZWxlbWVudCA9IGVsZW1lbnQucGFyZW50ICYmIGVs ZW1lbnQucGFyZW50LnJvb3QgPyBudWxsIDogZWxlbWVudC5wYXJlbnQ7Ci0gICAgICAgICAgICBy ZXR1cm4gZWxlbWVudDsKLSAgICAgICAgfQorICAgICAgICBjb25zdCBza2lwVW5yZXZlYWxlZCA9 IGZhbHNlOworICAgICAgICBjb25zdCBzdGF5V2l0aGluID0gbnVsbDsKKyAgICAgICAgY29uc3Qg ZG9udFBvcHVsYXRlID0gdHJ1ZTsKIAogICAgICAgICBsZXQgaW5kZXggPSAwOwotICAgICAgICBs ZXQgY3VycmVudCA9IHRyZWVFbGVtZW50OworICAgICAgICBsZXQgY3VycmVudCA9IHRoaXMuY2hp bGRyZW5bMF07CiAgICAgICAgIHdoaWxlIChjdXJyZW50KSB7Ci0gICAgICAgICAgICBsZXQgY2xv c2VzdEluZGV4ID0gdGhpcy5fdHJlZUVsZW1lbnRJbmRleENhY2hlLmdldChjdXJyZW50KTsKLSAg ICAgICAgICAgIGlmICghaXNOYU4oY2xvc2VzdEluZGV4KSkgewotICAgICAgICAgICAgICAgIGlu ZGV4ICs9IGNsb3Nlc3RJbmRleDsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAg IH0KKyAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudCA9PT0gY3VycmVudCkKKyAgICAgICAgICAg ICAgICByZXR1cm4gaW5kZXg7CiAKLSAgICAgICAgICAgIGN1cnJlbnQgPSBwcmV2aW91c0VsZW1l bnQoY3VycmVudCk7Ci0gICAgICAgICAgICBpZiAoY3VycmVudCkKLSAgICAgICAgICAgICAgICBp bmRleCsrOworICAgICAgICAgICAgY3VycmVudCA9IGN1cnJlbnQudHJhdmVyc2VOZXh0VHJlZUVs ZW1lbnQoc2tpcFVucmV2ZWFsZWQsIHN0YXlXaXRoaW4sIGRvbnRQb3B1bGF0ZSk7CisgICAgICAg ICAgICArK2luZGV4OwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKCF0aGlzLl90cmVlRWxlbWVu dEluZGV4Q2FjaGUuaGFzKHRyZWVFbGVtZW50KSkKLSAgICAgICAgICAgIHRoaXMuX3RyZWVFbGVt ZW50SW5kZXhDYWNoZS5zZXQodHJlZUVsZW1lbnQsIGluZGV4KTsKLQotICAgICAgICByZXR1cm4g aW5kZXg7CisgICAgICAgIHJldHVybiBOYU47CiAgICAgfQogCiAgICAgX3RyZWVFbGVtZW50QXRJ bmRleChpbmRleCkK 356402 2018-12-03 13:57:03 -0800 2018-12-03 15:16:34 -0800 Patch for landing bug-192091-20181203135657.patch text/plain 7421 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4ODA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA1 NWUxZGVmMTIyNDk5NjViYmZjNWM4ZDRmM2E0MTRkNTY0MzYwMmRkLi4yZTFiMDc4ZTdkNTgwZWU4 YzIzMTgxNWE1MTNiODEyZTlhODBkYzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMyBAQAorMjAxOC0xMi0wMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTihyMjM4NTk5KTogTXVsdGlwbGUg U2VsZWN0aW9uOiByZXN0b3Jpbmcgc2VsZWN0aW9uIHdoZW4gb3BlbmluZyBXZWJJbnNwZWN0b3Ig cHV0cyB0aGUgVHJlZUVsZW1lbnQgaW50byBhIHBlcm1hbmVudCBzZWxlY3RlZCBzdGF0ZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyMDkxCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS80NjMyMTc5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBEZXZp biBSb3Vzc28uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1NlbGVjdGlv bkNvbnRyb2xsZXIuanM6CisgICAgICAgIChXSS5TZWxlY3Rpb25Db250cm9sbGVyLnByb3RvdHlw ZS5kaWRJbnNlcnRJdGVtKToKKyAgICAgICAgRml4IGEgYnVnIHdoZXJlIHNlbGVjdGVkIGluZGV4 ZXMgd2VyZSBvdmVyd3JpdHRlbiBieSB0aGUgaW5zZXJ0ZWQgaW5kZXguCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV0kuVHJlZU91dGxp bmUpOgorICAgICAgICAoV0kuVHJlZU91dGxpbmUucHJvdG90eXBlLmluc2VydENoaWxkKToKKyAg ICAgICAgVXBkYXRlIHRoZSBTZWxlY3Rpb25Db250cm9sbGVyIHdpdGggdGhlIG5ld2x5IGluc2Vy dGVkIGluZGV4IGJlZm9yZQorICAgICAgICBhdHRhY2hpbmcgdGhlIFRyZWVFbGVtZW50LiBBdHRh Y2hpbmcgdGhlIFRyZWVFbGVtZW50IGNhbiBjYXVzZSBpdCB0bworICAgICAgICBiZWNvbWUgc2Vs ZWN0ZWQsIHdoaWNoIHdvdWxkIGFkZCB0aGUgaW5kZXggdG8gdGhlIFNlbGVjdGlvbkNvbnRyb2xs ZXIsCisgICAgICAgIG9ubHkgdG8gaGF2ZSBpdCBpbW1lZGlhdGVseSBpbmNyZW1lbnRlZCBieSB0 aGUgY2FsbCB0byBgZGlkSW5zZXJ0SXRlbWAuCisgICAgICAgIEFkZGl0aW9uYWxseSwgY2hhbmdl IGBpbnNlcnRpb25JbmRleGAgdG8gYmUgdGhlIGluZGV4IG9mIHRoZSBpbnNlcnRlZAorICAgICAg ICBpdGVtIGluc3RlYWQgb2YgdGhlIGluc2VydGVkIGl0ZW0ncyBwcmV2aW91cyBzaWJsaW5nLgor CisgICAgICAgIChXSS5UcmVlT3V0bGluZS5wcm90b3R5cGUuX3JlbWVtYmVyVHJlZUVsZW1lbnQp OgorICAgICAgICAoV0kuVHJlZU91dGxpbmUucHJvdG90eXBlLl9mb3JnZXRUcmVlRWxlbWVudCk6 CisgICAgICAgIChXSS5UcmVlT3V0bGluZS5wcm90b3R5cGUuX2luZGV4T2ZUcmVlRWxlbWVudC5w cmV2aW91c0VsZW1lbnQpOiBEZWxldGVkLgorICAgICAgICBFbGltaW5hdGUgVHJlZUVsZW1lbnQg aW5kZXggY2FjaGluZywgd2hpY2ggY291bGQgYmVjb21lIHN0YWxlIGFuZCBjYXVzZQorICAgICAg ICB0aGUgd3JvbmcgaW5kZXggdG8gYmUgY2FsY3VsYXRlZC4gQWRkaXRpb25hbGx5LCBpbnN0ZWFk IG9mIHdhbGtpbmcgdXAgdGhlCisgICAgICAgIHBhcmVudCBjaGFpbiB0byBkZXRlcm1pbmUgdGhl IGluZGV4LCBzdGFydCBhdCB0aGUgcm9vdCBhbmQgdXNlIGV4aXN0aW5nCisgICAgICAgIG1ldGhv ZCBgdHJhdmVyc2VOZXh0VHJlZUVsZW1lbnRgLgorCiAyMDE4LTExLTMwICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEp1bXBp bmcgZnJvbSBDb21wdXRlZCB0byBTdHlsZXMgc2hvdWxkIHNlbGVjdCBwcm9wZXJ0eQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvU2Vs ZWN0aW9uQ29udHJvbGxlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL1NlbGVjdGlvbkNvbnRyb2xsZXIuanMKaW5kZXggOTQ1NjkwNTgxYjdmODc1 YmYxMTNiZGIzNzU0ZGY1MmZlMmFlYjcwYy4uZWE5ZTNiZmY1YTRmYzJlOTFjNTdhNzM1ZWE4NTg4 NjI0OThhZTMwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvU2VsZWN0aW9uQ29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9TZWxlY3Rpb25Db250cm9sbGVyLmpz CkBAIC0yMDMsOCArMjAzLDggQEAgV0kuU2VsZWN0aW9uQ29udHJvbGxlciA9IGNsYXNzIFNlbGVj dGlvbkNvbnRyb2xsZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICB7CiAgICAgICAgIGxldCBjdXJy ZW50ID0gdGhpcy5fc2VsZWN0ZWRJbmRleGVzLmxhc3RJbmRleDsKICAgICAgICAgd2hpbGUgKGN1 cnJlbnQgPj0gaW5kZXgpIHsKLSAgICAgICAgICAgIHRoaXMuX3NlbGVjdGVkSW5kZXhlcy5kZWxl dGUoaW5kZXgpOwotICAgICAgICAgICAgdGhpcy5fc2VsZWN0ZWRJbmRleGVzLmFkZChpbmRleCAr IDEpOworICAgICAgICAgICAgdGhpcy5fc2VsZWN0ZWRJbmRleGVzLmRlbGV0ZShjdXJyZW50KTsK KyAgICAgICAgICAgIHRoaXMuX3NlbGVjdGVkSW5kZXhlcy5hZGQoY3VycmVudCArIDEpOwogCiAg ICAgICAgICAgICBjdXJyZW50ID0gdGhpcy5fc2VsZWN0ZWRJbmRleGVzLmluZGV4TGVzc1RoYW4o Y3VycmVudCk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKaW5kZXggNjFhM2M0MTg3ZGNhMzIy MzI2ZmFkNzU5ODgwMzU0YjhlYzYyYTU5YS4uYTc1MTFkNmQ1NWVhNTBiMTI3ZTg4NmIyYmZkNjk1 YjQ2YWU0ZGZlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVHJlZU91dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKQEAgLTU2LDcgKzU2LDYgQEAgV0kuVHJlZU91 dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgICAgIHRo aXMuX2NhY2hlZE51bWJlck9mRGVzY2VuZGVudHMgPSAwOwogICAgICAgICB0aGlzLl9zZWxlY3Rp b25Db250cm9sbGVyID0gbmV3IFdJLlNlbGVjdGlvbkNvbnRyb2xsZXIodGhpcyk7Ci0gICAgICAg IHRoaXMuX3RyZWVFbGVtZW50SW5kZXhDYWNoZSA9IG5ldyBNYXA7CiAKICAgICAgICAgdGhpcy5f aXRlbVdhc1NlbGVjdGVkQnlVc2VyID0gZmFsc2U7CiAgICAgICAgIHRoaXMuX3Byb2Nlc3NpbmdT ZWxlY3Rpb25DaGFuZ2UgPSBmYWxzZTsKQEAgLTI5NSw2ICsyOTQsMTIgQEAgV0kuVHJlZU91dGxp bmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBpZiAoY2hp bGQuaGFzQ2hpbGRyZW4gJiYgY2hpbGQudHJlZU91dGxpbmUuX3RyZWVFbGVtZW50c0V4cGFuZGVk U3RhdGVbY2hpbGQuaWRlbnRpZmllcl0gIT09IHVuZGVmaW5lZCkKICAgICAgICAgICAgIGNoaWxk LmV4cGFuZGVkID0gY2hpbGQudHJlZU91dGxpbmUuX3RyZWVFbGVtZW50c0V4cGFuZGVkU3RhdGVb Y2hpbGQuaWRlbnRpZmllcl07CiAKKyAgICAgICAgLy8gVXBkYXRlIHRoZSBTZWxlY3Rpb25Db250 cm9sbGVyIGJlZm9yZSBhdHRhY2hpbmcgdGhlIFRyZWVFbGVtZW50LgorICAgICAgICAvLyBBdHRh Y2hpbmcgdGhlIFRyZWVFbGVtZW50IGNhbiBjYXVzZSBpdCB0byBiZWNvbWUgc2VsZWN0ZWQsIGFu ZAorICAgICAgICAvLyBhZGRlZCB0byB0aGUgU2VsZWN0aW9uQ29udHJvbGxlci4KKyAgICAgICAg bGV0IGluc2VydGlvbkluZGV4ID0gdGhpcy50cmVlT3V0bGluZS5faW5kZXhPZlRyZWVFbGVtZW50 KGNoaWxkKSB8fCAwOworICAgICAgICB0aGlzLnRyZWVPdXRsaW5lLl9zZWxlY3Rpb25Db250cm9s bGVyLmRpZEluc2VydEl0ZW0oaW5zZXJ0aW9uSW5kZXgpOworCiAgICAgICAgIGlmICh0aGlzLl9j aGlsZHJlbkxpc3ROb2RlKQogICAgICAgICAgICAgY2hpbGQuX2F0dGFjaCgpOwogCkBAIC0zMDMs OSArMzA4LDYgQEAgV0kuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdJ Lk9iamVjdAogCiAgICAgICAgIGlmIChpc0ZpcnN0Q2hpbGQgJiYgdGhpcy5leHBhbmRlZCkKICAg ICAgICAgICAgIHRoaXMuZXhwYW5kKCk7Ci0KLSAgICAgICAgbGV0IGluc2VydGlvbkluZGV4ID0g dGhpcy50cmVlT3V0bGluZS5faW5kZXhPZlRyZWVFbGVtZW50KGNoaWxkLnByZXZpb3VzU2libGlu ZykgfHwgMDsKLSAgICAgICAgdGhpcy50cmVlT3V0bGluZS5fc2VsZWN0aW9uQ29udHJvbGxlci5k aWRJbnNlcnRJdGVtKGluc2VydGlvbkluZGV4KTsKICAgICB9CiAKICAgICByZW1vdmVDaGlsZEF0 SW5kZXgoY2hpbGRJbmRleCwgc3VwcHJlc3NPbkRlc2VsZWN0LCBzdXBwcmVzc1NlbGVjdFNpYmxp bmcpCkBAIC0zOTUsOSArMzk3LDYgQEAgV0kuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGlu ZSBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgX3JlbWVtYmVyVHJlZUVsZW1lbnQoZWxlbWVudCkK ICAgICB7Ci0gICAgICAgIHRoaXMuX3RyZWVFbGVtZW50SW5kZXhDYWNoZS5jbGVhcigpOwotICAg ICAgICB0aGlzLl9jYWNoZWROdW1iZXJPZkRlc2NlbmRlbnRzKys7Ci0KICAgICAgICAgaWYgKCF0 aGlzLl9rbm93blRyZWVFbGVtZW50c1tlbGVtZW50LmlkZW50aWZpZXJdKQogICAgICAgICAgICAg dGhpcy5fa25vd25UcmVlRWxlbWVudHNbZWxlbWVudC5pZGVudGlmaWVyXSA9IFtdOwogCkBAIC00 MDgsMTkgKzQwNywxOSBAQCBXSS5UcmVlT3V0bGluZSA9IGNsYXNzIFRyZWVPdXRsaW5lIGV4dGVu ZHMgV0kuT2JqZWN0CiAKICAgICAgICAgLy8gYWRkIHRoZSBlbGVtZW50CiAgICAgICAgIGVsZW1l bnRzLnB1c2goZWxlbWVudCk7CisgICAgICAgIHRoaXMuX2NhY2hlZE51bWJlck9mRGVzY2VuZGVu dHMrKzsKICAgICB9CiAKICAgICBfZm9yZ2V0VHJlZUVsZW1lbnQoZWxlbWVudCkKICAgICB7Ci0g ICAgICAgIHRoaXMuX3RyZWVFbGVtZW50SW5kZXhDYWNoZS5jbGVhcigpOwotICAgICAgICB0aGlz Ll9jYWNoZWROdW1iZXJPZkRlc2NlbmRlbnRzLS07Ci0KICAgICAgICAgaWYgKHRoaXMuc2VsZWN0 ZWRUcmVlRWxlbWVudCA9PT0gZWxlbWVudCkgewogICAgICAgICAgICAgZWxlbWVudC5kZXNlbGVj dCh0cnVlKTsKICAgICAgICAgICAgIHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudCA9IG51bGw7CiAg ICAgICAgIH0KLSAgICAgICAgaWYgKHRoaXMuX2tub3duVHJlZUVsZW1lbnRzW2VsZW1lbnQuaWRl bnRpZmllcl0pCisgICAgICAgIGlmICh0aGlzLl9rbm93blRyZWVFbGVtZW50c1tlbGVtZW50Lmlk ZW50aWZpZXJdKSB7CiAgICAgICAgICAgICB0aGlzLl9rbm93blRyZWVFbGVtZW50c1tlbGVtZW50 LmlkZW50aWZpZXJdLnJlbW92ZShlbGVtZW50LCB0cnVlKTsKKyAgICAgICAgICAgIHRoaXMuX2Nh Y2hlZE51bWJlck9mRGVzY2VuZGVudHMtLTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIF9mb3Jn ZXRDaGlsZHJlblJlY3Vyc2l2ZShwYXJlbnRFbGVtZW50KQpAQCAtOTkzLDM0ICs5OTIsMjIgQEAg V0kuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdJLk9iamVjdAogCiAg ICAgX2luZGV4T2ZUcmVlRWxlbWVudCh0cmVlRWxlbWVudCkKICAgICB7Ci0gICAgICAgIGZ1bmN0 aW9uIHByZXZpb3VzRWxlbWVudChlbGVtZW50KSB7Ci0gICAgICAgICAgICBpZiAoZWxlbWVudC5w cmV2aW91c1NpYmxpbmcpIHsKLSAgICAgICAgICAgICAgICBlbGVtZW50ID0gZWxlbWVudC5wcmV2 aW91c1NpYmxpbmc7Ci0gICAgICAgICAgICAgICAgaWYgKGVsZW1lbnQuY2hpbGRyZW4ubGVuZ3Ro KQotICAgICAgICAgICAgICAgICAgICBlbGVtZW50ID0gZWxlbWVudC5jaGlsZHJlbi5sYXN0VmFs dWU7Ci0gICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAgICBlbGVtZW50ID0gZWxlbWVu dC5wYXJlbnQgJiYgZWxlbWVudC5wYXJlbnQucm9vdCA/IG51bGwgOiBlbGVtZW50LnBhcmVudDsK LSAgICAgICAgICAgIHJldHVybiBlbGVtZW50OwotICAgICAgICB9CisgICAgICAgIGNvbnN0IHNr aXBVbnJldmVhbGVkID0gZmFsc2U7CisgICAgICAgIGNvbnN0IHN0YXlXaXRoaW4gPSBudWxsOwor ICAgICAgICBjb25zdCBkb250UG9wdWxhdGUgPSB0cnVlOwogCiAgICAgICAgIGxldCBpbmRleCA9 IDA7Ci0gICAgICAgIGxldCBjdXJyZW50ID0gdHJlZUVsZW1lbnQ7CisgICAgICAgIGxldCBjdXJy ZW50ID0gdGhpcy5jaGlsZHJlblswXTsKICAgICAgICAgd2hpbGUgKGN1cnJlbnQpIHsKLSAgICAg ICAgICAgIGxldCBjbG9zZXN0SW5kZXggPSB0aGlzLl90cmVlRWxlbWVudEluZGV4Q2FjaGUuZ2V0 KGN1cnJlbnQpOwotICAgICAgICAgICAgaWYgKCFpc05hTihjbG9zZXN0SW5kZXgpKSB7Ci0gICAg ICAgICAgICAgICAgaW5kZXggKz0gY2xvc2VzdEluZGV4OwotICAgICAgICAgICAgICAgIGJyZWFr OwotICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKHRyZWVFbGVtZW50ID09PSBjdXJyZW50 KQorICAgICAgICAgICAgICAgIHJldHVybiBpbmRleDsKIAotICAgICAgICAgICAgY3VycmVudCA9 IHByZXZpb3VzRWxlbWVudChjdXJyZW50KTsKLSAgICAgICAgICAgIGlmIChjdXJyZW50KQotICAg ICAgICAgICAgICAgIGluZGV4Kys7CisgICAgICAgICAgICBjdXJyZW50ID0gY3VycmVudC50cmF2 ZXJzZU5leHRUcmVlRWxlbWVudChza2lwVW5yZXZlYWxlZCwgc3RheVdpdGhpbiwgZG9udFBvcHVs YXRlKTsKKyAgICAgICAgICAgICsraW5kZXg7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIXRo aXMuX3RyZWVFbGVtZW50SW5kZXhDYWNoZS5oYXModHJlZUVsZW1lbnQpKQotICAgICAgICAgICAg dGhpcy5fdHJlZUVsZW1lbnRJbmRleENhY2hlLnNldCh0cmVlRWxlbWVudCwgaW5kZXgpOwotCi0g ICAgICAgIHJldHVybiBpbmRleDsKKyAgICAgICAgY29uc29sZS5hc3NlcnQoZmFsc2UsICJVbmFi bGUgdG8gZ2V0IGluZGV4IGZvciB0cmVlIGVsZW1lbnQuIiwgdHJlZUVsZW1lbnQsIHRyZWVPdXRs aW5lKTsKKyAgICAgICAgcmV0dXJuIE5hTjsKICAgICB9CiAKICAgICBfdHJlZUVsZW1lbnRBdElu ZGV4KGluZGV4KQo=