122151 2013-10-01 02:56:10 -0700 Web Inspector: evaluate and show a popover for selected text in JS source when paused 2013-10-01 12:54:07 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 934951 0 graouts 2013-10-01 02:56:10 -0700 <rdar://problem/14043399> 934952 1 graouts 2013-10-01 02:56:29 -0700 Expanding the popover on hover, we should show the popover for the expression of the selected text. This gives the user more control over what to evaluate if the expression is hard to figure out by hover alone. 934953 2 213068 graouts 2013-10-01 03:00:56 -0700 Created attachment 213068 Patch 935075 3 213068 joepeck 2013-10-01 10:10:22 -0700 Comment on attachment 213068 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213068&action=review r=me > Source/WebInspectorUI/UserInterface/CodeMirrorTokenTrackingController.js:168 > + if (highlightedRange.from.line === range.start.line && > + highlightedRange.from.ch === range.start.ch && > + highlightedRange.to.line === range.end.line && > + highlightedRange.to.ch === range.end.ch) This could use WebInspector.compareCodeMirrorPositions: if (WebInspector.compareCodeMirrorPositions(highlightedRange.from, range.start) === 0 && WebInspector.compareCodeMirrorPositions(highlightedRange.to, range.end) === 0) But what you have is just fine! 935123 4 graouts 2013-10-01 12:10:07 -0700 (In reply to comment #3) > (From update of attachment 213068 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=213068&action=review > > r=me > > > Source/WebInspectorUI/UserInterface/CodeMirrorTokenTrackingController.js:168 > > + if (highlightedRange.from.line === range.start.line && > > + highlightedRange.from.ch === range.start.ch && > > + highlightedRange.to.line === range.end.line && > > + highlightedRange.to.ch === range.end.ch) > > This could use WebInspector.compareCodeMirrorPositions: > > if (WebInspector.compareCodeMirrorPositions(highlightedRange.from, range.start) === 0 && > WebInspector.compareCodeMirrorPositions(highlightedRange.to, range.end) === 0) > > But what you have is just fine! Much better, I'll change that in the commit. 935124 5 213107 graouts 2013-10-01 12:10:21 -0700 Created attachment 213107 Patch for landing 935149 6 213107 commit-queue 2013-10-01 12:54:05 -0700 Comment on attachment 213107 Patch for landing Clearing flags on attachment: 213107 Committed r156728: <http://trac.webkit.org/changeset/156728> 935150 7 commit-queue 2013-10-01 12:54:07 -0700 All reviewed patches have been landed. Closing bug. 213068 2013-10-01 03:00:56 -0700 2013-10-01 12:10:14 -0700 Patch bug-122151-20131001120114.patch text/plain 5227 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2Njk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi MDIyNWM4OGIyZThkZmYzZjM5MmE5OTgwMTc3MzYyMWM3MzcyMmVhLi41Mzg3ZGVmM2Y4YjJhMDg4 MWY5N2ViZDc4NWNjNTViYzgyNjc4NzUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxMy0xMC0wMSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGV2YWx1YXRlIGFuZCBzaG93IGEgcG9wb3ZlciBm b3Igc2VsZWN0ZWQgdGV4dCBpbiBKUyBzb3VyY2Ugd2hlbiBwYXVzZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjE1MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElkZW50aWZ5IGlmIHRoZSBob3ZlcmVk IHRva2VuIGlzIGNvbnRhaW5lZCB3aXRoaW4gdGhlIHRleHQgc2VsZWN0aW9uIChpZiBhbnkpIGFu ZCB1c2UKKyAgICAgICAgdGhlIHNlbGVjdGlvbiBhcyB0aGUgaG92ZXJlZCBleHByZXNzaW9uIHRv IGFsbG93IHRoZSB1c2VyIHRvIHNlbGVjdCB0ZXh0IGFuZCBob3ZlciBpdAorICAgICAgICB0byBz ZWUgd2hhdCBpdCBldmFsdWF0ZXMgdG8uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvZGVN aXJyb3JUb2tlblRyYWNraW5nQ29udHJvbGxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D b2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIucHJvdG90eXBlLmhpZ2hsaWdodFJhbmdl KToKKyAgICAgICAgQ2hlY2sgd2UncmUgdHJ5aW5nIHRvIGhpZ2hsaWdodCBhIGRpZmZlcmVudCBy YW5nZSBiZWZvcmUgcmVtb3ZpbmcgdGhlIGhpZ2hsaWdodAorICAgICAgICBhbmQgYXBwbHlpbmcg dGhlIG5ldyBvbmUsIHRoaXMgcHJldmVudHMgdGhlIG1hcmtlZCB0ZXh0IGZyb20gZmxhc2hpbmcg aWYgaXQncworICAgICAgICBiZWluZyByZS1ob3ZlcmVkIHdoaWNoIHdvdWxkIGVhc2lseSBoYXBw ZW4gd2hlbiBob3ZlcmluZyBtdWx0aXBsZSB0b2tlbnMgd2l0aGluCisgICAgICAgIHRoZSBzYW1l IHNlbGVjdGlvbi4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLkNvZGVNaXJyb3JUb2tlblRyYWNr aW5nQ29udHJvbGxlci5wcm90b3R5cGUuX3Byb2Nlc3NKYXZhU2NyaXB0RXhwcmVzc2lvbik6Cisg ICAgICAgIEluIHRoZSBjYXNlIHdoZXJlIHRoZXJlIGlzIHNlbGVjdGVkIHRleHQsIGNoZWNrIHdo ZXRoZXIgdGhlIGhvdmVyZWQgdG9rZW4gaXMgYXQgbGVhc3QKKyAgICAgICAgcGFydGlhbGx5IGNv bnRhaW5lZCB3aXRoaW4gdGhlIHNlbGVjdGlvbiwgYW5kIGlmIHNvIHVzZSB0aGUgc2VsZWN0aW9u IHRleHQgYXMgdGhlCisgICAgICAgIGhvdmVyZWQgZXhwcmVzc2lvbiB0byBldmFsdWF0ZS4KKwog MjAxMy0wOS0zMCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IHJvd3MgaW4gdGhlIExheWVyIHNpZGViYXIgcGFuZWwgbWF5IGhhdmUg dGhlIGluY29ycmVjdCBiYWNrZ3JvdW5kIGNvbG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db2RlTWlycm9yVG9rZW5U cmFja2luZ0NvbnRyb2xsZXIuanMKaW5kZXggMmE5M2NmNzllN2JmYTcwZGI1ZTZhNWM0MTIzZjQw OWZkMThkNjRiMi4uMGVkOWZmZjY3YTBhOWNhMTM2MmYyZjU2ODI3MDNlZDQ4OTc1ZDIwNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29kZU1pcnJvclRv a2VuVHJhY2tpbmdDb250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvZGVNaXJyb3JUb2tlblRyYWNraW5nQ29udHJvbGxlci5qcwpAQCAtMTU5LDYg KzE1OSwxNiBAQCBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVy LnByb3RvdHlwZSA9IHsKIAogICAgIGhpZ2hsaWdodFJhbmdlOiBmdW5jdGlvbihyYW5nZSkKICAg ICB7CisgICAgICAgIC8vIE5vdGhpbmcgdG8gZG8gaWYgd2UncmUgdHJ5aW5nIHRvIGhpZ2hsaWdo dCB0aGUgc2FtZSByYW5nZS4KKyAgICAgICAgaWYgKHRoaXMuX2NvZGVNaXJyb3JNYXJrZWRUZXh0 ICYmIHRoaXMuX2NvZGVNaXJyb3JNYXJrZWRUZXh0LmNsYXNzTmFtZSA9PT0gdGhpcy5fY2xhc3NO YW1lRm9ySGlnaGxpZ2h0ZWRSYW5nZSkgeworICAgICAgICAgICAgdmFyIGhpZ2hsaWdodGVkUmFu Z2UgPSB0aGlzLl9jb2RlTWlycm9yTWFya2VkVGV4dC5maW5kKCk7CisgICAgICAgICAgICBpZiAo aGlnaGxpZ2h0ZWRSYW5nZS5mcm9tLmxpbmUgPT09IHJhbmdlLnN0YXJ0LmxpbmUgJiYKKyAgICAg ICAgICAgICAgICBoaWdobGlnaHRlZFJhbmdlLmZyb20uY2ggPT09IHJhbmdlLnN0YXJ0LmNoICYm CisgICAgICAgICAgICAgICAgaGlnaGxpZ2h0ZWRSYW5nZS50by5saW5lID09PSByYW5nZS5lbmQu bGluZSAmJgorICAgICAgICAgICAgICAgIGhpZ2hsaWdodGVkUmFuZ2UudG8uY2ggPT09IHJhbmdl LmVuZC5jaCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKICAgICAg ICAgdGhpcy5yZW1vdmVIaWdobGlnaHRlZFJhbmdlKCk7CiAKICAgICAgICAgdmFyIGNsYXNzTmFt ZSA9IHRoaXMuX2NsYXNzTmFtZUZvckhpZ2hsaWdodGVkUmFuZ2UgfHwgIiI7CkBAIC0zNjAsNiAr MzcwLDMyIEBAIFdlYkluc3BlY3Rvci5Db2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIu cHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5faG92ZXJlZFRva2VuSW5mby5tb2RlTmFt ZSAhPT0gImphdmFzY3JpcHQiKQogICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAKKyAgICAgICAg dmFyIHN0YXJ0UG9zaXRpb24gPSB7bGluZTogdGhpcy5faG92ZXJlZFRva2VuSW5mby5wb3NpdGlv bi5saW5lLCBjaDogdGhpcy5faG92ZXJlZFRva2VuSW5mby50b2tlbi5zdGFydH07CisgICAgICAg IHZhciBlbmRQb3NpdGlvbiA9IHtsaW5lOiB0aGlzLl9ob3ZlcmVkVG9rZW5JbmZvLnBvc2l0aW9u LmxpbmUsIGNoOiB0aGlzLl9ob3ZlcmVkVG9rZW5JbmZvLnRva2VuLmVuZH07CisKKyAgICAgICAg Ly8gSWYgdGhlIGhvdmVyZWQgdG9rZW4gaXMgd2l0aGluIGEgc2VsZWN0aW9uLCB1c2UgdGhlIHNl bGVjdGlvbiBhcyBvdXIgZXhwcmVzc2lvbi4KKyAgICAgICAgaWYgKHRoaXMuX2NvZGVNaXJyb3Iu c29tZXRoaW5nU2VsZWN0ZWQoKSkgeworICAgICAgICAgICAgdmFyIHNlbGVjdGlvblJhbmdlID0g eworICAgICAgICAgICAgICAgIHN0YXJ0OiB0aGlzLl9jb2RlTWlycm9yLmdldEN1cnNvcigic3Rh cnQiKSwKKyAgICAgICAgICAgICAgICBlbmQ6IHRoaXMuX2NvZGVNaXJyb3IuZ2V0Q3Vyc29yKCJl bmQiKQorICAgICAgICAgICAgfTsKKyAgICAgICAgCisgICAgICAgICAgICBmdW5jdGlvbiB0b2tl bklzSW5SYW5nZSh0b2tlbiwgcmFuZ2UpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg cmV0dXJuIHRva2VuLmxpbmUgPj0gcmFuZ2Uuc3RhcnQubGluZSAmJiB0b2tlbi5jaCA+PSByYW5n ZS5zdGFydC5jaCAmJgorICAgICAgICAgICAgICAgICAgICAgICB0b2tlbi5saW5lIDw9IHJhbmdl LmVuZC5saW5lICYmIHRva2VuLmNoIDw9IHJhbmdlLmVuZC5jaDsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgCisgICAgICAgICAgICBpZiAodG9rZW5Jc0luUmFuZ2Uoc3RhcnRQb3NpdGlvbiwgc2Vs ZWN0aW9uUmFuZ2UpIHx8IHRva2VuSXNJblJhbmdlKGVuZFBvc2l0aW9uLCBzZWxlY3Rpb25SYW5n ZSkpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4geworICAgICAgICAgICAgICAgICAgICBob3Zl cmVkVG9rZW46IHRoaXMuX2hvdmVyZWRUb2tlbkluZm8udG9rZW4sCisgICAgICAgICAgICAgICAg ICAgIGhvdmVyZWRUb2tlblJhbmdlOiBzZWxlY3Rpb25SYW5nZSwKKyAgICAgICAgICAgICAgICAg ICAgZXhwcmVzc2lvbjogdGhpcy5fY29kZU1pcnJvci5nZXRTZWxlY3Rpb24oKSwKKyAgICAgICAg ICAgICAgICAgICAgZXhwcmVzc2lvblJhbmdlOiBzZWxlY3Rpb25SYW5nZSwKKyAgICAgICAgICAg ICAgICB9OworICAgICAgICAgICAgfQorICAgICAgICB9IAorCiAgICAgICAgIC8vIFdlIG9ubHkg aGFuZGxlIHZhcnMsIGRlZmluaXRpb25zLCBwcm9wZXJ0aWVzLCBhbmQgdGhlIGtleXdvcmQgJ3Ro aXMnLgogICAgICAgICB2YXIgdHlwZSA9IHRoaXMuX2hvdmVyZWRUb2tlbkluZm8udG9rZW4udHlw ZTsKICAgICAgICAgdmFyIGlzUHJvcGVydHkgPSB0eXBlLmluZGV4T2YoInByb3BlcnR5IikgIT09 IC0xOwpAQCAtMzc5LDggKzQxNSw2IEBAIFdlYkluc3BlY3Rvci5Db2RlTWlycm9yVG9rZW5UcmFj a2luZ0NvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICAvLyBXb3JrIG91dCB0aGUgZnVs bCBob3ZlcmVkIGV4cHJlc3Npb24uCiAgICAgICAgIHZhciBleHByZXNzaW9uID0gdGhpcy5faG92 ZXJlZFRva2VuSW5mby50b2tlbi5zdHJpbmc7CiAgICAgICAgIHZhciBleHByZXNzaW9uU3RhcnRQ b3NpdGlvbiA9IHtsaW5lOiB0aGlzLl9ob3ZlcmVkVG9rZW5JbmZvLnBvc2l0aW9uLmxpbmUsIGNo OiB0aGlzLl9ob3ZlcmVkVG9rZW5JbmZvLnRva2VuLnN0YXJ0fTsKLSAgICAgICAgdmFyIHN0YXJ0 UG9zaXRpb24gPSB7bGluZTogdGhpcy5faG92ZXJlZFRva2VuSW5mby5wb3NpdGlvbi5saW5lLCBj aDogdGhpcy5faG92ZXJlZFRva2VuSW5mby50b2tlbi5zdGFydH07Ci0gICAgICAgIHZhciBlbmRQ b3NpdGlvbiA9IHtsaW5lOiB0aGlzLl9ob3ZlcmVkVG9rZW5JbmZvLnBvc2l0aW9uLmxpbmUsIGNo OiB0aGlzLl9ob3ZlcmVkVG9rZW5JbmZvLnRva2VuLmVuZH07CiAgICAgICAgIHdoaWxlICh0cnVl KSB7CiAgICAgICAgICAgICB2YXIgdG9rZW4gPSB0aGlzLl9jb2RlTWlycm9yLmdldFRva2VuQXQo ZXhwcmVzc2lvblN0YXJ0UG9zaXRpb24pOwogICAgICAgICAgICAgdmFyIGlzRG90ID0gdG9rZW4g JiYgIXRva2VuLnR5cGUgJiYgdG9rZW4uc3RyaW5nID09PSAiLiI7Cg== 213107 2013-10-01 12:10:21 -0700 2013-10-01 12:54:05 -0700 Patch for landing bug-122151-20131001211019.patch text/plain 5168 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2Njk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi MDIyNWM4OGIyZThkZmYzZjM5MmE5OTgwMTc3MzYyMWM3MzcyMmVhLi4zMDI4ZWU2MzUzMjIwOTc2 Nzg1NDQ0MjE3ZTFkMDQ2NGE1MDBmMmNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxMy0xMC0wMSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGV2YWx1YXRlIGFuZCBzaG93IGEgcG9wb3ZlciBm b3Igc2VsZWN0ZWQgdGV4dCBpbiBKUyBzb3VyY2Ugd2hlbiBwYXVzZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjE1MQorCisgICAgICAgIFJldmll d2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICBJZGVudGlmeSBpZiB0aGUgaG92ZXJl ZCB0b2tlbiBpcyBjb250YWluZWQgd2l0aGluIHRoZSB0ZXh0IHNlbGVjdGlvbiAoaWYgYW55KSBh bmQgdXNlCisgICAgICAgIHRoZSBzZWxlY3Rpb24gYXMgdGhlIGhvdmVyZWQgZXhwcmVzc2lvbiB0 byBhbGxvdyB0aGUgdXNlciB0byBzZWxlY3QgdGV4dCBhbmQgaG92ZXIgaXQKKyAgICAgICAgdG8g c2VlIHdoYXQgaXQgZXZhbHVhdGVzIHRvLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db2Rl TWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLnByb3RvdHlwZS5oaWdobGlnaHRSYW5n ZSk6CisgICAgICAgIENoZWNrIHdlJ3JlIHRyeWluZyB0byBoaWdobGlnaHQgYSBkaWZmZXJlbnQg cmFuZ2UgYmVmb3JlIHJlbW92aW5nIHRoZSBoaWdobGlnaHQKKyAgICAgICAgYW5kIGFwcGx5aW5n IHRoZSBuZXcgb25lLCB0aGlzIHByZXZlbnRzIHRoZSBtYXJrZWQgdGV4dCBmcm9tIGZsYXNoaW5n IGlmIGl0J3MKKyAgICAgICAgYmVpbmcgcmUtaG92ZXJlZCB3aGljaCB3b3VsZCBlYXNpbHkgaGFw cGVuIHdoZW4gaG92ZXJpbmcgbXVsdGlwbGUgdG9rZW5zIHdpdGhpbgorICAgICAgICB0aGUgc2Ft ZSBzZWxlY3Rpb24uCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db2RlTWlycm9yVG9rZW5UcmFj a2luZ0NvbnRyb2xsZXIucHJvdG90eXBlLl9wcm9jZXNzSmF2YVNjcmlwdEV4cHJlc3Npb24pOgor ICAgICAgICBJbiB0aGUgY2FzZSB3aGVyZSB0aGVyZSBpcyBzZWxlY3RlZCB0ZXh0LCBjaGVjayB3 aGV0aGVyIHRoZSBob3ZlcmVkIHRva2VuIGlzIGF0IGxlYXN0CisgICAgICAgIHBhcnRpYWxseSBj b250YWluZWQgd2l0aGluIHRoZSBzZWxlY3Rpb24sIGFuZCBpZiBzbyB1c2UgdGhlIHNlbGVjdGlv biB0ZXh0IGFzIHRoZQorICAgICAgICBob3ZlcmVkIGV4cHJlc3Npb24gdG8gZXZhbHVhdGUuCisK IDIwMTMtMDktMzAgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiByb3dzIGluIHRoZSBMYXllciBzaWRlYmFyIHBhbmVsIG1heSBoYXZl IHRoZSBpbmNvcnJlY3QgYmFja2dyb3VuZCBjb2xvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVy LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29kZU1pcnJvclRva2Vu VHJhY2tpbmdDb250cm9sbGVyLmpzCmluZGV4IDJhOTNjZjc5ZTdiZmE3MGRiNWU2YTVjNDEyM2Y0 MDlmZDE4ZDY0YjIuLmNhOGNiODE2MGY5MzQxNTI2NWE5YmRjYmExOWM0M2JkZTFiNWY2ZDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvZGVNaXJyb3JU b2tlblRyYWNraW5nQ29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIuanMKQEAgLTE1OSw2 ICsxNTksMTQgQEAgV2ViSW5zcGVjdG9yLkNvZGVNaXJyb3JUb2tlblRyYWNraW5nQ29udHJvbGxl ci5wcm90b3R5cGUgPSB7CiAKICAgICBoaWdobGlnaHRSYW5nZTogZnVuY3Rpb24ocmFuZ2UpCiAg ICAgeworICAgICAgICAvLyBOb3RoaW5nIHRvIGRvIGlmIHdlJ3JlIHRyeWluZyB0byBoaWdobGln aHQgdGhlIHNhbWUgcmFuZ2UuCisgICAgICAgIGlmICh0aGlzLl9jb2RlTWlycm9yTWFya2VkVGV4 dCAmJiB0aGlzLl9jb2RlTWlycm9yTWFya2VkVGV4dC5jbGFzc05hbWUgPT09IHRoaXMuX2NsYXNz TmFtZUZvckhpZ2hsaWdodGVkUmFuZ2UpIHsKKyAgICAgICAgICAgIHZhciBoaWdobGlnaHRlZFJh bmdlID0gdGhpcy5fY29kZU1pcnJvck1hcmtlZFRleHQuZmluZCgpOworICAgICAgICAgICAgaWYg KFdlYkluc3BlY3Rvci5jb21wYXJlQ29kZU1pcnJvclBvc2l0aW9ucyhoaWdobGlnaHRlZFJhbmdl LmZyb20sIHJhbmdlLnN0YXJ0KSA9PT0gMCAmJgorICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5jb21wYXJlQ29kZU1pcnJvclBvc2l0aW9ucyhoaWdobGlnaHRlZFJhbmdlLnRvLCByYW5nZS5l bmQpID09PSAwKQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCiAgICAgICAg IHRoaXMucmVtb3ZlSGlnaGxpZ2h0ZWRSYW5nZSgpOwogCiAgICAgICAgIHZhciBjbGFzc05hbWUg PSB0aGlzLl9jbGFzc05hbWVGb3JIaWdobGlnaHRlZFJhbmdlIHx8ICIiOwpAQCAtMzYwLDYgKzM2 OCwzMiBAQCBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLnBy b3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX2hvdmVyZWRUb2tlbkluZm8ubW9kZU5hbWUg IT09ICJqYXZhc2NyaXB0IikKICAgICAgICAgICAgIHJldHVybiBudWxsOwogCisgICAgICAgIHZh ciBzdGFydFBvc2l0aW9uID0ge2xpbmU6IHRoaXMuX2hvdmVyZWRUb2tlbkluZm8ucG9zaXRpb24u bGluZSwgY2g6IHRoaXMuX2hvdmVyZWRUb2tlbkluZm8udG9rZW4uc3RhcnR9OworICAgICAgICB2 YXIgZW5kUG9zaXRpb24gPSB7bGluZTogdGhpcy5faG92ZXJlZFRva2VuSW5mby5wb3NpdGlvbi5s aW5lLCBjaDogdGhpcy5faG92ZXJlZFRva2VuSW5mby50b2tlbi5lbmR9OworCisgICAgICAgIC8v IElmIHRoZSBob3ZlcmVkIHRva2VuIGlzIHdpdGhpbiBhIHNlbGVjdGlvbiwgdXNlIHRoZSBzZWxl Y3Rpb24gYXMgb3VyIGV4cHJlc3Npb24uCisgICAgICAgIGlmICh0aGlzLl9jb2RlTWlycm9yLnNv bWV0aGluZ1NlbGVjdGVkKCkpIHsKKyAgICAgICAgICAgIHZhciBzZWxlY3Rpb25SYW5nZSA9IHsK KyAgICAgICAgICAgICAgICBzdGFydDogdGhpcy5fY29kZU1pcnJvci5nZXRDdXJzb3IoInN0YXJ0 IiksCisgICAgICAgICAgICAgICAgZW5kOiB0aGlzLl9jb2RlTWlycm9yLmdldEN1cnNvcigiZW5k IikKKyAgICAgICAgICAgIH07CisgICAgICAgIAorICAgICAgICAgICAgZnVuY3Rpb24gdG9rZW5J c0luUmFuZ2UodG9rZW4sIHJhbmdlKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHJl dHVybiB0b2tlbi5saW5lID49IHJhbmdlLnN0YXJ0LmxpbmUgJiYgdG9rZW4uY2ggPj0gcmFuZ2Uu c3RhcnQuY2ggJiYKKyAgICAgICAgICAgICAgICAgICAgICAgdG9rZW4ubGluZSA8PSByYW5nZS5l bmQubGluZSAmJiB0b2tlbi5jaCA8PSByYW5nZS5lbmQuY2g7CisgICAgICAgICAgICB9CisgICAg ICAgIAorICAgICAgICAgICAgaWYgKHRva2VuSXNJblJhbmdlKHN0YXJ0UG9zaXRpb24sIHNlbGVj dGlvblJhbmdlKSB8fCB0b2tlbklzSW5SYW5nZShlbmRQb3NpdGlvbiwgc2VsZWN0aW9uUmFuZ2Up KSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIHsKKyAgICAgICAgICAgICAgICAgICAgaG92ZXJl ZFRva2VuOiB0aGlzLl9ob3ZlcmVkVG9rZW5JbmZvLnRva2VuLAorICAgICAgICAgICAgICAgICAg ICBob3ZlcmVkVG9rZW5SYW5nZTogc2VsZWN0aW9uUmFuZ2UsCisgICAgICAgICAgICAgICAgICAg IGV4cHJlc3Npb246IHRoaXMuX2NvZGVNaXJyb3IuZ2V0U2VsZWN0aW9uKCksCisgICAgICAgICAg ICAgICAgICAgIGV4cHJlc3Npb25SYW5nZTogc2VsZWN0aW9uUmFuZ2UsCisgICAgICAgICAgICAg ICAgfTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSAKKwogICAgICAgICAvLyBXZSBvbmx5IGhh bmRsZSB2YXJzLCBkZWZpbml0aW9ucywgcHJvcGVydGllcywgYW5kIHRoZSBrZXl3b3JkICd0aGlz Jy4KICAgICAgICAgdmFyIHR5cGUgPSB0aGlzLl9ob3ZlcmVkVG9rZW5JbmZvLnRva2VuLnR5cGU7 CiAgICAgICAgIHZhciBpc1Byb3BlcnR5ID0gdHlwZS5pbmRleE9mKCJwcm9wZXJ0eSIpICE9PSAt MTsKQEAgLTM3OSw4ICs0MTMsNiBAQCBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRva2VuVHJhY2tp bmdDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8gV29yayBvdXQgdGhlIGZ1bGwg aG92ZXJlZCBleHByZXNzaW9uLgogICAgICAgICB2YXIgZXhwcmVzc2lvbiA9IHRoaXMuX2hvdmVy ZWRUb2tlbkluZm8udG9rZW4uc3RyaW5nOwogICAgICAgICB2YXIgZXhwcmVzc2lvblN0YXJ0UG9z aXRpb24gPSB7bGluZTogdGhpcy5faG92ZXJlZFRva2VuSW5mby5wb3NpdGlvbi5saW5lLCBjaDog dGhpcy5faG92ZXJlZFRva2VuSW5mby50b2tlbi5zdGFydH07Ci0gICAgICAgIHZhciBzdGFydFBv c2l0aW9uID0ge2xpbmU6IHRoaXMuX2hvdmVyZWRUb2tlbkluZm8ucG9zaXRpb24ubGluZSwgY2g6 IHRoaXMuX2hvdmVyZWRUb2tlbkluZm8udG9rZW4uc3RhcnR9OwotICAgICAgICB2YXIgZW5kUG9z aXRpb24gPSB7bGluZTogdGhpcy5faG92ZXJlZFRva2VuSW5mby5wb3NpdGlvbi5saW5lLCBjaDog dGhpcy5faG92ZXJlZFRva2VuSW5mby50b2tlbi5lbmR9OwogICAgICAgICB3aGlsZSAodHJ1ZSkg ewogICAgICAgICAgICAgdmFyIHRva2VuID0gdGhpcy5fY29kZU1pcnJvci5nZXRUb2tlbkF0KGV4 cHJlc3Npb25TdGFydFBvc2l0aW9uKTsKICAgICAgICAgICAgIHZhciBpc0RvdCA9IHRva2VuICYm ICF0b2tlbi50eXBlICYmIHRva2VuLnN0cmluZyA9PT0gIi4iOwo=