143939 2015-04-19 16:53:41 -0700 Web Inspector: assertion failure when editing inline styles 2015-04-25 09:31:15 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 tobi+webkit webkit-unassigned commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1086697 0 tobi+webkit 2015-04-19 16:53:41 -0700 Editing inline styles causes a cascade of procedures ending in `fetchedStyleSheetContent` which expects the CSSStyleSheet to have a valid URL. This is never the case since inline styles neither have a "sourceURL" nor a "parent frame". Actually it looks like using the `CSSStyleSheet` class for inline styles is not what http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-htmlelementcss-h3 specifies. 1086698 1 webkit-bug-importer 2015-04-19 16:53:50 -0700 <rdar://problem/20608788> 1086703 2 251139 tobi+webkit 2015-04-19 17:25:34 -0700 Created attachment 251139 patch 1086706 3 251139 tobi+webkit 2015-04-19 17:32:07 -0700 Comment on attachment 251139 patch View in context: https://bugs.webkit.org/attachment.cgi?id=251139&action=review > Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js:-28 > - constructor(id, url, parentFrame) This change is not directly related to the bugfix. It turned out that "url" and "parentFrame" are never passed to the constructor. > Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:572 > + if (type === WebInspector.CSSStyleDeclaration.Type.Attribute) This fixes a linter error. 1088296 4 251139 timothy 2015-04-24 12:30:55 -0700 Comment on attachment 251139 patch View in context: https://bugs.webkit.org/attachment.cgi?id=251139&action=review Looks good! Make these tweaks and I can r+ this. > Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js:134 > + if (styleSheet.isCssInlineStyle) See below. This will need to change to: styleSheet.isInlineStyle() > Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js:87 > + get isCssInlineStyle() CSS should be all caps. No XMLHttpRequest precedent here. I don't think repeating CSS is needed either. We also don't use is for getters. This should be a function. I'd go with: isInlineStyle() > Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js:92 > + markAsCssInlineStyle() Ditto. Go with: markAsInlineStyle(). 1088548 5 251637 tobi+webkit 2015-04-25 07:27:06 -0700 Created attachment 251637 patch 1088549 6 tobi+webkit 2015-04-25 07:36:27 -0700 Looking at the Changelog the "webkit-patch" script for some reasons generated the following: - "WebInspector.CSSStyleSheet.isInlineStyle" (not on prototype) - "WebInspector.CSSStyleSheet.prototype.markAsInlineStyle" (on prototype) But both functions are actually supposed to be on the prototype. 1088553 7 251637 timothy 2015-04-25 08:42:09 -0700 Comment on attachment 251637 patch Nice! 1088556 8 251637 commit-queue 2015-04-25 09:31:10 -0700 Comment on attachment 251637 patch Clearing flags on attachment: 251637 Committed r183311: <http://trac.webkit.org/changeset/183311> 1088557 9 commit-queue 2015-04-25 09:31:15 -0700 All reviewed patches have been landed. Closing bug. 251139 2015-04-19 17:25:34 -0700 2015-04-25 07:26:58 -0700 patch bug-143939-20150420022432.patch text/plain 4935 tobi+webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyOTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBk M2Y4Zjk2OGRkYzA1YWQ4MjFhNTA0Y2NmNjFhYmRjYzY3ZGY4NGI0Li45MTdkOTlhZTY5OGRmYmJh YTRiOGZiNDFjZWZjZDhlNTQwZDc4ZjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAxNS0wNC0xOSAgVG9iaWFzIFJlaXNzICA8dG9iaSt3ZWJraXRAYmFzZWNv ZGUuZGU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYXNzZXJ0aW9uIGZhaWx1cmUgd2hlbiBl ZGl0aW5nIGlubGluZSBzdHlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0MzkzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFByZXZlbnQgIl91cGRhdGVSZXNvdXJjZUNvbnRlbnQiIGZyb20gYmVpbmcg Y2FsbGVkIG9uIGlubGluZSBzdHlsZSBjaGFuZ2VzLgorICAgICAgICBJbnRyb2R1Y2UgYSBmbGFn IHRoYXQgbWFya3MgYSBDU1NTdHlsZVNoZWV0IGFzIGEgcmVwcmVzZW50YXRpb24gb2YgYW4KKyAg ICAgICAgIkVsZW1lbnRDU1NJbmxpbmVTdHlsZSIgKERPTSBMZXZlbCAyIHNwZWMpIGFuZCByZXR1 cm4gZWFybHkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NTU1N0eWxl TWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1hbmFnZXIucHJvdG90 eXBlLnN0eWxlU2hlZXRDaGFuZ2VkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9D U1NTdHlsZVNoZWV0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQucHJvdG90eXBlLmdldCBpc0Nzc0lu bGluZVN0eWxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LnByb3RvdHlw ZS5tYXJrQXNDc3NJbmxpbmVTdHlsZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMv RE9NTm9kZVN0eWxlcy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlU3R5bGVzLnBy b3RvdHlwZS5fcGFyc2VTdHlsZURlY2xhcmF0aW9uUGF5bG9hZCk6CisKIDIwMTUtMDQtMTggIE5p a2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogUGFzcyBtdWx0aXBsZSBhcmd1bWVudHMgdG8gY2xhc3NMaXN0LmFkZCBhbmQgY2xhc3NM aXN0LnJlbW92ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvQ1NTU3R5bGVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ1NTU3R5bGVNYW5hZ2VyLmpzCmluZGV4IDdlYjli OTY3NzRjMmE0ZjNjNThjNDlkMmEwM2NhYWMxZWI5MzUzY2UuLjU4MzUxMDM5MWRhZDgyY2E3OWMz NGIzZGNjOWUwNjJjM2ZmZjU5YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NTU1N0eWxlTWFuYWdlci5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DU1NTdHlsZU1hbmFnZXIu anMKQEAgLTEzMCw4ICsxMzAsMTEgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlTWFuYWdlciA9IGNs YXNzIENTU1N0eWxlTWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAg dmFyIHN0eWxlU2hlZXQgPSB0aGlzLnN0eWxlU2hlZXRGb3JJZGVudGlmaWVyKHN0eWxlU2hlZXRJ ZGVudGlmaWVyKTsKICAgICAgICAgY29uc29sZS5hc3NlcnQoc3R5bGVTaGVldCk7CiAKLSAgICAg ICAgc3R5bGVTaGVldC5ub3RlQ29udGVudERpZENoYW5nZSgpOworICAgICAgICAvLyBEbyBub3Qg b2JzZXJ2ZSBpbmxpbmUgc3R5bGVzCisgICAgICAgIGlmIChzdHlsZVNoZWV0LmlzQ3NzSW5saW5l U3R5bGUpCisgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgc3R5bGVTaGVldC5ub3RlQ29u dGVudERpZENoYW5nZSgpOwogICAgICAgICB0aGlzLl91cGRhdGVSZXNvdXJjZUNvbnRlbnQoc3R5 bGVTaGVldCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvQ1NTU3R5bGVTaGVldC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NTdHlsZVNoZWV0LmpzCmluZGV4IDZjOWM2Yjk1MWJi OTVmNzRjYzBjOTcxOGM4MDMyOTg5YmQzNjFmZTUuLjkzMTAyMzEwNjcxYWUwZTczYzJjYjE3NGFh YjQ0YWJjZGRmZDVjOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9DU1NTdHlsZVNoZWV0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NTdHlsZVNoZWV0LmpzCkBAIC0yNSwxNSArMjUsMTUg QEAKIAogV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQgPSBjbGFzcyBDU1NTdHlsZVNoZWV0IGV4 dGVuZHMgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGUKIHsKLSAgICBjb25zdHJ1Y3RvcihpZCwgdXJs LCBwYXJlbnRGcmFtZSkKKyAgICBjb25zdHJ1Y3RvcihpZCkKICAgICB7CiAgICAgICAgIHN1cGVy KCk7CiAKICAgICAgICAgY29uc29sZS5hc3NlcnQoaWQpOwogCiAgICAgICAgIHRoaXMuX2lkID0g aWQgfHwgbnVsbDsKLQotICAgICAgICB0aGlzLnVwZGF0ZUluZm8odXJsLCBwYXJlbnRGcmFtZSk7 CisgICAgICAgIHRoaXMuX3VybCA9IG51bGw7CisgICAgICAgIHRoaXMuX3BhcmVudEZyYW1lID0g bnVsbDsKICAgICB9CiAKICAgICAvLyBTdGF0aWMKQEAgLTg0LDYgKzg0LDE2IEBAIFdlYkluc3Bl Y3Rvci5DU1NTdHlsZVNoZWV0ID0gY2xhc3MgQ1NTU3R5bGVTaGVldCBleHRlbmRzIFdlYkluc3Bl Y3Rvci5Tb3VyY2VDb2RlCiAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFu b255bW91cyBTdHlsZVNoZWV0ICVkIikuZm9ybWF0KHRoaXMuX3VuaXF1ZURpc3BsYXlOYW1lTnVt YmVyKTsKICAgICB9CiAKKyAgICBnZXQgaXNDc3NJbmxpbmVTdHlsZSgpCisgICAgeworICAgICAg ICByZXR1cm4gISF0aGlzLl9jc3NJbmxpbmVTdHlsZTsKKyAgICB9CisKKyAgICBtYXJrQXNDc3NJ bmxpbmVTdHlsZSgpCisgICAgeworICAgICAgICB0aGlzLl9jc3NJbmxpbmVTdHlsZSA9IHRydWU7 CisgICAgfQorCiAgICAgLy8gUHJvdGVjdGVkCiAKICAgICB1cGRhdGVJbmZvKHVybCwgcGFyZW50 RnJhbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9N b2RlbHMvRE9NTm9kZVN0eWxlcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzCmluZGV4IDRiNWZmYzUyODAxOTYyODA5NjliOTlh MjBkYjVmNzkwMTBjZjM1ZjEuLjkzM2E5NzgwNTUwMzZmNTdhZGM5ZGU3OTkxNWZkNjI5MjEyOWE5 NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9ET01Ob2RlU3R5bGVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzCkBAIC01NjksNyArNTY5LDcgQEAgV2ViSW5zcGVj dG9yLkRPTU5vZGVTdHlsZXMgPSBjbGFzcyBET01Ob2RlU3R5bGVzIGV4dGVuZHMgV2ViSW5zcGVj dG9yLk9iamVjdAogICAgICAgICB2YXIgaWQgPSBwYXlsb2FkLnN0eWxlSWQ7CiAgICAgICAgIHZh ciBtYXBLZXkgPSBpZCA/IGlkLnN0eWxlU2hlZXRJZCArICI6IiArIGlkLm9yZGluYWwgOiBudWxs OwogCi0gICAgICAgIGlmICh0eXBlID09IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9u LlR5cGUuQXR0cmlidXRlKQorICAgICAgICBpZiAodHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNTU1N0 eWxlRGVjbGFyYXRpb24uVHlwZS5BdHRyaWJ1dGUpCiAgICAgICAgICAgICBtYXBLZXkgPSBub2Rl LmlkICsgIjphdHRyaWJ1dGUiOwogCiAgICAgICAgIHZhciBzdHlsZURlY2xhcmF0aW9uID0gcnVs ZSA/IHJ1bGUuc3R5bGUgOiBudWxsOwpAQCAtNjU1LDggKzY1NSwxMSBAQCBXZWJJbnNwZWN0b3Iu RE9NTm9kZVN0eWxlcyA9IGNsYXNzIERPTU5vZGVTdHlsZXMgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu T2JqZWN0CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgc3R5bGVTaGVldCA9IGlkID8gV2ViSW5z cGVjdG9yLmNzc1N0eWxlTWFuYWdlci5zdHlsZVNoZWV0Rm9ySWRlbnRpZmllcihpZC5zdHlsZVNo ZWV0SWQpIDogbnVsbDsKLSAgICAgICAgaWYgKHN0eWxlU2hlZXQpCisgICAgICAgIGlmIChzdHls ZVNoZWV0KSB7CisgICAgICAgICAgICBpZiAodHlwZSA9PT0gV2ViSW5zcGVjdG9yLkNTU1N0eWxl RGVjbGFyYXRpb24uVHlwZS5JbmxpbmUpCisgICAgICAgICAgICAgICAgc3R5bGVTaGVldC5tYXJr QXNDc3NJbmxpbmVTdHlsZSgpOwogICAgICAgICAgICAgc3R5bGVTaGVldC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LkV2ZW50LkNvbnRlbnREaWRDaGFuZ2UsIHRo aXMuX3N0eWxlU2hlZXRDb250ZW50RGlkQ2hhbmdlLCB0aGlzKTsKKyAgICAgICAgfQogCiAgICAg ICAgIHN0eWxlRGVjbGFyYXRpb24gPSBuZXcgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRp b24odGhpcywgc3R5bGVTaGVldCwgaWQsIHR5cGUsIG5vZGUsIGluaGVyaXRlZCwgdGV4dCwgcHJv cGVydGllcywgc3R5bGVTaGVldFRleHRSYW5nZSk7CiAK 251637 2015-04-25 07:27:06 -0700 2015-04-25 09:31:10 -0700 patch bug-143939-20150425162559.patch text/plain 4996 tobi+webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw NzRjOTlmNjA5ZjhlNDU0YTcxMTg4NGI3NWUwZTUzNjQ1MTM2MDk2Li5jYTkyMDBiNjkzNjQxNTJl OGZkOWRhM2E1MGZiOTdmODY1ZWMxNDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAxNS0wNC0yNSAgVG9iaWFzIFJlaXNzICA8dG9iaSt3ZWJraXRAYmFzZWNv ZGUuZGU+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYXNzZXJ0aW9uIGZhaWx1cmUgd2hlbiBl ZGl0aW5nIGlubGluZSBzdHlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0MzkzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFByZXZlbnQgIl91cGRhdGVSZXNvdXJjZUNvbnRlbnQiIGZyb20gYmVpbmcg Y2FsbGVkIG9uIGlubGluZSBzdHlsZSBjaGFuZ2VzLgorICAgICAgICBJbnRyb2R1Y2UgYSBmbGFn IHRoYXQgbWFya3MgYSBDU1NTdHlsZVNoZWV0IGFzIGEgcmVwcmVzZW50YXRpb24gb2YgYW4KKyAg ICAgICAgIkVsZW1lbnRDU1NJbmxpbmVTdHlsZSIgKERPTSBMZXZlbCAyIHNwZWMpIGFuZCByZXR1 cm4gZWFybHkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NTU1N0eWxl TWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1hbmFnZXIucHJvdG90 eXBlLnN0eWxlU2hlZXRDaGFuZ2VkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9D U1NTdHlsZVNoZWV0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQuaXNJbmxpbmVTdHlsZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5wcm90b3R5cGUubWFya0FzSW5saW5lU3R5 bGUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRE9NTm9kZVN0eWxlcy5wcm90b3R5cGUuX3BhcnNlU3R5bGVE ZWNsYXJhdGlvblBheWxvYWQpOgorCiAyMDE1LTA0LTI0ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1v dGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OOiBXZWIgSW5zcGVjdG9yOiBTdGFy dCBUaW1lbGluZSBSZWNvcmRpbmcgaW4gRGV2ZWxvcCBtZW51IGJyb2tlbgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ1NTU3R5bGVN YW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvQ1NTU3R5bGVNYW5hZ2VyLmpzCmluZGV4IDdlYjliOTY3NzRjMmE0ZjNjNThjNDlkMmEwM2Nh YWMxZWI5MzUzY2UuLjc0NjdmMTk2MGVhODM4MjAwOWJlZWNlYTU5Y2I4NTc2Y2EyNzA3OTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L0NTU1N0eWxlTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9DU1NTdHlsZU1hbmFnZXIuanMKQEAgLTEyNiwxMiArMTI2LDE0IEBA IFdlYkluc3BlY3Rvci5DU1NTdHlsZU1hbmFnZXIgPSBjbGFzcyBDU1NTdHlsZU1hbmFnZXIgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgc3R5bGVTaGVldENoYW5nZWQoc3R5bGVTaGVl dElkZW50aWZpZXIpCiAgICAgewogICAgICAgICAvLyBDYWxsZWQgZnJvbSBXZWJJbnNwZWN0b3Iu Q1NTT2JzZXJ2ZXIuCi0KICAgICAgICAgdmFyIHN0eWxlU2hlZXQgPSB0aGlzLnN0eWxlU2hlZXRG b3JJZGVudGlmaWVyKHN0eWxlU2hlZXRJZGVudGlmaWVyKTsKICAgICAgICAgY29uc29sZS5hc3Nl cnQoc3R5bGVTaGVldCk7CiAKLSAgICAgICAgc3R5bGVTaGVldC5ub3RlQ29udGVudERpZENoYW5n ZSgpOworICAgICAgICAvLyBEbyBub3Qgb2JzZXJ2ZSBpbmxpbmUgc3R5bGVzCisgICAgICAgIGlm IChzdHlsZVNoZWV0LmlzSW5saW5lU3R5bGUoKSkKKyAgICAgICAgICAgIHJldHVybjsKIAorICAg ICAgICBzdHlsZVNoZWV0Lm5vdGVDb250ZW50RGlkQ2hhbmdlKCk7CiAgICAgICAgIHRoaXMuX3Vw ZGF0ZVJlc291cmNlQ29udGVudChzdHlsZVNoZWV0KTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NTdHlsZVNoZWV0Lmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1N0eWxlU2hl ZXQuanMKaW5kZXggNmM5YzZiOTUxYmI5NWY3NGNjMGM5NzE4YzgwMzI5ODliZDM2MWZlNS4uMWYy MTJlZTc2NjU1OGI0YTBiYmMyODFkNzExODhmOWQ4ZTQ0Mjk5MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1N0eWxlU2hlZXQuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1N0eWxlU2hl ZXQuanMKQEAgLTI1LDE1ICsyNSwxNSBAQAogCiBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldCA9 IGNsYXNzIENTU1N0eWxlU2hlZXQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuU291cmNlQ29kZQogewot ICAgIGNvbnN0cnVjdG9yKGlkLCB1cmwsIHBhcmVudEZyYW1lKQorICAgIGNvbnN0cnVjdG9yKGlk KQogICAgIHsKICAgICAgICAgc3VwZXIoKTsKIAogICAgICAgICBjb25zb2xlLmFzc2VydChpZCk7 CiAKICAgICAgICAgdGhpcy5faWQgPSBpZCB8fCBudWxsOwotCi0gICAgICAgIHRoaXMudXBkYXRl SW5mbyh1cmwsIHBhcmVudEZyYW1lKTsKKyAgICAgICAgdGhpcy5fdXJsID0gbnVsbDsKKyAgICAg ICAgdGhpcy5fcGFyZW50RnJhbWUgPSBudWxsOwogICAgIH0KIAogICAgIC8vIFN0YXRpYwpAQCAt ODQsNiArODQsMTYgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQgPSBjbGFzcyBDU1NTdHls ZVNoZWV0IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGUKICAgICAgICAgcmV0dXJuIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiQW5vbnltb3VzIFN0eWxlU2hlZXQgJWQiKS5mb3JtYXQodGhp cy5fdW5pcXVlRGlzcGxheU5hbWVOdW1iZXIpOwogICAgIH0KIAorICAgIGlzSW5saW5lU3R5bGUo KQorICAgIHsKKyAgICAgICAgcmV0dXJuICEhdGhpcy5faW5saW5lU3R5bGU7CisgICAgfQorCisg ICAgbWFya0FzSW5saW5lU3R5bGUoKQorICAgIHsKKyAgICAgICAgdGhpcy5faW5saW5lU3R5bGUg PSB0cnVlOworICAgIH0KKwogICAgIC8vIFByb3RlY3RlZAogCiAgICAgdXBkYXRlSW5mbyh1cmws IHBhcmVudEZyYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcwppbmRleCA0YjVmZmM1MjgwMTk2Mjgw OTY5Yjk5YTIwZGI1Zjc5MDEwY2YzNWYxLi5kNDVmZWUwZjA2MzU4ZmM0Y2E5ZjEzYTBlN2IxZmMy YWE1YmFmYzdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcwpAQCAtNTY5LDcgKzU2OSw3IEBAIFdl Ykluc3BlY3Rvci5ET01Ob2RlU3R5bGVzID0gY2xhc3MgRE9NTm9kZVN0eWxlcyBleHRlbmRzIFdl Ykluc3BlY3Rvci5PYmplY3QKICAgICAgICAgdmFyIGlkID0gcGF5bG9hZC5zdHlsZUlkOwogICAg ICAgICB2YXIgbWFwS2V5ID0gaWQgPyBpZC5zdHlsZVNoZWV0SWQgKyAiOiIgKyBpZC5vcmRpbmFs IDogbnVsbDsKIAotICAgICAgICBpZiAodHlwZSA9PSBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNs YXJhdGlvbi5UeXBlLkF0dHJpYnV0ZSkKKyAgICAgICAgaWYgKHR5cGUgPT09IFdlYkluc3BlY3Rv ci5DU1NTdHlsZURlY2xhcmF0aW9uLlR5cGUuQXR0cmlidXRlKQogICAgICAgICAgICAgbWFwS2V5 ID0gbm9kZS5pZCArICI6YXR0cmlidXRlIjsKIAogICAgICAgICB2YXIgc3R5bGVEZWNsYXJhdGlv biA9IHJ1bGUgPyBydWxlLnN0eWxlIDogbnVsbDsKQEAgLTY1NSw4ICs2NTUsMTEgQEAgV2ViSW5z cGVjdG9yLkRPTU5vZGVTdHlsZXMgPSBjbGFzcyBET01Ob2RlU3R5bGVzIGV4dGVuZHMgV2ViSW5z cGVjdG9yLk9iamVjdAogICAgICAgICB9CiAKICAgICAgICAgdmFyIHN0eWxlU2hlZXQgPSBpZCA/ IFdlYkluc3BlY3Rvci5jc3NTdHlsZU1hbmFnZXIuc3R5bGVTaGVldEZvcklkZW50aWZpZXIoaWQu c3R5bGVTaGVldElkKSA6IG51bGw7Ci0gICAgICAgIGlmIChzdHlsZVNoZWV0KQorICAgICAgICBp ZiAoc3R5bGVTaGVldCkgeworICAgICAgICAgICAgaWYgKHR5cGUgPT09IFdlYkluc3BlY3Rvci5D U1NTdHlsZURlY2xhcmF0aW9uLlR5cGUuSW5saW5lKQorICAgICAgICAgICAgICAgIHN0eWxlU2hl ZXQubWFya0FzSW5saW5lU3R5bGUoKTsKICAgICAgICAgICAgIHN0eWxlU2hlZXQuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5FdmVudC5Db250ZW50RGlkQ2hhbmdl LCB0aGlzLl9zdHlsZVNoZWV0Q29udGVudERpZENoYW5nZSwgdGhpcyk7CisgICAgICAgIH0KIAog ICAgICAgICBzdHlsZURlY2xhcmF0aW9uID0gbmV3IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xh cmF0aW9uKHRoaXMsIHN0eWxlU2hlZXQsIGlkLCB0eXBlLCBub2RlLCBpbmhlcml0ZWQsIHRleHQs IHByb3BlcnRpZXMsIHN0eWxlU2hlZXRUZXh0UmFuZ2UpOwogCg==