160762 2016-08-10 19:03:14 -0700 Web Inspector: Should be able to Edit Node Attributes and Styles for non-UserAgent Shadow DOM nodes 2016-08-10 20:36:34 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck koivisto mattbaker nvasilyev rniwa timothy webkit-bug-importer oldest_to_newest 1219234 0 joepeck 2016-08-10 19:03:14 -0700 Summary: Should be able to Edit Node Attributes and Styles for non-UserAgent Shadow DOM nodes. Steps to Reproduce: 1. Inspect a page with Shadow DOM content (open or closed) 2. Select a Shadow DOM node => Should be able to Edit Attributes in DOM Tree => Should be able to Edit Styles applying to the selected node 1219235 1 webkit-bug-importer 2016-08-10 19:03:39 -0700 <rdar://problem/27798271> 1219244 2 285805 joepeck 2016-08-10 19:10:52 -0700 Created attachment 285805 [PATCH] Proposed Fix 1219260 3 285805 commit-queue 2016-08-10 20:36:30 -0700 Comment on attachment 285805 [PATCH] Proposed Fix Clearing flags on attachment: 285805 Committed r204370: <http://trac.webkit.org/changeset/204370> 1219261 4 commit-queue 2016-08-10 20:36:34 -0700 All reviewed patches have been landed. Closing bug. 285805 2016-08-10 19:10:52 -0700 2016-08-10 20:36:30 -0700 [PATCH] Proposed Fix shadow-dom-1.patch text/plain 14557 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4OWFlNzg5Li45YzAzOTViIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTYtMDgt MTAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBTaG91bGQgYmUgYWJsZSB0byBFZGl0IE5vZGUgQXR0cmlidXRlcyBhbmQgU3R5 bGVzIGZvciBub24tVXNlckFnZW50IFNoYWRvdyBET00gbm9kZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDc2MgorICAgICAgICA8cmRhcjovL3By b2JsZW0vMjc3OTgyNzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBpbnNwZWN0b3IvZG9tL3NoYWRvd1Jvb3RUeXBlLWV4cGVjdGVkLnR4dDoKKyAg ICAgICAgKiBpbnNwZWN0b3IvZG9tL3NoYWRvd1Jvb3RUeXBlLmh0bWw6CisgICAgICAgIEFkZCB0 ZXN0cyBmb3IgRE9NTm9kZS5wcm90b3R5cGUuaXNJblVzZXJBZ2VudFNoYWRvd1RyZWUuCisKIDIw MTYtMDgtMDkgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBDaGFy YWN0ZXJEYXRhLmRhdGEgc2V0dGVyIG9wdGltaXphdGlvbiBpcyBub3Qgc3BlYy1jb21wbGlhbnQg YW5kIGlzIG9ic2VydmFibGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kb20v c2hhZG93Um9vdFR5cGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS9z aGFkb3dSb290VHlwZS1leHBlY3RlZC50eHQKaW5kZXggNGNiYjc1ZC4uMzNmOWQ3YyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS9zaGFkb3dSb290VHlwZS1leHBlY3RlZC50 eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS9zaGFkb3dSb290VHlwZS1leHBlY3Rl ZC50eHQKQEAgLTUsMTQgKzUsMTcgQEAgVGVzdCBmb3IgRE9NTm9kZS5zaGFkb3dSb290VHlwZS4K IC0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBTaGFkb3dSb290VHlwZS5Vc2VyQWdlbnQKIFBBU1M6IERP TU5vZGUgaGFzIGEgc2luZ2xlIHNoYWRvdyByb290LgogUEFTUzogRE9NTm9kZSBoYXMgVXNlckFn ZW50IHNoYWRvdyByb290IHR5cGUuCitQQVNTOiBET01Ob2RlIGlzIGluIGEgVXNlckFnZW50IHNo YWRvdyB0cmVlLgogCiAtLSBSdW5uaW5nIHRlc3QgY2FzZTogU2hhZG93Um9vdFR5cGUuQ2xvc2Vk CiBQQVNTOiBET01Ob2RlIGhhcyBhIHNpbmdsZSBzaGFkb3cgcm9vdC4KIFBBU1M6IERPTU5vZGUg aGFzIENsb3NlZCBzaGFkb3cgcm9vdCB0eXBlLgorUEFTUzogRE9NTm9kZSBpcyBub3QgaW4gYSBV c2VyQWdlbnQgc2hhZG93IHRyZWUuCiAKIC0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBTaGFkb3dSb290 VHlwZS5PcGVuCiBQQVNTOiBET01Ob2RlIGhhcyBhIHNpbmdsZSBzaGFkb3cgcm9vdC4KIFBBU1M6 IERPTU5vZGUgaGFzIE9wZW4gc2hhZG93IHJvb3QgdHlwZS4KK1BBU1M6IERPTU5vZGUgaXMgbm90 IGluIGEgVXNlckFnZW50IHNoYWRvdyB0cmVlLgogCiAtLSBSdW5uaW5nIHRlc3QgY2FzZTogTm9T aGFkb3dSb290VHlwZQogUEFTUzogRE9NTm9kZSBoYXMgbm8gc2hhZG93IHJvb3RzLgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS9zaGFkb3dSb290VHlwZS5odG1sIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS9zaGFkb3dSb290VHlwZS5odG1sCmluZGV4IDBjOGM4NTgu LmQ2YTk4NDggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kb20vc2hhZG93Um9v dFR5cGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZG9tL3NoYWRvd1Jvb3RUeXBl Lmh0bWwKQEAgLTE3LDYgKzE3LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5hc3NlcnQoZG9tTm9kZSwgIkdvdCBET01Ob2RlIGZvciAjaG9zdC11c2Vy LWFnZW50Iik7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KGRvbU5v ZGUuc2hhZG93Um9vdHMoKS5sZW5ndGggPT09IDEsICJET01Ob2RlIGhhcyBhIHNpbmdsZSBzaGFk b3cgcm9vdC4iKTsKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoZG9t Tm9kZS5zaGFkb3dSb290cygpWzBdLnNoYWRvd1Jvb3RUeXBlKCkgPT09IFdlYkluc3BlY3Rvci5E T01Ob2RlLlNoYWRvd1Jvb3RUeXBlLlVzZXJBZ2VudCwgIkRPTU5vZGUgaGFzIFVzZXJBZ2VudCBz aGFkb3cgcm9vdCB0eXBlLiIpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0 VGhhdChkb21Ob2RlLnNoYWRvd1Jvb3RzKClbMF0uaXNJblVzZXJBZ2VudFNoYWRvd1RyZWUoKSwg IkRPTU5vZGUgaXMgaW4gYSBVc2VyQWdlbnQgc2hhZG93IHRyZWUuIik7CiAgICAgICAgICAgICAg ICAgcmVzb2x2ZSgpOwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0KQEAgLTMwLDYgKzMxLDcg QEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQo ZG9tTm9kZSwgIkdvdCBET01Ob2RlIGZvciAjaG9zdC1jbG9zZWQiKTsKICAgICAgICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoZG9tTm9kZS5zaGFkb3dSb290cygpLmxlbmd0aCA9 PT0gMSwgIkRPTU5vZGUgaGFzIGEgc2luZ2xlIHNoYWRvdyByb290LiIpOwogICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChkb21Ob2RlLnNoYWRvd1Jvb3RzKClbMF0uc2hh ZG93Um9vdFR5cGUoKSA9PT0gV2ViSW5zcGVjdG9yLkRPTU5vZGUuU2hhZG93Um9vdFR5cGUuQ2xv c2VkLCAiRE9NTm9kZSBoYXMgQ2xvc2VkIHNoYWRvdyByb290IHR5cGUuIik7CisgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KCFkb21Ob2RlLnNoYWRvd1Jvb3RzKClbMF0u aXNJblVzZXJBZ2VudFNoYWRvd1RyZWUoKSwgIkRPTU5vZGUgaXMgbm90IGluIGEgVXNlckFnZW50 IHNoYWRvdyB0cmVlLiIpOwogICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKICAgICAgICAgICAg IH0pOwogICAgICAgICB9CkBAIC00Myw2ICs0NSw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAg ICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KGRvbU5vZGUsICJHb3QgRE9NTm9kZSBmb3Ig I2hvc3Qtb3BlbiIpOwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChk b21Ob2RlLnNoYWRvd1Jvb3RzKCkubGVuZ3RoID09PSAxLCAiRE9NTm9kZSBoYXMgYSBzaW5nbGUg c2hhZG93IHJvb3QuIik7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0 KGRvbU5vZGUuc2hhZG93Um9vdHMoKVswXS5zaGFkb3dSb290VHlwZSgpID09PSBXZWJJbnNwZWN0 b3IuRE9NTm9kZS5TaGFkb3dSb290VHlwZS5PcGVuLCAiRE9NTm9kZSBoYXMgT3BlbiBzaGFkb3cg cm9vdCB0eXBlLiIpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdCgh ZG9tTm9kZS5zaGFkb3dSb290cygpWzBdLmlzSW5Vc2VyQWdlbnRTaGFkb3dUcmVlKCksICJET01O b2RlIGlzIG5vdCBpbiBhIFVzZXJBZ2VudCBzaGFkb3cgdHJlZS4iKTsKICAgICAgICAgICAgICAg ICByZXNvbHZlKCk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDk5 MWU2ZDcuLjcxNTgzMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNi0wOC0xMCAg Sm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFNob3VsZCBiZSBhYmxlIHRvIEVkaXQgTm9kZSBBdHRyaWJ1dGVzIGFuZCBTdHlsZXMg Zm9yIG5vbi1Vc2VyQWdlbnQgU2hhZG93IERPTSBub2RlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYwNzYyCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8yNzc5ODI3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JET01BZ2VudDo6YXNzZXJ0RWRpdGFibGVOb2RlKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckRPTUFnZW50Ojphc3NlcnRFZGl0YWJsZUVsZW1lbnQpOgorICAgICAgICAq IGluc3BlY3Rvci9QYWdlQ29uc29sZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VD b25zb2xlQWdlbnQ6OmFkZEluc3BlY3RlZE5vZGUpOgorICAgICAgICBBbGxvdyBlZGl0aW5nIHNo YWRvdyBET00gbm9kZXMgYXMgbG9uZyBhcyB0aGV5IGFyZSBub3QgaW4gYSBVc2VyQWdlbnQgc2hh ZG93IHRyZWUuCisKIDIwMTYtMDgtMDkgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBDaGFyYWN0ZXJEYXRhLmRhdGEgc2V0dGVyIG9wdGltaXphdGlvbiBpcyBub3Qg c3BlYy1jb21wbGlhbnQgYW5kIGlzIG9ic2VydmFibGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IDZlOTQ3NTQuLmQ5NGQ4NGIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcApAQCAtMzk1 LDggKzM5NSw4IEBAIE5vZGUqIEluc3BlY3RvckRPTUFnZW50Ojphc3NlcnRFZGl0YWJsZU5vZGUo RXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBpbnQgbm9kZUlkCiAgICAgTm9kZSogbm9kZSA9IGFz c2VydE5vZGUoZXJyb3JTdHJpbmcsIG5vZGVJZCk7CiAgICAgaWYgKCFub2RlKQogICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKLSAgICBpZiAobm9kZS0+aXNJblNoYWRvd1RyZWUoKSkgewotICAgICAg ICBlcnJvclN0cmluZyA9IEFTQ0lJTGl0ZXJhbCgiQ2Fubm90IGVkaXQgbm9kZXMgZnJvbSBzaGFk b3cgdHJlZXMiKTsKKyAgICBpZiAobm9kZS0+aXNJblVzZXJBZ2VudFNoYWRvd1RyZWUoKSkgewor ICAgICAgICBlcnJvclN0cmluZyA9IEFTQ0lJTGl0ZXJhbCgiQ2Fubm90IGVkaXQgbm9kZXMgaW4g dXNlciBhZ2VudCBzaGFkb3cgdHJlZXMiKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAg fQogICAgIGlmIChub2RlLT5pc1BzZXVkb0VsZW1lbnQoKSkgewpAQCAtNDExLDggKzQxMSw4IEBA IEVsZW1lbnQqIEluc3BlY3RvckRPTUFnZW50Ojphc3NlcnRFZGl0YWJsZUVsZW1lbnQoRXJyb3JT dHJpbmcmIGVycm9yU3RyaW5nLCBpbnQKICAgICBFbGVtZW50KiBlbGVtZW50ID0gYXNzZXJ0RWxl bWVudChlcnJvclN0cmluZywgbm9kZUlkKTsKICAgICBpZiAoIWVsZW1lbnQpCiAgICAgICAgIHJl dHVybiBudWxscHRyOwotICAgIGlmIChlbGVtZW50LT5pc0luU2hhZG93VHJlZSgpKSB7Ci0gICAg ICAgIGVycm9yU3RyaW5nID0gQVNDSUlMaXRlcmFsKCJDYW5ub3QgZWRpdCBlbGVtZW50cyBmcm9t IHNoYWRvdyB0cmVlcyIpOworICAgIGlmIChlbGVtZW50LT5pc0luVXNlckFnZW50U2hhZG93VHJl ZSgpKSB7CisgICAgICAgIGVycm9yU3RyaW5nID0gQVNDSUlMaXRlcmFsKCJDYW5ub3QgZWRpdCBl bGVtZW50cyBpbiB1c2VyIGFnZW50IHNoYWRvdyB0cmVlcyIpOwogICAgICAgICByZXR1cm4gbnVs bHB0cjsKICAgICB9CiAgICAgaWYgKGVsZW1lbnQtPmlzUHNldWRvRWxlbWVudCgpKSB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvUGFnZUNvbnNvbGVBZ2VudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvUGFnZUNvbnNvbGVBZ2VudC5jcHAKaW5kZXggN2NiYzNm MS4uY2IxNWM4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1BhZ2VDb25z b2xlQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9QYWdlQ29uc29sZUFn ZW50LmNwcApAQCAtNjgsNyArNjgsNyBAQCBwcml2YXRlOgogdm9pZCBQYWdlQ29uc29sZUFnZW50 OjphZGRJbnNwZWN0ZWROb2RlKEVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgaW50IG5vZGVJZCkK IHsKICAgICBOb2RlKiBub2RlID0gbV9pbnNwZWN0b3JET01BZ2VudC0+bm9kZUZvcklkKG5vZGVJ ZCk7Ci0gICAgaWYgKCFub2RlIHx8IG5vZGUtPmlzSW5TaGFkb3dUcmVlKCkpIHsKKyAgICBpZiAo IW5vZGUgfHwgbm9kZS0+aXNJblVzZXJBZ2VudFNoYWRvd1RyZWUoKSkgewogICAgICAgICBlcnJv clN0cmluZyA9IEFTQ0lJTGl0ZXJhbCgibm9kZUlkIGlzIG5vdCB2YWxpZCIpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXggM2IyZGE3OC4uNmFlZDI5 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTYtMDgtMTAg IEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBTaG91bGQgYmUgYWJsZSB0byBFZGl0IE5vZGUgQXR0cmlidXRlcyBhbmQgU3R5bGVz IGZvciBub24tVXNlckFnZW50IFNoYWRvdyBET00gbm9kZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDc2MgorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMjc3OTgyNzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRPTU5vZGUucHJvdG90eXBlLmlzSW5Vc2VyQWdlbnRTaGFkb3dUcmVlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZS5pc1NoYWRvd1Jvb3QpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlLmlzVXNlckFnZW50U2hhZG93Um9vdCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUuYW5jZXN0b3JTaGFkb3dS b290KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZS5hbmNlc3RvclNo YWRvd0hvc3QpOgorICAgICAgICBBZGQgbWV0aG9kcyBmb3IgZGV0ZXJtaW5pbmcgdGhlIHNoYWRv dyByb290LCBob3N0LCBhbmQgZWFzaWx5CisgICAgICAgIGNoZWNraW5nIHRoZSB0eXBlIG9mIHNo YWRvdyB0cmVlIGEgbm9kZSBpcyBpbi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxz L0NTU1N0eWxlRGVjbGFyYXRpb24uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVE ZWNsYXJhdGlvbi5wcm90b3R5cGUuZ2V0IGVkaXRhYmxlKToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRy ZWVFbGVtZW50LnByb3RvdHlwZS5nZXQgZWRpdGFibGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZS5fc3RhcnRFZGl0aW5nVGFyZ2V0KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUuX3BvcHVsYXRlVGFnQ29udGV4 dE1lbnUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNQ YW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SdWxlc1N0eWxlRGV0YWlsc1BhbmVsLnBy b3RvdHlwZS5uZXdSdWxlQnV0dG9uQ2xpY2tlZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9WaXN1YWxTdHlsZVNlbGVjdG9yU2VjdGlvbi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5WaXN1YWxTdHlsZVNlbGVjdG9yU2VjdGlvbi5wcm90b3R5cGUuX2FkZE5ld1J1bGUpOgorICAg ICAgICBBbGxvdyBlZGl0aW5nIHNoYWRvdyBET00gbm9kZXMgYXMgbG9uZyBhcyB0aGV5IGFyZSBu b3QgaW4gYSBVc2VyQWdlbnQgc2hhZG93IHRyZWUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVP dXRsaW5lLnByb3RvdHlwZS5fcG9wdWxhdGVDb250ZXh0TWVudSk6CisgICAgICAgIERpc2FsbG93 ICJMb2cgRWxlbWVudCIgb24gVXNlckFnZW50IHNoYWRvdyB0cmVlIG5vZGVzLgorCiAyMDE2LTA4 LTA4ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogUG9wb3ZlciBmb3IgQ29sb3IgUGlja2VyIHNob3VsZCB1cGRhdGUgcG9zaXRp b24gd2hlbiB3aW5kb3cgcmVzaXplcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1N0eWxlRGVjbGFyYXRpb24uanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTU3R5bGVEZWNsYXJhdGlvbi5qcwpp bmRleCAzOGU0ZGFjLi4xZDE3MGZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTU3R5bGVEZWNsYXJhdGlvbi5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTU3R5bGVEZWNsYXJhdGlvbi5q cwpAQCAtODUsNyArODUsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbiA9IGNs YXNzIENTU1N0eWxlRGVjbGFyYXRpb24gZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgICAgICAgICAg cmV0dXJuIHRoaXMuX293bmVyUnVsZSAmJiB0aGlzLl9vd25lclJ1bGUuZWRpdGFibGU7CiAKICAg ICAgICAgaWYgKHRoaXMuX3R5cGUgPT09IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9u LlR5cGUuSW5saW5lKQotICAgICAgICAgICAgcmV0dXJuICF0aGlzLl9ub2RlLmlzSW5TaGFkb3dU cmVlKCk7CisgICAgICAgICAgICByZXR1cm4gIXRoaXMuX25vZGUuaXNJblVzZXJBZ2VudFNoYWRv d1RyZWUoKTsKIAogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcwppbmRleCA5 YzM0NjMzLi4xN2ViZTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcwpAQCAtMjU4LDYgKzI1OCwzOCBAQCBXZWJJbnNw ZWN0b3IuRE9NTm9kZSA9IGNsYXNzIERPTU5vZGUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0 CiAgICAgICAgIHJldHVybiB0aGlzLl9pc0luU2hhZG93VHJlZTsKICAgICB9CiAKKyAgICBpc0lu VXNlckFnZW50U2hhZG93VHJlZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5faXNJblNo YWRvd1RyZWUgJiYgdGhpcy5hbmNlc3RvclNoYWRvd1Jvb3QoKS5pc1VzZXJBZ2VudFNoYWRvd1Jv b3QoKTsKKyAgICB9CisKKyAgICBpc1NoYWRvd1Jvb3QoKQorICAgIHsKKyAgICAgICAgcmV0dXJu ICEhdGhpcy5fc2hhZG93Um9vdFR5cGU7CisgICAgfQorCisgICAgaXNVc2VyQWdlbnRTaGFkb3dS b290KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9zaGFkb3dSb290VHlwZSA9PT0gV2Vi SW5zcGVjdG9yLkRPTU5vZGUuU2hhZG93Um9vdFR5cGUuVXNlckFnZW50OworICAgIH0KKworICAg IGFuY2VzdG9yU2hhZG93Um9vdCgpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuX2lzSW5TaGFk b3dUcmVlKQorICAgICAgICAgICAgcmV0dXJuIG51bGw7CisKKyAgICAgICAgbGV0IG5vZGUgPSB0 aGlzOworICAgICAgICB3aGlsZSAobm9kZSAmJiAhbm9kZS5pc1NoYWRvd1Jvb3QoKSkKKyAgICAg ICAgICAgIG5vZGUgPSBub2RlLnBhcmVudE5vZGU7CisgICAgICAgIHJldHVybiBub2RlOworICAg IH0KKworICAgIGFuY2VzdG9yU2hhZG93SG9zdCgpCisgICAgeworICAgICAgICBsZXQgc2hhZG93 Um9vdCA9IHRoaXMuYW5jZXN0b3JTaGFkb3dSb290KCk7CisgICAgICAgIHJldHVybiBzaGFkb3dS b290ID8gc2hhZG93Um9vdC5wYXJlbnROb2RlIDogbnVsbDsKKyAgICB9CisKICAgICBpc1BzZXVk b0VsZW1lbnQoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3BzZXVkb1R5cGUgIT09IHVu ZGVmaW5lZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMKaW5kZXggNTRkMzU1YS4uZjNlN2Y4ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJl ZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRE9NVHJlZUVsZW1lbnQuanMKQEAgLTE3NSw5ICsxNzUsMTEgQEAgV2ViSW5zcGVjdG9yLkRP TVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu VHJlZUVsZW0KIAogICAgIGdldCBlZGl0YWJsZSgpCiAgICAgewotICAgICAgICB2YXIgbm9kZSA9 IHRoaXMucmVwcmVzZW50ZWRPYmplY3Q7Ci0gICAgICAgIGlmIChub2RlLmlzSW5TaGFkb3dUcmVl KCkpCisgICAgICAgIGxldCBub2RlID0gdGhpcy5yZXByZXNlbnRlZE9iamVjdDsKKworICAgICAg ICBpZiAobm9kZS5pc1NoYWRvd1Jvb3QoKSB8fCBub2RlLmlzSW5Vc2VyQWdlbnRTaGFkb3dUcmVl KCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICAgICAgaWYgKG5vZGUuaXNQc2V1 ZG9FbGVtZW50KCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTYxNSw3ICs2MTcs MTAgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQg ZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZUVsZW0KICAgICAgICAgaWYgKHRoaXMudHJlZU91dGxp bmUuc2VsZWN0ZWRET01Ob2RlKCkgIT09IHRoaXMucmVwcmVzZW50ZWRPYmplY3QpCiAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgaWYgKHRoaXMucmVwcmVzZW50ZWRPYmplY3Qu aXNJblNoYWRvd1RyZWUoKSB8fCB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmlzUHNldWRvRWxlbWVu dCgpKQorICAgICAgICBpZiAodGhpcy5yZXByZXNlbnRlZE9iamVjdC5pc1NoYWRvd1Jvb3QoKSB8 fCB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LmlzSW5Vc2VyQWdlbnRTaGFkb3dUcmVlKCkpCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgaWYgKHRoaXMucmVwcmVzZW50ZWRPYmpl Y3QuaXNQc2V1ZG9FbGVtZW50KCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAg ICAgaWYgKHRoaXMucmVwcmVzZW50ZWRPYmplY3Qubm9kZVR5cGUoKSAhPT0gTm9kZS5FTEVNRU5U X05PREUgJiYgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5ub2RlVHlwZSgpICE9PSBOb2RlLlRFWFRf Tk9ERSkKQEAgLTYzOSw3ICs2NDQsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQgPSBj bGFzcyBET01UcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlRWxlbQogICAgIF9w b3B1bGF0ZVRhZ0NvbnRleHRNZW51KGNvbnRleHRNZW51LCBldmVudCkKICAgICB7CiAgICAgICAg IHZhciBub2RlID0gdGhpcy5yZXByZXNlbnRlZE9iamVjdDsKLSAgICAgICAgaWYgKCFub2RlLmlz SW5TaGFkb3dUcmVlKCkpIHsKKyAgICAgICAgaWYgKCFub2RlLmlzSW5Vc2VyQWdlbnRTaGFkb3dU cmVlKCkpIHsKICAgICAgICAgICAgIHZhciBhdHRyaWJ1dGUgPSBldmVudC50YXJnZXQuZW5jbG9z aW5nTm9kZU9yU2VsZldpdGhDbGFzcygiaHRtbC1hdHRyaWJ1dGUiKTsKIAogICAgICAgICAgICAg Ly8gQWRkIGF0dHJpYnV0ZS1yZWxhdGVkIGFjdGlvbnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmpzCmlu ZGV4IDU1OTQ1OWEuLjVkMWMwMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmpzCkBAIC01MjMsNyAr NTIzLDggQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lID0gY2xhc3MgRE9NVHJlZU91dGxp bmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZU91dGwKICAgICAgICAgaWYgKCF0aGlzLl9leGNs dWRlUmV2ZWFsRWxlbWVudENvbnRleHRNZW51KQogICAgICAgICAgICAgY29udGV4dE1lbnUuYXBw ZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJldmVhbCBpbiBET00gVHJlZSIpLCByZXZl YWxFbGVtZW50KTsKIAotICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rv ci5VSVN0cmluZygiTG9nIEVsZW1lbnQiKSwgbG9nRWxlbWVudCk7CisgICAgICAgIGlmICghZG9t Tm9kZS5pc0luVXNlckFnZW50U2hhZG93VHJlZSgpKQorICAgICAgICAgICAgY29udGV4dE1lbnUu YXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvZyBFbGVtZW50IiksIGxvZ0VsZW1l bnQpOwogICAgIH0KIAogICAgIF9zaG93U2hhZG93RE9NU2V0dGluZ0NoYW5nZWQoZXZlbnQpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SdWxl c1N0eWxlRGV0YWlsc1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvUnVsZXNTdHlsZURldGFpbHNQYW5lbC5qcwppbmRleCA3OTk3M2QzLi44M2YzMWM2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9S dWxlc1N0eWxlRGV0YWlsc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1J1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanMKQEAgLTM4MCw3ICszODAs NyBAQCBXZWJJbnNwZWN0b3IuUnVsZXNTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFJ1bGVzU3R5 bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWJJbgogCiAgICAgbmV3UnVsZUJ1dHRvbkNsaWNrZWQo KQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMubm9kZVN0eWxlcy5ub2RlLmlzSW5TaGFkb3dUcmVl KCkpCisgICAgICAgIGlmICh0aGlzLm5vZGVTdHlsZXMubm9kZS5pc0luVXNlckFnZW50U2hhZG93 VHJlZSgpKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGZvciAobGV0IGV4aXN0aW5n UnVsZSBvZiB0aGlzLm5vZGVTdHlsZXMucnVsZXNGb3JTZWxlY3RvcigpKSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVNl bGVjdG9yU2VjdGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9uLmpzCmluZGV4IDFjZWYxZWEuLjc5ZDI3NDEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zp c3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9uLmpzCkBAIC0yNTks NyArMjU5LDcgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlU2VsZWN0b3JTZWN0aW9uID0gY2xh c3MgVmlzdWFsU3R5bGVTZWxlY3RvclNlY3Rpb24gZXh0ZW4KIAogICAgIF9hZGROZXdSdWxlKGV2 ZW50KQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9ub2RlU3R5bGVzIHx8IHRoaXMuX25vZGVT dHlsZXMubm9kZS5pc0luU2hhZG93VHJlZSgpKQorICAgICAgICBpZiAoIXRoaXMuX25vZGVTdHls ZXMgfHwgdGhpcy5fbm9kZVN0eWxlcy5ub2RlLmlzSW5Vc2VyQWdlbnRTaGFkb3dUcmVlKCkpCiAg ICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgbGV0IHNlbGVjdG9yID0gdGhpcy5jdXJyZW50 U3R5bGUoKS5zZWxlY3RvclRleHQ7Cg==