158272 2016-06-01 13:53:21 -0700 Web Inspector: Visual Styles: "Text -> Content" section should only be visible for pseudo-element 2016-08-22 22:36:29 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 160893 148269 158271 1 nvasilyev hi bburg commit-queue hi joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1198270 0 nvasilyev 2016-06-01 13:53:21 -0700 Currently, "Content" is the first item in the "Text" section, yet it doesn't do anything for regular (non pseudo) elements. We should only show it for pseudo elements. 1198272 1 webkit-bug-importer 2016-06-01 13:54:02 -0700 <rdar://problem/26585010> 1220201 2 286106 hi 2016-08-15 15:54:22 -0700 Created attachment 286106 Patch 1220234 3 286106 joepeck 2016-08-15 16:44:20 -0700 Comment on attachment 286106 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=286106&action=review r=me, but maybe file a follow-up on better detection. > Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.css:-100 > -.visual-style-property-container.transition, > -.visual-style-property-container.animation { > - margin-left: 11px; > -} Seems unrelated, but fine! > Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js:193 > + let isPseudoElement = currentSelector.includes(":before") || currentSelector.includes(":after") || this._nodeStyles.node.isPseudoElement(); This is tricky. Selector text of: "foo x::before bar" wouldn't want this. But "foo, x::before, bar" would. Perhaps this could be made smarter to check each of the selectors to see if one ends with :before/:after? 1220395 4 286157 hi 2016-08-16 00:11:44 -0700 Created attachment 286157 Patch 1220520 5 286157 joepeck 2016-08-16 12:07:09 -0700 Comment on attachment 286157 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=286157&action=review > Source/WebInspectorUI/UserInterface/Models/CSSRule.js:164 > + hasMatchedPseudoSelector() > + { > + if (this.nodeStyles && this.nodeStyles.node && this.nodeStyles.node.isPseudoElement()) > + return true; > + > + return this.selectors.some((selector, i) => selector.isPseudoSelector() && this.matchedSelectors.includes(i)); > + } The intent here is PsuedoElement selectors. But there are plenty of other pseudo element selectors and the CSS content property only affects ::before/::after, so this should be hasBeforeAfterPseudoElementSelector, with a CSSSelector method isBeforeAfterPsuedoElementSelector. In reality I don't think we can do this perfectly without re-implementing a selector engine or backend support, since things like ":matches(div::before, foo)" which expands to "div::before, foo" would be missed. But what you have catches the 90% case, so I think its worth doing. > Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js:194 > + let isMatchedPseudoSelector = this._currentStyle.ownerRule && this._currentStyle.ownerRule.hasMatchedPseudoSelector(); > + this._groups.content.section.element.classList.toggle("inactive", !isMatchedPseudoSelector); > + this._groups.listStyle.section.element.classList.toggle("inactive", isMatchedPseudoSelector); Variable name suggestion: let ruleMatchesBeforeAfterPseudoElement. > Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorTreeItem.js:58 > + let iconClasses = [iconClassName]; > + if (style.ownerRule && style.ownerRule.hasMatchedPseudoSelector()) > + iconClasses.push(WebInspector.CSSStyleDeclarationSection.PseudoSelectorStyleClassName); I see this is doing the [P] things from the other patch. Which is still being discussed. I think the top parts above regarding `content` look good to me. But these still need some discussion. 1220691 6 286240 hi 2016-08-16 17:56:28 -0700 Created attachment 286240 Patch 1221396 7 286461 hi 2016-08-19 10:55:39 -0700 Created attachment 286461 Patch 1222070 8 286461 joepeck 2016-08-22 19:59:09 -0700 Comment on attachment 286461 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=286461&action=review r=me > Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js:668 > + properties.content = new WebInspector.VisualStyleBasicInput("content", null, WebInspector.UIString("Enter a value")); Something feels off about this placeholder string. Safari's URL bar says "Search or enter website name" not "Search or enter a website name". Maybe drop the "a" here making this "Enter value"? 1222115 9 286672 hi 2016-08-22 22:05:53 -0700 Created attachment 286672 Patch 1222126 10 286672 commit-queue 2016-08-22 22:36:25 -0700 Comment on attachment 286672 Patch Clearing flags on attachment: 286672 Committed r204757: <http://trac.webkit.org/changeset/204757> 1222127 11 commit-queue 2016-08-22 22:36:29 -0700 All reviewed patches have been landed. Closing bug. 286106 2016-08-15 15:54:22 -0700 2016-08-16 00:11:38 -0700 Patch bug-158272-20160815155237.patch text/plain 5957 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3YjliMjNiYjA0ZWZiMGVjNTMzZWI4MDU2NGEy NDdkNzFmZjJiZWMuLjMxZDA2ZGMzNDM5MWE5ZDMwZDAzNDhmYWI4MGFjY2NlYWViZGYyZGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE2LTA4LTE1ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFZpc3VhbCBTdHlsZXM6ICJUZXh0IC0+IENvbnRlbnQiIHNlY3Rpb24gc2hvdWxkIG9u bHkgYmUgdmlzaWJsZSBmb3IgcHNldWRvLWVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODI3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHls ZURldGFpbHNQYW5lbC5jc3M6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNz cy1zdHlsZSAudmlzdWFsID4gLmRldGFpbHMtc2VjdGlvbiA6bWF0Y2hlcyguZGV0YWlscy1zZWN0 aW9uLCAuZ3JvdXApLmluYWN0aXZlKToKKyAgICAgICAgKC52aXN1YWwtc3R5bGUtcHJvcGVydHkt Y29udGFpbmVyLnRyYW5zaXRpb24pOiBEZWxldGVkLgorICAgICAgICAoLnZpc3VhbC1zdHlsZS1w cm9wZXJ0eS1jb250YWluZXIuYW5pbWF0aW9uKTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlLmluaXRpYWxMYXlvdXQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlw ZS5fdXBkYXRlU2VjdGlvbnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0 YWlsc1BhbmVsLnByb3RvdHlwZS5fcG9wdWxhdGVDb250ZW50U2VjdGlvbik6CisKIDIwMTYtMDgt MTIgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IEFkZCBhcHBsaWNhdGlvbi92bmQuYXBpK2pzb24gYXMgYSB2YWxpZCBKU09OIE1J TUUtdHlwZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMv ZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2Nh bGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggOTk5OTYyMzYwNmQz YmY4ZTc0MmZkMzBmYmJhOTc0N2UyOGI2ZjU4ZS4uNmIzYmM2YjhmYWY4NjIwMDM0ZmJiNGM2NWIx YjM2NTRmMTE3ZjE1OSAxMDA2NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0YSAzMwpvY21lQT0lbGhS az54U05gdGNlVD8zfXVzRk87JShFdlpqQVhXaTs4YEZxUHtmMFA1S2RZNSlLTAoKZGVsdGEgMTgK YWNtZXh6bWJMM0Y+eFNOYGxkWSVlWkMwSWp7c0k3N05lUHF5CgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFu ZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFs U3R5bGVEZXRhaWxzUGFuZWwuY3NzCmluZGV4IDYzNmViODU4YzE2N2YwYTAwYjhjNGRhMDMxYTA5 ZGNjNTk1MWUzYmMuLjNlNzFmY2U5ODNlOTEyYjliZjYxOTlhMzZkNmY1MmZmNmU1OGFiMjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlRGV0YWlsc1BhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5jc3MKQEAgLTIzLDYgKzIzLDEw IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAorLnNpZGViYXIg PiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+IC5kZXRhaWxzLXNlY3Rpb24gOm1h dGNoZXMoLmRldGFpbHMtc2VjdGlvbiwgLmdyb3VwKS5pbmFjdGl2ZSB7CisgICAgZGlzcGxheTog bm9uZTsKK30KKwogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+ IC5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgewogICAgIGZvbnQt d2VpZ2h0OiBub3JtYWw7CiB9CkBAIC05NCwxMSArOTgsNiBAQAogICAgIHdpZHRoOiA1NXB4Owog fQogCi0udmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci50cmFuc2l0aW9uLAotLnZpc3Vh bC1zdHlsZS1wcm9wZXJ0eS1jb250YWluZXIuYW5pbWF0aW9uIHsKLSAgICBtYXJnaW4tbGVmdDog MTFweDsKLX0KLQogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbC5k aXNhYmxlZCA+IC5kZXRhaWxzLXNlY3Rpb246bm90KC52aXN1YWwtc3R5bGUtc2VsZWN0b3Itc2Vj dGlvbikgewogICAgIG9wYWNpdHk6IDAuNTsKICAgICBwb2ludGVyLWV2ZW50czogbm9uZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlRGV0YWlsc1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKaW5kZXggMGUzN2UwOWI3OWE1ODBi ZGI0MmY5MmYzYjkyOTQzYTdmYzMwNTA1Yi4uMGUyOGQzNDliMGYxNmUzNGM4N2Q2NGI3MWZhNGE2 YmFhM2NlZDhmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKQEAg LTkxLDEzICs5MSwxNCBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgPSBj bGFzcyBWaXN1YWxTdHlsZURldGFpbHNQYW5lbCBleHRlbmRzIFdlYgogICAgICAgICB0aGlzLmVs ZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fc2VjdGlvbnMubGF5b3V0LmVsZW1lbnQpOwogCiAgICAg ICAgIC8vIFRleHQgU2VjdGlvbgorICAgICAgICB0aGlzLl9nZW5lcmF0ZVNlY3Rpb24oImNvbnRl bnQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvbnRlbnQiKSk7CiAgICAgICAgIHRoaXMuX2dl bmVyYXRlU2VjdGlvbigidGV4dC1zdHlsZSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3R5bGUi KSk7CiAgICAgICAgIHRoaXMuX2dlbmVyYXRlU2VjdGlvbigiZm9udCIsIFdlYkluc3BlY3Rvci5V SVN0cmluZygiRm9udCIpKTsKICAgICAgICAgdGhpcy5fZ2VuZXJhdGVTZWN0aW9uKCJmb250LXZh cmlhbnRzIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJWYXJpYW50cyIpKTsKICAgICAgICAgdGhp cy5fZ2VuZXJhdGVTZWN0aW9uKCJ0ZXh0LXNwYWNpbmciLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlNwYWNpbmciKSk7CiAgICAgICAgIHRoaXMuX2dlbmVyYXRlU2VjdGlvbigidGV4dC1zaGFkb3ci LCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNoYWRvdyIpKTsKIAotICAgICAgICB0aGlzLl9zZWN0 aW9ucy50ZXh0ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbigidGV4dCIsIFdlYklu c3BlY3Rvci5VSVN0cmluZygiVGV4dCIpLCBbdGhpcy5fZ3JvdXBzLnRleHRTdHlsZS5zZWN0aW9u LCB0aGlzLl9ncm91cHMuZm9udC5zZWN0aW9uLCB0aGlzLl9ncm91cHMuZm9udFZhcmlhbnRzLnNl Y3Rpb24sIHRoaXMuX2dyb3Vwcy50ZXh0U3BhY2luZy5zZWN0aW9uLCB0aGlzLl9ncm91cHMudGV4 dFNoYWRvdy5zZWN0aW9uXSk7CisgICAgICAgIHRoaXMuX3NlY3Rpb25zLnRleHQgPSBuZXcgV2Vi SW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uKCJ0ZXh0IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJU ZXh0IiksIFt0aGlzLl9ncm91cHMuY29udGVudC5zZWN0aW9uLCB0aGlzLl9ncm91cHMudGV4dFN0 eWxlLnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy5mb250LnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy5mb250 VmFyaWFudHMuc2VjdGlvbiwgdGhpcy5fZ3JvdXBzLnRleHRTcGFjaW5nLnNlY3Rpb24sIHRoaXMu X2dyb3Vwcy50ZXh0U2hhZG93LnNlY3Rpb25dKTsKICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuX3NlY3Rpb25zLnRleHQuZWxlbWVudCk7CiAKICAgICAgICAgLy8gQmFja2dy b3VuZCBTZWN0aW9uCkBAIC0xODcsNiArMTg4LDEyIEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHls ZURldGFpbHNQYW5lbCA9IGNsYXNzIFZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMgV2Vi CiAgICAgICAgICAgICAgICAgICAgIHNlY3Rpb24uY29sbGFwc2VkID0gZmFsc2U7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KKworICAgICAgICBsZXQgY3VycmVudFNlbGVjdG9yID0gKHRoaXMu X2N1cnJlbnRTdHlsZS5vd25lclJ1bGUgJiYgdGhpcy5fY3VycmVudFN0eWxlLm93bmVyUnVsZS5z ZWxlY3RvclRleHQpIHx8ICIiOworICAgICAgICBsZXQgaXNQc2V1ZG9FbGVtZW50ID0gY3VycmVu dFNlbGVjdG9yLmluY2x1ZGVzKCI6YmVmb3JlIikgfHwgY3VycmVudFNlbGVjdG9yLmluY2x1ZGVz KCI6YWZ0ZXIiKSB8fCB0aGlzLl9ub2RlU3R5bGVzLm5vZGUuaXNQc2V1ZG9FbGVtZW50KCk7CisK KyAgICAgICAgdGhpcy5fZ3JvdXBzLmNvbnRlbnQuc2VjdGlvbi5lbGVtZW50LmNsYXNzTGlzdC50 b2dnbGUoImluYWN0aXZlIiwgIWlzUHNldWRvRWxlbWVudCk7CisgICAgICAgIHRoaXMuX2dyb3Vw cy5saXN0U3R5bGUuc2VjdGlvbi5lbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoImluYWN0aXZlIiwg aXNQc2V1ZG9FbGVtZW50KTsKICAgICB9CiAKICAgICBfdXBkYXRlUHJvcGVydGllcyhncm91cCwg Zm9yY2VTdHlsZVVwZGF0ZSkKQEAgLTY1Myw2ICs2NjAsMjEgQEAgV2ViSW5zcGVjdG9yLlZpc3Vh bFN0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5k cyBXZWIKICAgICAgICAgcHJvcGVydGllcy5hbGlnblNlbGYuYWRkRGVwZW5kZW5jeSgiZGlzcGxh eSIsIGFsbG93ZWREaXNwbGF5VmFsdWVzKTsKICAgICB9CiAKKyAgICBfcG9wdWxhdGVDb250ZW50 U2VjdGlvbigpCisgICAgeworICAgICAgICBsZXQgZ3JvdXAgPSB0aGlzLl9ncm91cHMuY29udGVu dDsKKyAgICAgICAgbGV0IHByb3BlcnRpZXMgPSBncm91cC5wcm9wZXJ0aWVzOworCisgICAgICAg IGxldCBjb250ZW50Um93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblJvdzsKKwor ICAgICAgICBwcm9wZXJ0aWVzLmNvbnRlbnQgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxl QmFzaWNJbnB1dCgiY29udGVudCIsIG51bGwsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRW50ZXIg YSB2YWx1ZSIpKTsKKworICAgICAgICBjb250ZW50Um93LmVsZW1lbnQuYXBwZW5kQ2hpbGQocHJv cGVydGllcy5jb250ZW50LmVsZW1lbnQpOworCisgICAgICAgIGxldCBjb250ZW50R3JvdXAgPSBu ZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uR3JvdXAoW2NvbnRlbnRSb3ddKTsKKyAgICAg ICAgdGhpcy5fcG9wdWxhdGVTZWN0aW9uKGdyb3VwLCBbY29udGVudEdyb3VwXSk7CisgICAgfQor CiAgICAgX3BvcHVsYXRlVGV4dFN0eWxlU2VjdGlvbigpCiAgICAgewogICAgICAgICBsZXQgZ3Jv dXAgPSB0aGlzLl9ncm91cHMudGV4dFN0eWxlOwo= 286157 2016-08-16 00:11:44 -0700 2016-08-16 17:56:25 -0700 Patch bug-158272-20160816000958.patch text/plain 10830 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3YjliMjNiYjA0ZWZiMGVjNTMzZWI4MDU2NGEy NDdkNzFmZjJiZWMuLjY3MTA3YjNlMmNlZjdiYTEwZjQ3MmNiMDg4MjY5NDJiNjVkMDRiY2MgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE2LTA4LTE1ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFZpc3VhbCBTdHlsZXM6ICJUZXh0IC0+IENvbnRlbnQiIHNlY3Rpb24gc2hvdWxkIG9u bHkgYmUgdmlzaWJsZSBmb3IgcHNldWRvLWVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODI3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5q czoKKyAgICAgICAgKEFycmF5LnByb3RvdHlwZS50b2dnbGVJbmNsdWRlcyk6CisgICAgICAgIFRv Z2dsZXMgd2hldGhlciBvciBub3QgdG8gaW5jbHVkZSB0aGUgZ2l2ZW4gdmFsdWUgaW4gdGhlIGFy cmF5IGJhc2VkIG9uIGl0cyBleGlzdGVuY2Ugb3IgYQorICAgICAgICAiZm9yY2UiIGZsYWcgcGFy YW1ldGVyLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTUnVsZS5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5DU1NSdWxlLnByb3RvdHlwZS5oYXNNYXRjaGVkUHNldWRvU2Vs ZWN0b3IpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZURldGFp bHNQYW5lbC5jc3M6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHls ZSAudmlzdWFsID4gLmRldGFpbHMtc2VjdGlvbiA6bWF0Y2hlcyguZGV0YWlscy1zZWN0aW9uLCAu Z3JvdXApLmluYWN0aXZlKToKKyAgICAgICAgKC52aXN1YWwtc3R5bGUtcHJvcGVydHktY29udGFp bmVyLnRyYW5zaXRpb24pOiBEZWxldGVkLgorICAgICAgICAoLnZpc3VhbC1zdHlsZS1wcm9wZXJ0 eS1jb250YWluZXIuYW5pbWF0aW9uKTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlLmluaXRpYWxMYXlvdXQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5fdXBk YXRlU2VjdGlvbnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1Bh bmVsLnByb3RvdHlwZS5fcG9wdWxhdGVDb250ZW50U2VjdGlvbik6CisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0pOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlZpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5wcm90b3R5cGUuZ2V0IGljb25D bGFzc05hbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlU2VsZWN0b3JUcmVl SXRlbS5wcm90b3R5cGUuX3VwZGF0ZVNlbGVjdG9ySWNvbik6CisKIDIwMTYtMDgtMTIgIFRpbW90 aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IEFkZCBhcHBsaWNhdGlvbi92bmQuYXBpK2pzb24gYXMgYSB2YWxpZCBKU09OIE1JTUUtdHlwZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ov bG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25z L2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggOTk5OTYyMzYwNmQzYmY4ZTc0MmZk MzBmYmJhOTc0N2UyOGI2ZjU4ZS4uNmIzYmM2YjhmYWY4NjIwMDM0ZmJiNGM2NWIxYjM2NTRmMTE3 ZjE1OSAxMDA2NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0YSAzMwpvY21lQT0lbGhSaz54U05gdGNl VD8zfXVzRk87JShFdlpqQVhXaTs4YEZxUHtmMFA1S2RZNSlLTAoKZGVsdGEgMTgKYWNtZXh6bWJM M0Y+eFNOYGxkWSVlWkMwSWp7c0k3N05lUHF5CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwppbmRleCA3NmI0NzQwNjVhZWQ5 MTJlYzgxMmI0MjIxMzdmMWJlNjJjYzJmYTZiLi5lOWRjMmUzMDViZmVhZDAxZjg2YzZlMmVjNzNi MzAxZDM0ZmFmM2RhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL1V0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwpAQCAtNDY5LDYgKzQ2OSwyMSBAQCBPYmplY3QuZGVm aW5lUHJvcGVydHkoQXJyYXkucHJvdG90eXBlLCAicmVtb3ZlIiwKICAgICB9CiB9KTsKIAorT2Jq ZWN0LmRlZmluZVByb3BlcnR5KEFycmF5LnByb3RvdHlwZSwgInRvZ2dsZUluY2x1ZGVzIiwKK3sK KyAgICB2YWx1ZTogZnVuY3Rpb24odmFsdWUsIGZvcmNlKQorICAgIHsKKyAgICAgICAgbGV0IGV4 aXN0cyA9IHRoaXMuaW5jbHVkZXModmFsdWUpOworICAgICAgICBpZiAoZXhpc3RzID09PSAhIWZv cmNlKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlmIChleGlzdHMpCisgICAgICAg ICAgICB0aGlzLnJlbW92ZSh2YWx1ZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRoaXMu cHVzaCh2YWx1ZSk7CisgICAgfQorfSk7CisKIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShBcnJheS5w cm90b3R5cGUsICJpbnNlcnRBdEluZGV4IiwKIHsKICAgICB2YWx1ZTogZnVuY3Rpb24odmFsdWUs IGluZGV4KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL0NTU1J1bGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9N b2RlbHMvQ1NTUnVsZS5qcwppbmRleCA0YTVkOWU0YTJjM2MzYmM4ZjhiNWRhZTE2YzFmY2E1YjIz NDdhZGJmLi5iNTUyZDlkMTZjZmQ3MjdlZGYxM2YwNzFhOGQzNmYyMzIzZmVmM2NhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTUnVsZS5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTUnVs ZS5qcwpAQCAtMTU1LDYgKzE1NSwxNCBAQCBXZWJJbnNwZWN0b3IuQ1NTUnVsZSA9IGNsYXNzIENT U1J1bGUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIHJldHVybiB0aGlzLl9t YXRjaGVkU2VsZWN0b3JUZXh0OwogICAgIH0KIAorICAgIGhhc01hdGNoZWRQc2V1ZG9TZWxlY3Rv cigpCisgICAgeworICAgICAgICBpZiAodGhpcy5ub2RlU3R5bGVzICYmIHRoaXMubm9kZVN0eWxl cy5ub2RlICYmIHRoaXMubm9kZVN0eWxlcy5ub2RlLmlzUHNldWRvRWxlbWVudCgpKQorICAgICAg ICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAgICAgcmV0dXJuIHRoaXMuc2VsZWN0b3JzLnNvbWUo KHNlbGVjdG9yLCBpKSA9PiBzZWxlY3Rvci5pc1BzZXVkb1NlbGVjdG9yKCkgJiYgdGhpcy5tYXRj aGVkU2VsZWN0b3JzLmluY2x1ZGVzKGkpKTsKKyAgICB9CisKICAgICBnZXQgc3R5bGUoKQogICAg IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3N0eWxlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuY3Nz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVE ZXRhaWxzUGFuZWwuY3NzCmluZGV4IDYzNmViODU4YzE2N2YwYTAwYjhjNGRhMDMxYTA5ZGNjNTk1 MWUzYmMuLjNlNzFmY2U5ODNlOTEyYjliZjYxOTlhMzZkNmY1MmZmNmU1OGFiMjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxl RGV0YWlsc1BhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5jc3MKQEAgLTIzLDYgKzIzLDEwIEBACiAg KiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAorLnNpZGViYXIgPiAucGFu ZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+IC5kZXRhaWxzLXNlY3Rpb24gOm1hdGNoZXMo LmRldGFpbHMtc2VjdGlvbiwgLmdyb3VwKS5pbmFjdGl2ZSB7CisgICAgZGlzcGxheTogbm9uZTsK K30KKwogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+IC5kZXRh aWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgewogICAgIGZvbnQtd2VpZ2h0 OiBub3JtYWw7CiB9CkBAIC05NCwxMSArOTgsNiBAQAogICAgIHdpZHRoOiA1NXB4OwogfQogCi0u dmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci50cmFuc2l0aW9uLAotLnZpc3VhbC1zdHls ZS1wcm9wZXJ0eS1jb250YWluZXIuYW5pbWF0aW9uIHsKLSAgICBtYXJnaW4tbGVmdDogMTFweDsK LX0KLQogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbC5kaXNhYmxl ZCA+IC5kZXRhaWxzLXNlY3Rpb246bm90KC52aXN1YWwtc3R5bGUtc2VsZWN0b3Itc2VjdGlvbikg ewogICAgIG9wYWNpdHk6IDAuNTsKICAgICBwb2ludGVyLWV2ZW50czogbm9uZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxl RGV0YWlsc1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKaW5kZXggMGUzN2UwOWI3OWE1ODBiZGI0MmY5 MmYzYjkyOTQzYTdmYzMwNTA1Yi4uZThkMjgzMWJiMDA5MWE2NjI1YzgxYzIyMzk0ZmUyZGU4YWQw OWEyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKQEAgLTkxLDEz ICs5MSwxNCBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgPSBjbGFzcyBW aXN1YWxTdHlsZURldGFpbHNQYW5lbCBleHRlbmRzIFdlYgogICAgICAgICB0aGlzLmVsZW1lbnQu YXBwZW5kQ2hpbGQodGhpcy5fc2VjdGlvbnMubGF5b3V0LmVsZW1lbnQpOwogCiAgICAgICAgIC8v IFRleHQgU2VjdGlvbgorICAgICAgICB0aGlzLl9nZW5lcmF0ZVNlY3Rpb24oImNvbnRlbnQiLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvbnRlbnQiKSk7CiAgICAgICAgIHRoaXMuX2dlbmVyYXRl U2VjdGlvbigidGV4dC1zdHlsZSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3R5bGUiKSk7CiAg ICAgICAgIHRoaXMuX2dlbmVyYXRlU2VjdGlvbigiZm9udCIsIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiRm9udCIpKTsKICAgICAgICAgdGhpcy5fZ2VuZXJhdGVTZWN0aW9uKCJmb250LXZhcmlhbnRz IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJWYXJpYW50cyIpKTsKICAgICAgICAgdGhpcy5fZ2Vu ZXJhdGVTZWN0aW9uKCJ0ZXh0LXNwYWNpbmciLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNwYWNp bmciKSk7CiAgICAgICAgIHRoaXMuX2dlbmVyYXRlU2VjdGlvbigidGV4dC1zaGFkb3ciLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlNoYWRvdyIpKTsKIAotICAgICAgICB0aGlzLl9zZWN0aW9ucy50 ZXh0ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbigidGV4dCIsIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiVGV4dCIpLCBbdGhpcy5fZ3JvdXBzLnRleHRTdHlsZS5zZWN0aW9uLCB0aGlz Ll9ncm91cHMuZm9udC5zZWN0aW9uLCB0aGlzLl9ncm91cHMuZm9udFZhcmlhbnRzLnNlY3Rpb24s IHRoaXMuX2dyb3Vwcy50ZXh0U3BhY2luZy5zZWN0aW9uLCB0aGlzLl9ncm91cHMudGV4dFNoYWRv dy5zZWN0aW9uXSk7CisgICAgICAgIHRoaXMuX3NlY3Rpb25zLnRleHQgPSBuZXcgV2ViSW5zcGVj dG9yLkRldGFpbHNTZWN0aW9uKCJ0ZXh0IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUZXh0Iiks IFt0aGlzLl9ncm91cHMuY29udGVudC5zZWN0aW9uLCB0aGlzLl9ncm91cHMudGV4dFN0eWxlLnNl Y3Rpb24sIHRoaXMuX2dyb3Vwcy5mb250LnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy5mb250VmFyaWFu dHMuc2VjdGlvbiwgdGhpcy5fZ3JvdXBzLnRleHRTcGFjaW5nLnNlY3Rpb24sIHRoaXMuX2dyb3Vw cy50ZXh0U2hhZG93LnNlY3Rpb25dKTsKICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuX3NlY3Rpb25zLnRleHQuZWxlbWVudCk7CiAKICAgICAgICAgLy8gQmFja2dyb3VuZCBT ZWN0aW9uCkBAIC0xODcsNiArMTg4LDEwIEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFp bHNQYW5lbCA9IGNsYXNzIFZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMgV2ViCiAgICAg ICAgICAgICAgICAgICAgIHNlY3Rpb24uY29sbGFwc2VkID0gZmFsc2U7CiAgICAgICAgICAgICB9 CiAgICAgICAgIH0KKworICAgICAgICBsZXQgaXNNYXRjaGVkUHNldWRvU2VsZWN0b3IgPSB0aGlz Ll9jdXJyZW50U3R5bGUub3duZXJSdWxlICYmIHRoaXMuX2N1cnJlbnRTdHlsZS5vd25lclJ1bGUu aGFzTWF0Y2hlZFBzZXVkb1NlbGVjdG9yKCk7CisgICAgICAgIHRoaXMuX2dyb3Vwcy5jb250ZW50 LnNlY3Rpb24uZWxlbWVudC5jbGFzc0xpc3QudG9nZ2xlKCJpbmFjdGl2ZSIsICFpc01hdGNoZWRQ c2V1ZG9TZWxlY3Rvcik7CisgICAgICAgIHRoaXMuX2dyb3Vwcy5saXN0U3R5bGUuc2VjdGlvbi5l bGVtZW50LmNsYXNzTGlzdC50b2dnbGUoImluYWN0aXZlIiwgaXNNYXRjaGVkUHNldWRvU2VsZWN0 b3IpOwogICAgIH0KIAogICAgIF91cGRhdGVQcm9wZXJ0aWVzKGdyb3VwLCBmb3JjZVN0eWxlVXBk YXRlKQpAQCAtNjUzLDYgKzY1OCwyMSBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxz UGFuZWwgPSBjbGFzcyBWaXN1YWxTdHlsZURldGFpbHNQYW5lbCBleHRlbmRzIFdlYgogICAgICAg ICBwcm9wZXJ0aWVzLmFsaWduU2VsZi5hZGREZXBlbmRlbmN5KCJkaXNwbGF5IiwgYWxsb3dlZERp c3BsYXlWYWx1ZXMpOwogICAgIH0KIAorICAgIF9wb3B1bGF0ZUNvbnRlbnRTZWN0aW9uKCkKKyAg ICB7CisgICAgICAgIGxldCBncm91cCA9IHRoaXMuX2dyb3Vwcy5jb250ZW50OworICAgICAgICBs ZXQgcHJvcGVydGllcyA9IGdyb3VwLnByb3BlcnRpZXM7CisKKyAgICAgICAgbGV0IGNvbnRlbnRS b3cgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uUm93OworCisgICAgICAgIHByb3Bl cnRpZXMuY29udGVudCA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVCYXNpY0lucHV0KCJj b250ZW50IiwgbnVsbCwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFbnRlciBhIHZhbHVlIikpOwor CisgICAgICAgIGNvbnRlbnRSb3cuZWxlbWVudC5hcHBlbmRDaGlsZChwcm9wZXJ0aWVzLmNvbnRl bnQuZWxlbWVudCk7CisKKyAgICAgICAgbGV0IGNvbnRlbnRHcm91cCA9IG5ldyBXZWJJbnNwZWN0 b3IuRGV0YWlsc1NlY3Rpb25Hcm91cChbY29udGVudFJvd10pOworICAgICAgICB0aGlzLl9wb3B1 bGF0ZVNlY3Rpb24oZ3JvdXAsIFtjb250ZW50R3JvdXBdKTsKKyAgICB9CisKICAgICBfcG9wdWxh dGVUZXh0U3R5bGVTZWN0aW9uKCkKICAgICB7CiAgICAgICAgIGxldCBncm91cCA9IHRoaXMuX2dy b3Vwcy50ZXh0U3R5bGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yU2VjdGlvbi5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9u LmpzCmluZGV4IDc5ZDI3NDFhYTIxODExYTA0YTQ1NDYxOTczMDU3YWMzMWFmZDk1YWQuLjY4Zjcy ZTMzYjE4NTUyY2JjMTI5NDYxNGI0M2E1YTc3ODk3NDUyODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JTZWN0 aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zp c3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9uLmpzCkBAIC0yMDcsNyArMjA3LDcgQEAgV2ViSW5zcGVj dG9yLlZpc3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9uID0gY2xhc3MgVmlzdWFsU3R5bGVTZWxlY3Rv clNlY3Rpb24gZXh0ZW4KICAgICBjdXJyZW50U3R5bGUoKQogICAgIHsKICAgICAgICAgaWYgKCF0 aGlzLl9ub2RlU3R5bGVzIHx8ICF0aGlzLl9zZWxlY3RvcnMuc2VsZWN0ZWRUcmVlRWxlbWVudCkK LSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBudWxsOwogCiAgICAgICAg IHJldHVybiB0aGlzLl9zZWxlY3RvcnMuc2VsZWN0ZWRUcmVlRWxlbWVudC5yZXByZXNlbnRlZE9i amVjdDsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0uanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0u anMKaW5kZXggZDhiNmI4ZDE2NzQ2NzE5NzAxMzVlOTA0NzQzNWQxNzMzYmU3MTM5Yy4uZmNlNmEw YmQ0MGE2Yzg2MDk3ZjhiZDA1ZGFiNmIzZjQ3YzYxMGNkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJ dGVtLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zp c3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbS5qcwpAQCAtNTMsMTMgKzUzLDE3IEBAIFdlYkluc3Bl Y3Rvci5WaXN1YWxTdHlsZVNlbGVjdG9yVHJlZUl0ZW0gPSBjbGFzcyBWaXN1YWxTdHlsZVNlbGVj dG9yVHJlZUl0ZW0gZXh0CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCisgICAgICAg IGxldCBpY29uQ2xhc3NlcyA9IFtpY29uQ2xhc3NOYW1lXTsKKyAgICAgICAgaWYgKHN0eWxlLm93 bmVyUnVsZSAmJiBzdHlsZS5vd25lclJ1bGUuaGFzTWF0Y2hlZFBzZXVkb1NlbGVjdG9yKCkpCisg ICAgICAgICAgICBpY29uQ2xhc3Nlcy5wdXNoKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0 aW9uU2VjdGlvbi5Qc2V1ZG9TZWxlY3RvclN0eWxlQ2xhc3NOYW1lKTsKKwogICAgICAgICB0aXRs ZSA9IHRpdGxlLnRyaW0oKTsKIAotICAgICAgICBzdXBlcihbInZpc3VhbC1zdHlsZS1zZWxlY3Rv ci1pdGVtIiwgaWNvbkNsYXNzTmFtZV0sIHRpdGxlLCBzdWJ0aXRsZSwgc3R5bGUpOworICAgICAg ICBzdXBlcihbInZpc3VhbC1zdHlsZS1zZWxlY3Rvci1pdGVtIiwgLi4uaWNvbkNsYXNzZXNdLCB0 aXRsZSwgc3VidGl0bGUsIHN0eWxlKTsKIAogICAgICAgICB0aGlzLl9kZWxlZ2F0ZSA9IGRlbGVn YXRlOwogCi0gICAgICAgIHRoaXMuX2ljb25DbGFzc05hbWUgPSBpY29uQ2xhc3NOYW1lOworICAg ICAgICB0aGlzLl9pY29uQ2xhc3NlcyA9IGljb25DbGFzc2VzOwogICAgICAgICB0aGlzLl9sYXN0 VmFsdWUgPSB0aXRsZTsKICAgICAgICAgdGhpcy5fZW5hYmxlRWRpdGluZyA9IHRydWU7CiAgICAg ICAgIHRoaXMuX2hhc0ludmFsaWRTZWxlY3RvciA9IGZhbHNlOwpAQCAtNjksNyArNzMsNyBAQCBX ZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVTZWxlY3RvclRyZWVJdGVtID0gY2xhc3MgVmlzdWFsU3R5 bGVTZWxlY3RvclRyZWVJdGVtIGV4dAogCiAgICAgZ2V0IGljb25DbGFzc05hbWUoKQogICAgIHsK LSAgICAgICAgcmV0dXJuIHRoaXMuX2ljb25DbGFzc05hbWU7CisgICAgICAgIHJldHVybiB0aGlz Ll9pY29uQ2xhc3Nlcy5qb2luKCIgIik7CiAgICAgfQogCiAgICAgZ2V0IHNlbGVjdG9yVGV4dCgp CkBAIC0yNzIsNiArMjc2LDkgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlU2VsZWN0b3JUcmVl SXRlbSA9IGNsYXNzIFZpc3VhbFN0eWxlU2VsZWN0b3JUcmVlSXRlbSBleHQKIAogICAgICAgICB0 aGlzLl9pY29uRWxlbWVudC50aXRsZSA9IG51bGw7CiAgICAgICAgIHRoaXMubWFpblRpdGxlRWxl bWVudC50aXRsZSA9IG51bGw7CisKKyAgICAgICAgbGV0IGlzTWF0Y2hlZFBzZXVkb1NlbGVjdG9y ID0gdGhpcy5yZXByZXNlbnRlZE9iamVjdC5vd25lclJ1bGUgJiYgdGhpcy5yZXByZXNlbnRlZE9i amVjdC5vd25lclJ1bGUuaGFzTWF0Y2hlZFBzZXVkb1NlbGVjdG9yKCk7CisgICAgICAgIHRoaXMu X2ljb25DbGFzc2VzLnRvZ2dsZUluY2x1ZGVzKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0 aW9uU2VjdGlvbi5Qc2V1ZG9TZWxlY3RvclN0eWxlQ2xhc3NOYW1lLCBpc01hdGNoZWRQc2V1ZG9T ZWxlY3Rvcik7CiAgICAgfQogCiAgICAgX2hhbmRsZUljb25FbGVtZW50Q2xpY2tlZChldmVudCkK 286240 2016-08-16 17:56:28 -0700 2016-08-19 10:55:32 -0700 Patch bug-158272-20160816175441.patch text/plain 6605 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3YjliMjNiYjA0ZWZiMGVjNTMzZWI4MDU2NGEy NDdkNzFmZjJiZWMuLjFmNzI2MmVjYzkyMWNiYjFjODM1MGQ4YTEwZjA2ZTQwOWFjOGIwN2UgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE2LTA4LTE2ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFZpc3VhbCBTdHlsZXM6ICJUZXh0IC0+IENvbnRlbnQiIHNlY3Rpb24gc2hvdWxkIG9u bHkgYmUgdmlzaWJsZSBmb3IgcHNldWRvLWVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODI3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHls ZURldGFpbHNQYW5lbC5jc3M6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNz cy1zdHlsZSAudmlzdWFsID4gLmRldGFpbHMtc2VjdGlvbiA6bWF0Y2hlcyguZGV0YWlscy1zZWN0 aW9uLCAuZ3JvdXApLmluYWN0aXZlKToKKyAgICAgICAgKC52aXN1YWwtc3R5bGUtcHJvcGVydHkt Y29udGFpbmVyLnRyYW5zaXRpb24pOiBEZWxldGVkLgorICAgICAgICAoLnZpc3VhbC1zdHlsZS1w cm9wZXJ0eS1jb250YWluZXIuYW5pbWF0aW9uKTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlLmluaXRpYWxMYXlvdXQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlw ZS5fdXBkYXRlU2VjdGlvbnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0 YWlsc1BhbmVsLnByb3RvdHlwZS5fcG9wdWxhdGVDb250ZW50U2VjdGlvbik6CisKIDIwMTYtMDgt MTIgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IEFkZCBhcHBsaWNhdGlvbi92bmQuYXBpK2pzb24gYXMgYSB2YWxpZCBKU09OIE1J TUUtdHlwZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMv ZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2Nh bGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggOTk5OTYyMzYwNmQz YmY4ZTc0MmZkMzBmYmJhOTc0N2UyOGI2ZjU4ZS4uNmIzYmM2YjhmYWY4NjIwMDM0ZmJiNGM2NWIx YjM2NTRmMTE3ZjE1OSAxMDA2NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0YSAzMwpvY21lQT0lbGhS az54U05gdGNlVD8zfXVzRk87JShFdlpqQVhXaTs4YEZxUHtmMFA1S2RZNSlLTAoKZGVsdGEgMTgK YWNtZXh6bWJMM0Y+eFNOYGxkWSVlWkMwSWp7c0k3N05lUHF5CgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFu ZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFs U3R5bGVEZXRhaWxzUGFuZWwuY3NzCmluZGV4IDYzNmViODU4YzE2N2YwYTAwYjhjNGRhMDMxYTA5 ZGNjNTk1MWUzYmMuLjNlNzFmY2U5ODNlOTEyYjliZjYxOTlhMzZkNmY1MmZmNmU1OGFiMjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlRGV0YWlsc1BhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5jc3MKQEAgLTIzLDYgKzIzLDEw IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAorLnNpZGViYXIg PiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+IC5kZXRhaWxzLXNlY3Rpb24gOm1h dGNoZXMoLmRldGFpbHMtc2VjdGlvbiwgLmdyb3VwKS5pbmFjdGl2ZSB7CisgICAgZGlzcGxheTog bm9uZTsKK30KKwogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+ IC5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgewogICAgIGZvbnQt d2VpZ2h0OiBub3JtYWw7CiB9CkBAIC05NCwxMSArOTgsNiBAQAogICAgIHdpZHRoOiA1NXB4Owog fQogCi0udmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci50cmFuc2l0aW9uLAotLnZpc3Vh bC1zdHlsZS1wcm9wZXJ0eS1jb250YWluZXIuYW5pbWF0aW9uIHsKLSAgICBtYXJnaW4tbGVmdDog MTFweDsKLX0KLQogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbC5k aXNhYmxlZCA+IC5kZXRhaWxzLXNlY3Rpb246bm90KC52aXN1YWwtc3R5bGUtc2VsZWN0b3Itc2Vj dGlvbikgewogICAgIG9wYWNpdHk6IDAuNTsKICAgICBwb2ludGVyLWV2ZW50czogbm9uZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlRGV0YWlsc1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKaW5kZXggMGUzN2UwOWI3OWE1ODBi ZGI0MmY5MmYzYjkyOTQzYTdmYzMwNTA1Yi4uM2I2MTZlMDI1Zjc3ZjBlY2EzMTc3OTgyMmNmMDYw MjhkOTI3YmM0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKQEAg LTkxLDEzICs5MSwxNCBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgPSBj bGFzcyBWaXN1YWxTdHlsZURldGFpbHNQYW5lbCBleHRlbmRzIFdlYgogICAgICAgICB0aGlzLmVs ZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fc2VjdGlvbnMubGF5b3V0LmVsZW1lbnQpOwogCiAgICAg ICAgIC8vIFRleHQgU2VjdGlvbgorICAgICAgICB0aGlzLl9nZW5lcmF0ZVNlY3Rpb24oImNvbnRl bnQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvbnRlbnQiKSk7CiAgICAgICAgIHRoaXMuX2dl bmVyYXRlU2VjdGlvbigidGV4dC1zdHlsZSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3R5bGUi KSk7CiAgICAgICAgIHRoaXMuX2dlbmVyYXRlU2VjdGlvbigiZm9udCIsIFdlYkluc3BlY3Rvci5V SVN0cmluZygiRm9udCIpKTsKICAgICAgICAgdGhpcy5fZ2VuZXJhdGVTZWN0aW9uKCJmb250LXZh cmlhbnRzIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJWYXJpYW50cyIpKTsKICAgICAgICAgdGhp cy5fZ2VuZXJhdGVTZWN0aW9uKCJ0ZXh0LXNwYWNpbmciLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlNwYWNpbmciKSk7CiAgICAgICAgIHRoaXMuX2dlbmVyYXRlU2VjdGlvbigidGV4dC1zaGFkb3ci LCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNoYWRvdyIpKTsKIAotICAgICAgICB0aGlzLl9zZWN0 aW9ucy50ZXh0ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbigidGV4dCIsIFdlYklu c3BlY3Rvci5VSVN0cmluZygiVGV4dCIpLCBbdGhpcy5fZ3JvdXBzLnRleHRTdHlsZS5zZWN0aW9u LCB0aGlzLl9ncm91cHMuZm9udC5zZWN0aW9uLCB0aGlzLl9ncm91cHMuZm9udFZhcmlhbnRzLnNl Y3Rpb24sIHRoaXMuX2dyb3Vwcy50ZXh0U3BhY2luZy5zZWN0aW9uLCB0aGlzLl9ncm91cHMudGV4 dFNoYWRvdy5zZWN0aW9uXSk7CisgICAgICAgIHRoaXMuX3NlY3Rpb25zLnRleHQgPSBuZXcgV2Vi SW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uKCJ0ZXh0IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJU ZXh0IiksIFt0aGlzLl9ncm91cHMuY29udGVudC5zZWN0aW9uLCB0aGlzLl9ncm91cHMudGV4dFN0 eWxlLnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy5mb250LnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy5mb250 VmFyaWFudHMuc2VjdGlvbiwgdGhpcy5fZ3JvdXBzLnRleHRTcGFjaW5nLnNlY3Rpb24sIHRoaXMu X2dyb3Vwcy50ZXh0U2hhZG93LnNlY3Rpb25dKTsKICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuX3NlY3Rpb25zLnRleHQuZWxlbWVudCk7CiAKICAgICAgICAgLy8gQmFja2dy b3VuZCBTZWN0aW9uCkBAIC0xODcsNiArMTg4LDEwIEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHls ZURldGFpbHNQYW5lbCA9IGNsYXNzIFZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMgV2Vi CiAgICAgICAgICAgICAgICAgICAgIHNlY3Rpb24uY29sbGFwc2VkID0gZmFsc2U7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KKworICAgICAgICBsZXQgaGFzTWF0Y2hlZEVsZW1lbnRQc2V1ZG9T ZWxlY3RvciA9IHRoaXMuX2N1cnJlbnRTdHlsZS5vd25lclJ1bGUgJiYgdGhpcy5fY3VycmVudFN0 eWxlLm93bmVyUnVsZS5oYXNNYXRjaGVkUHNldWRvRWxlbWVudFNlbGVjdG9yKCk7CisgICAgICAg IHRoaXMuX2dyb3Vwcy5jb250ZW50LnNlY3Rpb24uZWxlbWVudC5jbGFzc0xpc3QudG9nZ2xlKCJp bmFjdGl2ZSIsICFoYXNNYXRjaGVkRWxlbWVudFBzZXVkb1NlbGVjdG9yKTsKKyAgICAgICAgdGhp cy5fZ3JvdXBzLmxpc3RTdHlsZS5zZWN0aW9uLmVsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgiaW5h Y3RpdmUiLCBoYXNNYXRjaGVkRWxlbWVudFBzZXVkb1NlbGVjdG9yKTsKICAgICB9CiAKICAgICBf dXBkYXRlUHJvcGVydGllcyhncm91cCwgZm9yY2VTdHlsZVVwZGF0ZSkKQEAgLTY1Myw2ICs2NTgs MjEgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgVmlzdWFs U3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWIKICAgICAgICAgcHJvcGVydGllcy5hbGlnblNl bGYuYWRkRGVwZW5kZW5jeSgiZGlzcGxheSIsIGFsbG93ZWREaXNwbGF5VmFsdWVzKTsKICAgICB9 CiAKKyAgICBfcG9wdWxhdGVDb250ZW50U2VjdGlvbigpCisgICAgeworICAgICAgICBsZXQgZ3Jv dXAgPSB0aGlzLl9ncm91cHMuY29udGVudDsKKyAgICAgICAgbGV0IHByb3BlcnRpZXMgPSBncm91 cC5wcm9wZXJ0aWVzOworCisgICAgICAgIGxldCBjb250ZW50Um93ID0gbmV3IFdlYkluc3BlY3Rv ci5EZXRhaWxzU2VjdGlvblJvdzsKKworICAgICAgICBwcm9wZXJ0aWVzLmNvbnRlbnQgPSBuZXcg V2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlQmFzaWNJbnB1dCgiY29udGVudCIsIG51bGwsIFdlYklu c3BlY3Rvci5VSVN0cmluZygiRW50ZXIgYSB2YWx1ZSIpKTsKKworICAgICAgICBjb250ZW50Um93 LmVsZW1lbnQuYXBwZW5kQ2hpbGQocHJvcGVydGllcy5jb250ZW50LmVsZW1lbnQpOworCisgICAg ICAgIGxldCBjb250ZW50R3JvdXAgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uR3Jv dXAoW2NvbnRlbnRSb3ddKTsKKyAgICAgICAgdGhpcy5fcG9wdWxhdGVTZWN0aW9uKGdyb3VwLCBb Y29udGVudEdyb3VwXSk7CisgICAgfQorCiAgICAgX3BvcHVsYXRlVGV4dFN0eWxlU2VjdGlvbigp CiAgICAgewogICAgICAgICBsZXQgZ3JvdXAgPSB0aGlzLl9ncm91cHMudGV4dFN0eWxlOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFs U3R5bGVTZWxlY3RvclNlY3Rpb24uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yU2VjdGlvbi5qcwppbmRleCA3OWQyNzQxYWEy MTgxMWEwNGE0NTQ2MTk3MzA1N2FjMzFhZmQ5NWFkLi42OGY3MmUzM2IxODU1MmNiYzEyOTQ2MTRi NDNhNWE3Nzg5NzQ1MjgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yU2VjdGlvbi5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yU2Vj dGlvbi5qcwpAQCAtMjA3LDcgKzIwNyw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVNlbGVj dG9yU2VjdGlvbiA9IGNsYXNzIFZpc3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9uIGV4dGVuCiAgICAg Y3VycmVudFN0eWxlKCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fbm9kZVN0eWxlcyB8fCAh dGhpcy5fc2VsZWN0b3JzLnNlbGVjdGVkVHJlZUVsZW1lbnQpCi0gICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICByZXR1cm4gbnVsbDsKIAogICAgICAgICByZXR1cm4gdGhpcy5fc2VsZWN0 b3JzLnNlbGVjdGVkVHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3Q7CiAgICAgfQo= 286461 2016-08-19 10:55:39 -0700 2016-08-22 22:05:53 -0700 Patch bug-158272-20160819105347.patch text/plain 6614 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDMzODg2ZjFjODBiOGIwN2IyMzkxMTZmY2EwNGRi NTBhYWUwYzgxNjkuLmE3YjcyZWQ4MDFjZjBkZDM3OWQwMWViZjZlMTg0MWQwZThlMWUzNmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE2LTA4LTE4ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFZpc3VhbCBTdHlsZXM6ICJUZXh0IC0+IENvbnRlbnQiIHNlY3Rpb24gc2hvdWxkIG9u bHkgYmUgdmlzaWJsZSBmb3IgcHNldWRvLWVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODI3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHls ZURldGFpbHNQYW5lbC5jc3M6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNz cy1zdHlsZSAudmlzdWFsID4gLmRldGFpbHMtc2VjdGlvbiA6bWF0Y2hlcyguZGV0YWlscy1zZWN0 aW9uLCAuZ3JvdXApLmluYWN0aXZlKToKKyAgICAgICAgKC52aXN1YWwtc3R5bGUtcHJvcGVydHkt Y29udGFpbmVyLnRyYW5zaXRpb24pOiBEZWxldGVkLgorICAgICAgICAoLnZpc3VhbC1zdHlsZS1w cm9wZXJ0eS1jb250YWluZXIuYW5pbWF0aW9uKTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlLmluaXRpYWxMYXlvdXQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlw ZS5fdXBkYXRlU2VjdGlvbnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0 YWlsc1BhbmVsLnByb3RvdHlwZS5fcG9wdWxhdGVDb250ZW50U2VjdGlvbik6CisKIDIwMTYtMDgt MTcgIE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IE5ldHdvcmsgVGFiIHNob3VsZCBub3QgbGF5b3V0IGlmIG5vdCB2aXNpYmxlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2Nh bGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4u bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA2ZmYzYzg0ODBhNGZkMzUzM2ZjZGY2ZDVi YThkYTZmNjdiOGM0ZDEwLi5lZGIzYTcyNGFjMWUwMjkzYzMyNjY3ZDYyOTcxMDkxZTZlOWQ2NmE5 IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDUzCnpjbWV4em1pNjhfKSh6ak1hd2pxPEZx QVBRR1VQQ25QRjkjRSU/anBFKk9PIzRvLTk5PVhSYEcpeX4jNXRpKjJAXgpIdyh8bDIxJGglTwoK ZGVsdGEgMTgKYWNtY2IyamBobn4pKHpqTVBGXn1xWioleyZeQWBZVmlWRyhJCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVE ZXRhaWxzUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuY3NzCmluZGV4IDYzNmViODU4YzE2N2YwYTAwYjhj NGRhMDMxYTA5ZGNjNTk1MWUzYmMuLjNlNzFmY2U5ODNlOTEyYjliZjYxOTlhMzZkNmY1MmZmNmU1 OGFiMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5jc3MKQEAgLTIz LDYgKzIzLDEwIEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAor LnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+IC5kZXRhaWxzLXNl Y3Rpb24gOm1hdGNoZXMoLmRldGFpbHMtc2VjdGlvbiwgLmdyb3VwKS5pbmFjdGl2ZSB7CisgICAg ZGlzcGxheTogbm9uZTsKK30KKwogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUg LnZpc3VhbCA+IC5kZXRhaWxzLXNlY3Rpb24gLmRldGFpbHMtc2VjdGlvbiA+IC5oZWFkZXIgewog ICAgIGZvbnQtd2VpZ2h0OiBub3JtYWw7CiB9CkBAIC05NCwxMSArOTgsNiBAQAogICAgIHdpZHRo OiA1NXB4OwogfQogCi0udmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lci50cmFuc2l0aW9u LAotLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1jb250YWluZXIuYW5pbWF0aW9uIHsKLSAgICBtYXJn aW4tbGVmdDogMTFweDsKLX0KLQogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUg LnZpc3VhbC5kaXNhYmxlZCA+IC5kZXRhaWxzLXNlY3Rpb246bm90KC52aXN1YWwtc3R5bGUtc2Vs ZWN0b3Itc2VjdGlvbikgewogICAgIG9wYWNpdHk6IDAuNTsKICAgICBwb2ludGVyLWV2ZW50czog bm9uZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKaW5kZXggMGUzN2Uw OWI3OWE1ODBiZGI0MmY5MmYzYjkyOTQzYTdmYzMwNTA1Yi4uM2I2MTZlMDI1Zjc3ZjBlY2EzMTc3 OTgyMmNmMDYwMjhkOTI3YmM0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFu ZWwuanMKQEAgLTkxLDEzICs5MSwxNCBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxz UGFuZWwgPSBjbGFzcyBWaXN1YWxTdHlsZURldGFpbHNQYW5lbCBleHRlbmRzIFdlYgogICAgICAg ICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fc2VjdGlvbnMubGF5b3V0LmVsZW1lbnQp OwogCiAgICAgICAgIC8vIFRleHQgU2VjdGlvbgorICAgICAgICB0aGlzLl9nZW5lcmF0ZVNlY3Rp b24oImNvbnRlbnQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvbnRlbnQiKSk7CiAgICAgICAg IHRoaXMuX2dlbmVyYXRlU2VjdGlvbigidGV4dC1zdHlsZSIsIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU3R5bGUiKSk7CiAgICAgICAgIHRoaXMuX2dlbmVyYXRlU2VjdGlvbigiZm9udCIsIFdlYklu c3BlY3Rvci5VSVN0cmluZygiRm9udCIpKTsKICAgICAgICAgdGhpcy5fZ2VuZXJhdGVTZWN0aW9u KCJmb250LXZhcmlhbnRzIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJWYXJpYW50cyIpKTsKICAg ICAgICAgdGhpcy5fZ2VuZXJhdGVTZWN0aW9uKCJ0ZXh0LXNwYWNpbmciLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIlNwYWNpbmciKSk7CiAgICAgICAgIHRoaXMuX2dlbmVyYXRlU2VjdGlvbigidGV4 dC1zaGFkb3ciLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNoYWRvdyIpKTsKIAotICAgICAgICB0 aGlzLl9zZWN0aW9ucy50ZXh0ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbigidGV4 dCIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGV4dCIpLCBbdGhpcy5fZ3JvdXBzLnRleHRTdHls ZS5zZWN0aW9uLCB0aGlzLl9ncm91cHMuZm9udC5zZWN0aW9uLCB0aGlzLl9ncm91cHMuZm9udFZh cmlhbnRzLnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy50ZXh0U3BhY2luZy5zZWN0aW9uLCB0aGlzLl9n cm91cHMudGV4dFNoYWRvdy5zZWN0aW9uXSk7CisgICAgICAgIHRoaXMuX3NlY3Rpb25zLnRleHQg PSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uKCJ0ZXh0IiwgV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJUZXh0IiksIFt0aGlzLl9ncm91cHMuY29udGVudC5zZWN0aW9uLCB0aGlzLl9ncm91 cHMudGV4dFN0eWxlLnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy5mb250LnNlY3Rpb24sIHRoaXMuX2dy b3Vwcy5mb250VmFyaWFudHMuc2VjdGlvbiwgdGhpcy5fZ3JvdXBzLnRleHRTcGFjaW5nLnNlY3Rp b24sIHRoaXMuX2dyb3Vwcy50ZXh0U2hhZG93LnNlY3Rpb25dKTsKICAgICAgICAgdGhpcy5lbGVt ZW50LmFwcGVuZENoaWxkKHRoaXMuX3NlY3Rpb25zLnRleHQuZWxlbWVudCk7CiAKICAgICAgICAg Ly8gQmFja2dyb3VuZCBTZWN0aW9uCkBAIC0xODcsNiArMTg4LDEwIEBAIFdlYkluc3BlY3Rvci5W aXN1YWxTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsIGV4 dGVuZHMgV2ViCiAgICAgICAgICAgICAgICAgICAgIHNlY3Rpb24uY29sbGFwc2VkID0gZmFsc2U7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KKworICAgICAgICBsZXQgaGFzTWF0Y2hlZEVsZW1l bnRQc2V1ZG9TZWxlY3RvciA9IHRoaXMuX2N1cnJlbnRTdHlsZS5vd25lclJ1bGUgJiYgdGhpcy5f Y3VycmVudFN0eWxlLm93bmVyUnVsZS5oYXNNYXRjaGVkUHNldWRvRWxlbWVudFNlbGVjdG9yKCk7 CisgICAgICAgIHRoaXMuX2dyb3Vwcy5jb250ZW50LnNlY3Rpb24uZWxlbWVudC5jbGFzc0xpc3Qu dG9nZ2xlKCJpbmFjdGl2ZSIsICFoYXNNYXRjaGVkRWxlbWVudFBzZXVkb1NlbGVjdG9yKTsKKyAg ICAgICAgdGhpcy5fZ3JvdXBzLmxpc3RTdHlsZS5zZWN0aW9uLmVsZW1lbnQuY2xhc3NMaXN0LnRv Z2dsZSgiaW5hY3RpdmUiLCBoYXNNYXRjaGVkRWxlbWVudFBzZXVkb1NlbGVjdG9yKTsKICAgICB9 CiAKICAgICBfdXBkYXRlUHJvcGVydGllcyhncm91cCwgZm9yY2VTdHlsZVVwZGF0ZSkKQEAgLTY1 Myw2ICs2NTgsMjEgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsID0gY2xh c3MgVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWIKICAgICAgICAgcHJvcGVydGll cy5hbGlnblNlbGYuYWRkRGVwZW5kZW5jeSgiZGlzcGxheSIsIGFsbG93ZWREaXNwbGF5VmFsdWVz KTsKICAgICB9CiAKKyAgICBfcG9wdWxhdGVDb250ZW50U2VjdGlvbigpCisgICAgeworICAgICAg ICBsZXQgZ3JvdXAgPSB0aGlzLl9ncm91cHMuY29udGVudDsKKyAgICAgICAgbGV0IHByb3BlcnRp ZXMgPSBncm91cC5wcm9wZXJ0aWVzOworCisgICAgICAgIGxldCBjb250ZW50Um93ID0gbmV3IFdl Ykluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblJvdzsKKworICAgICAgICBwcm9wZXJ0aWVzLmNvbnRl bnQgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlQmFzaWNJbnB1dCgiY29udGVudCIsIG51 bGwsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRW50ZXIgYSB2YWx1ZSIpKTsKKworICAgICAgICBj b250ZW50Um93LmVsZW1lbnQuYXBwZW5kQ2hpbGQocHJvcGVydGllcy5jb250ZW50LmVsZW1lbnQp OworCisgICAgICAgIGxldCBjb250ZW50R3JvdXAgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNT ZWN0aW9uR3JvdXAoW2NvbnRlbnRSb3ddKTsKKyAgICAgICAgdGhpcy5fcG9wdWxhdGVTZWN0aW9u KGdyb3VwLCBbY29udGVudEdyb3VwXSk7CisgICAgfQorCiAgICAgX3BvcHVsYXRlVGV4dFN0eWxl U2VjdGlvbigpCiAgICAgewogICAgICAgICBsZXQgZ3JvdXAgPSB0aGlzLl9ncm91cHMudGV4dFN0 eWxlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVTZWxlY3RvclNlY3Rpb24uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yU2VjdGlvbi5qcwppbmRleCA3 OWQyNzQxYWEyMTgxMWEwNGE0NTQ2MTk3MzA1N2FjMzFhZmQ5NWFkLi42OGY3MmUzM2IxODU1MmNi YzEyOTQ2MTRiNDNhNWE3Nzg5NzQ1MjgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yU2VjdGlvbi5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNl bGVjdG9yU2VjdGlvbi5qcwpAQCAtMjA3LDcgKzIwNyw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxT dHlsZVNlbGVjdG9yU2VjdGlvbiA9IGNsYXNzIFZpc3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9uIGV4 dGVuCiAgICAgY3VycmVudFN0eWxlKCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fbm9kZVN0 eWxlcyB8fCAhdGhpcy5fc2VsZWN0b3JzLnNlbGVjdGVkVHJlZUVsZW1lbnQpCi0gICAgICAgICAg ICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gbnVsbDsKIAogICAgICAgICByZXR1cm4gdGhp cy5fc2VsZWN0b3JzLnNlbGVjdGVkVHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3Q7CiAgICAg fQo= 286672 2016-08-22 22:05:53 -0700 2016-08-22 22:36:25 -0700 Patch 158272.diff text/plain 6674 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGU4YWFiOWMuLmI0MTFlMDggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDE2LTA4LTIyICBEZXZpbiBSb3Vzc28g IDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFZp c3VhbCBTdHlsZXM6ICJUZXh0IC0+IENvbnRlbnQiIHNlY3Rpb24gc2hvdWxkIG9ubHkgYmUgdmlz aWJsZSBmb3IgcHNldWRvLWVsZW1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE1ODI3MgorCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNv cmFyby4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5n cy5qczoKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxz UGFuZWwuY3NzOgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUg LnZpc3VhbCA+IC5kZXRhaWxzLXNlY3Rpb24gOm1hdGNoZXMoLmRldGFpbHMtc2VjdGlvbiwgLmdy b3VwKS5pbmFjdGl2ZSk6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1z dHlsZSAudmlzdWFsID4gLmRldGFpbHMtc2VjdGlvbiA6bWF0Y2hlcyguZGV0YWlscy1zZWN0aW9u LCAuZ3JvdXApLmluYWN0aXZlID4gKik6CisgICAgICAgICgudmlzdWFsLXN0eWxlLXByb3BlcnR5 LWNvbnRhaW5lci50cmFuc2l0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKC52aXN1YWwtc3R5bGUt cHJvcGVydHktY29udGFpbmVyLmFuaW1hdGlvbik6IERlbGV0ZWQuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5pbml0aWFsTGF5b3V0 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5 cGUuX3VwZGF0ZVNlY3Rpb25zKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURl dGFpbHNQYW5lbC5wcm90b3R5cGUuX3BvcHVsYXRlQ29udGVudFNlY3Rpb24pOgorCisyMDE2LTA4 LTIyICBEZXZpbiBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IEFkZCBpbmRpY2F0b3IgdG8gbWF0Y2hlZCBzZWxlY3RvciBiZWluZyBh IHBzZXVkby1lbGVtZW50CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjA4OTMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2Fs aXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggMDdl M2IwZDg5ZWEyYzBjMDEwNTRkMzU5OWM4YmY4NmYwYWMzNDhlMS4uZjAxNmMyNWU1ODNiNGM1NTU0 YTYwNzI3ODk0NThkNzRiMzEyNGI1MyAxMDA2NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0YSAzNQp0 Y21WKzswTm5xSyZqcyQhMStYdWRsT0w3XzBkfHdAbHB6NmptdkNKSEdte1VMMkQyfWhVQzxERjR1 YiN5CgpkZWx0YSAxNApXY21hRU5wMCgjWj5qd1NsbjxxfD55I04zP2VGdmNjCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVE ZXRhaWxzUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuY3NzCmluZGV4IDYzNmViODUuLjQwNjUyMjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlRGV0YWlsc1BhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5jc3MKQEAgLTIzLDYgKzIzLDE0 IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAorLnNpZGViYXIg PiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZpc3VhbCA+IC5kZXRhaWxzLXNlY3Rpb24gOm1h dGNoZXMoLmRldGFpbHMtc2VjdGlvbiwgLmdyb3VwKS5pbmFjdGl2ZSB7CisgICAgYm9yZGVyLWJv dHRvbTogbm9uZTsKK30KKworLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgLnZp c3VhbCA+IC5kZXRhaWxzLXNlY3Rpb24gOm1hdGNoZXMoLmRldGFpbHMtc2VjdGlvbiwgLmdyb3Vw KS5pbmFjdGl2ZSA+ICogeworICAgIGRpc3BsYXk6IG5vbmU7Cit9CisKIC5zaWRlYmFyID4gLnBh bmVsLmRldGFpbHMuY3NzLXN0eWxlIC52aXN1YWwgPiAuZGV0YWlscy1zZWN0aW9uIC5kZXRhaWxz LXNlY3Rpb24gPiAuaGVhZGVyIHsKICAgICBmb250LXdlaWdodDogbm9ybWFsOwogfQpAQCAtOTQs MTEgKzEwMiw2IEBACiAgICAgd2lkdGg6IDU1cHg7CiB9CiAKLS52aXN1YWwtc3R5bGUtcHJvcGVy dHktY29udGFpbmVyLnRyYW5zaXRpb24sCi0udmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5l ci5hbmltYXRpb24gewotICAgIG1hcmdpbi1sZWZ0OiAxMXB4OwotfQotCiAuc2lkZWJhciA+IC5w YW5lbC5kZXRhaWxzLmNzcy1zdHlsZSAudmlzdWFsLmRpc2FibGVkID4gLmRldGFpbHMtc2VjdGlv bjpub3QoLnZpc3VhbC1zdHlsZS1zZWxlY3Rvci1zZWN0aW9uKSB7CiAgICAgb3BhY2l0eTogMC41 OwogICAgIHBvaW50ZXItZXZlbnRzOiBub25lOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZURldGFp bHNQYW5lbC5qcwppbmRleCAwZTM3ZTA5Li4xZDUxOTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxT dHlsZURldGFpbHNQYW5lbC5qcwpAQCAtOTEsMTMgKzkxLDE0IEBAIFdlYkluc3BlY3Rvci5WaXN1 YWxTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsIGV4dGVu ZHMgV2ViCiAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9zZWN0aW9ucy5s YXlvdXQuZWxlbWVudCk7CiAKICAgICAgICAgLy8gVGV4dCBTZWN0aW9uCisgICAgICAgIHRoaXMu X2dlbmVyYXRlU2VjdGlvbigiY29udGVudCIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29udGVu dCIpKTsKICAgICAgICAgdGhpcy5fZ2VuZXJhdGVTZWN0aW9uKCJ0ZXh0LXN0eWxlIiwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJTdHlsZSIpKTsKICAgICAgICAgdGhpcy5fZ2VuZXJhdGVTZWN0aW9u KCJmb250IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJGb250IikpOwogICAgICAgICB0aGlzLl9n ZW5lcmF0ZVNlY3Rpb24oImZvbnQtdmFyaWFudHMiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlZh cmlhbnRzIikpOwogICAgICAgICB0aGlzLl9nZW5lcmF0ZVNlY3Rpb24oInRleHQtc3BhY2luZyIs IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3BhY2luZyIpKTsKICAgICAgICAgdGhpcy5fZ2VuZXJh dGVTZWN0aW9uKCJ0ZXh0LXNoYWRvdyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hhZG93Iikp OwogCi0gICAgICAgIHRoaXMuX3NlY3Rpb25zLnRleHQgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFp bHNTZWN0aW9uKCJ0ZXh0IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUZXh0IiksIFt0aGlzLl9n cm91cHMudGV4dFN0eWxlLnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy5mb250LnNlY3Rpb24sIHRoaXMu X2dyb3Vwcy5mb250VmFyaWFudHMuc2VjdGlvbiwgdGhpcy5fZ3JvdXBzLnRleHRTcGFjaW5nLnNl Y3Rpb24sIHRoaXMuX2dyb3Vwcy50ZXh0U2hhZG93LnNlY3Rpb25dKTsKKyAgICAgICAgdGhpcy5f c2VjdGlvbnMudGV4dCA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb24oInRleHQiLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRleHQiKSwgW3RoaXMuX2dyb3Vwcy5jb250ZW50LnNlY3Rp b24sIHRoaXMuX2dyb3Vwcy50ZXh0U3R5bGUuc2VjdGlvbiwgdGhpcy5fZ3JvdXBzLmZvbnQuc2Vj dGlvbiwgdGhpcy5fZ3JvdXBzLmZvbnRWYXJpYW50cy5zZWN0aW9uLCB0aGlzLl9ncm91cHMudGV4 dFNwYWNpbmcuc2VjdGlvbiwgdGhpcy5fZ3JvdXBzLnRleHRTaGFkb3cuc2VjdGlvbl0pOwogICAg ICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fc2VjdGlvbnMudGV4dC5lbGVtZW50 KTsKIAogICAgICAgICAvLyBCYWNrZ3JvdW5kIFNlY3Rpb24KQEAgLTE4Nyw2ICsxODgsMTAgQEAg V2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgVmlzdWFsU3R5bGVE ZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWIKICAgICAgICAgICAgICAgICAgICAgc2VjdGlvbi5jb2xs YXBzZWQgPSBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQorCisgICAgICAgIGxldCBo YXNNYXRjaGVkRWxlbWVudFBzZXVkb1NlbGVjdG9yID0gdGhpcy5fY3VycmVudFN0eWxlLm93bmVy UnVsZSAmJiB0aGlzLl9jdXJyZW50U3R5bGUub3duZXJSdWxlLmhhc01hdGNoZWRQc2V1ZG9FbGVt ZW50U2VsZWN0b3IoKTsKKyAgICAgICAgdGhpcy5fZ3JvdXBzLmNvbnRlbnQuc2VjdGlvbi5lbGVt ZW50LmNsYXNzTGlzdC50b2dnbGUoImluYWN0aXZlIiwgIWhhc01hdGNoZWRFbGVtZW50UHNldWRv U2VsZWN0b3IpOworICAgICAgICB0aGlzLl9ncm91cHMubGlzdFN0eWxlLnNlY3Rpb24uZWxlbWVu dC5jbGFzc0xpc3QudG9nZ2xlKCJpbmFjdGl2ZSIsIGhhc01hdGNoZWRFbGVtZW50UHNldWRvU2Vs ZWN0b3IpOwogICAgIH0KIAogICAgIF91cGRhdGVQcm9wZXJ0aWVzKGdyb3VwLCBmb3JjZVN0eWxl VXBkYXRlKQpAQCAtNjUzLDYgKzY1OCwyMSBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRh aWxzUGFuZWwgPSBjbGFzcyBWaXN1YWxTdHlsZURldGFpbHNQYW5lbCBleHRlbmRzIFdlYgogICAg ICAgICBwcm9wZXJ0aWVzLmFsaWduU2VsZi5hZGREZXBlbmRlbmN5KCJkaXNwbGF5IiwgYWxsb3dl ZERpc3BsYXlWYWx1ZXMpOwogICAgIH0KIAorICAgIF9wb3B1bGF0ZUNvbnRlbnRTZWN0aW9uKCkK KyAgICB7CisgICAgICAgIGxldCBncm91cCA9IHRoaXMuX2dyb3Vwcy5jb250ZW50OworICAgICAg ICBsZXQgcHJvcGVydGllcyA9IGdyb3VwLnByb3BlcnRpZXM7CisKKyAgICAgICAgbGV0IGNvbnRl bnRSb3cgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uUm93OworCisgICAgICAgIHBy b3BlcnRpZXMuY29udGVudCA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVCYXNpY0lucHV0 KCJjb250ZW50IiwgbnVsbCwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJFbnRlciB2YWx1ZSIpKTsK KworICAgICAgICBjb250ZW50Um93LmVsZW1lbnQuYXBwZW5kQ2hpbGQocHJvcGVydGllcy5jb250 ZW50LmVsZW1lbnQpOworCisgICAgICAgIGxldCBjb250ZW50R3JvdXAgPSBuZXcgV2ViSW5zcGVj dG9yLkRldGFpbHNTZWN0aW9uR3JvdXAoW2NvbnRlbnRSb3ddKTsKKyAgICAgICAgdGhpcy5fcG9w dWxhdGVTZWN0aW9uKGdyb3VwLCBbY29udGVudEdyb3VwXSk7CisgICAgfQorCiAgICAgX3BvcHVs YXRlVGV4dFN0eWxlU2VjdGlvbigpCiAgICAgewogICAgICAgICBsZXQgZ3JvdXAgPSB0aGlzLl9n cm91cHMudGV4dFN0eWxlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVTZWxlY3RvclNlY3Rpb24uanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yU2VjdGlv bi5qcwppbmRleCA3OWQyNzQxLi42OGY3MmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yU2VjdGlvbi5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHls ZVNlbGVjdG9yU2VjdGlvbi5qcwpAQCAtMjA3LDcgKzIwNyw3IEBAIFdlYkluc3BlY3Rvci5WaXN1 YWxTdHlsZVNlbGVjdG9yU2VjdGlvbiA9IGNsYXNzIFZpc3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9u IGV4dGVuCiAgICAgY3VycmVudFN0eWxlKCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fbm9k ZVN0eWxlcyB8fCAhdGhpcy5fc2VsZWN0b3JzLnNlbGVjdGVkVHJlZUVsZW1lbnQpCi0gICAgICAg ICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gbnVsbDsKIAogICAgICAgICByZXR1cm4g dGhpcy5fc2VsZWN0b3JzLnNlbGVjdGVkVHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3Q7CiAg ICAgfQo=