11888 2006-12-20 01:46:36 -0800 REGRESSION (r18320): Web Inspector panes broken 2006-12-21 01:14:46 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 420+ Mac OS X 10.4 RESOLVED FIXED P1 Major --- 1 dev+webkit webkit-unassigned ap aroben ddkilzer mitz mrowe oldest_to_newest 41091 0 dev+webkit 2006-12-20 01:46:36 -0800 The web inspector panes no longer display. Seem to have been broken by http://trac.webkit.org/projects/webkit/changeset/18320 41096 1 ddkilzer 2006-12-20 02:59:26 -0800 Whenever the Inspector is brought up or closed, this error is printed to the console: /absolute/path/to/WebCore/bindings/objc/WebScriptObject.mm:198:[5896] JavaScript exception: SYNTAX_ERR: DOM Exception 12 Whenever "Node", "Style", "Metrics" or "Properties" is clicked, this error is printed to the console: (event handler):SYNTAX_ERR: DOM Exception 12 Using a locally-built debug build of WebKit r18334 with Safari 2.0.4 (419.3) on Mac OS X 10.4.8 (8L127). 41005 2 mrowe 2006-12-20 20:46:59 -0800 This happens because several places in the JavaScript for both Drosera and the Web Inspector code does myElement.style.display = null;, which now throws an exception. A little investigation shows that Firefox doesn't throw an exception on this construct, while IE 7 does. We expect "myElement.style.display = null" to remove the value of the display property, effectively resetting it to its default value. 40989 3 hyatt 2006-12-20 20:54:06 -0800 Seems kind of pointless to throw an exception in this case... sounds like we're setting ourselves up for compatibility problems if we throw and Firefox doesn't, since we'll often share the "standards" code path. 40982 4 11943 mrowe 2006-12-20 21:23:21 -0800 Created attachment 11943 Patch 40940 5 11943 ap 2006-12-20 21:35:42 -0800 Comment on attachment 11943 Patch Could we wait just a bit more before reverting a behavior that's (a) standard-compliant AND (b) matches WinIE? So far, there were no reports of Web compatibility problems (except for www.apple.com/getamac, where we share IE behavior now). To correctly remove a property, one should just set it to empty: "myElement.style.display = ''". I believe this Inspector JS bug needs to be fixed even if we decide to disable exceptions in this case, so r-. 40941 6 11943 aroben 2006-12-20 21:41:01 -0800 Comment on attachment 11943 Patch + Don't throw an exception when setting the value of a SSStyleDeclaration. Typo: _C_SSStyleDeclaration + if (value->isNull() || frame->settings()->shouldUseDashboardBackwardCompatibilityMode()) { It would be great to have a comment here about why we're allowing setting properties to null. r=me 40942 7 11943 mrowe 2006-12-20 22:47:00 -0800 Comment on attachment 11943 Patch I discussed this with Alexey in #webkit, and we decided that it's best to leave the JS bindings as-is unless we come across websites relying on null resetting a property to its initial value. I'll follow up with a patch that changes the inspector and debugger's erroneous use to the correct method of using removeProperty. 40943 8 11944 mrowe 2006-12-21 00:10:24 -0800 Created attachment 11944 Patch - fix Inspector and Drosera to do the right thing 40944 9 hyatt 2006-12-21 00:12:52 -0800 I'm pretty nervous about this, but I guess we can wait and see. In general, the more exceptions you throw, the more likely you are to have really horrible site errors (because of buggy JS that doesn't think any exception is going to happen). 40947 10 mrowe 2006-12-21 00:39:21 -0800 Landed in r18374. 40948 11 ap 2006-12-21 01:14:46 -0800 (In reply to comment #7) > I discussed this with Alexey in #webkit, and we decided that it's best to leave > the JS bindings as-is unless we come across websites relying on null resetting > a property to its initial value. I guess we convinced each other - I now think that it would be the right thing to support setting the value to null :-). What I didn't consider earlier was that Firefox not only doesn't throw - it actually handles setting the value to null the same way as setting it to "". I thought that FF was just hiding the error, as it does for invalid values. However, this should be fixed in setProperty(), not in the JS binding code for assignment. 11943 2006-12-20 21:23:21 -0800 2006-12-21 00:10:24 -0800 Patch webkit-bug-11888-v1.patch text/plain 3205 mrowe SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE4MzcwKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDYtMTItMjAgIE1hcmsgUm93ZSAgPGJkYXNo QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVXBkYXRlZCB0ZXN0IHJlc3VsdHMgZm9yIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExODg4CisgICAgICAgIEJ1ZyAxMTg4ODogUkVHUkVTU0lPTiAocjE4MzIw KTogV2ViIEluc3BlY3RvciBwYW5lcyBicm9rZW4KKworICAgICAgICAqIGZhc3QvZG9tL2Nzcy1z ZXQtcHJvcGVydHktZXhjZXB0aW9uLWV4cGVjdGVkLnR4dDoKKwogMjAwNi0xMi0yMSAgTmlrb2xh cyBaaW1tZXJtYW5uICA8emltbWVybWFubkBrZGUub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0uCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2RvbS9jc3Mtc2V0LXByb3BlcnR5LWV4Y2Vw dGlvbi1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9kb20vY3Nz LXNldC1wcm9wZXJ0eS1leGNlcHRpb24tZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAxODM3MCkKKysr IExheW91dFRlc3RzL2Zhc3QvZG9tL2Nzcy1zZXQtcHJvcGVydHktZXhjZXB0aW9uLWV4cGVjdGVk LnR4dAkod29ya2luZyBjb3B5KQpAQCAtOSw3ICs5LDcgQEAgSXQgaXMgT0sgaWYgdGhlIG9yZGVy IG9mIHByb3BlcnRpZXMgY2hhbgogU3VjY2Vzc2Z1bGx5IHNldCBkaXNwbGF5IHRvICJibG9jayI7 IGNzc1RleHQgaXMgbm93OiAidG9wOiAwcHg7IGJvdHRvbTogMXB4OyBkaXNwbGF5OiBibG9jazsg Ii4KIEdvdCBleGNlcHRpb24gdHJ5aW5nIHRvIHNldCBkaXNwbGF5IHRvICJmb29iYXIiOyBjc3NU ZXh0IGlzIG5vdzogInRvcDogMHB4OyBkaXNwbGF5OiBub25lOyBib3R0b206IDFweDsgIi4KIFN1 Y2Nlc3NmdWxseSBzZXQgZGlzcGxheSB0byAiIjsgY3NzVGV4dCBpcyBub3c6ICJ0b3A6IDBweDsg Ym90dG9tOiAxcHg7ICIuCi1Hb3QgZXhjZXB0aW9uIHRyeWluZyB0byBzZXQgZGlzcGxheSB0byBu dWxsOyBjc3NUZXh0IGlzIG5vdzogInRvcDogMHB4OyBkaXNwbGF5OiBub25lOyBib3R0b206IDFw eDsgIi4KK1N1Y2Nlc3NmdWxseSBzZXQgZGlzcGxheSB0byBudWxsOyBjc3NUZXh0IGlzIG5vdzog InRvcDogMHB4OyBib3R0b206IDFweDsgIi4KIFN1Y2Nlc3NmdWxseSBzZXQgZGlzcGxheSB0byAi YmxvY2siIHdpdGggc2V0UHJvcGVydHk7IGNzc1RleHQgaXMgbm93OiAidG9wOiAwcHg7IGJvdHRv bTogMXB4OyBkaXNwbGF5OiBibG9jazsgIi4KIEdvdCBleGNlcHRpb24gdHJ5aW5nIHRvIHNldCBk aXNwbGF5IHRvICJmb29iYXIiIHdpdGggc2V0UHJvcGVydHk7IGNzc1RleHQgaXMgbm93OiAidG9w OiAwcHg7IGRpc3BsYXk6IG5vbmU7IGJvdHRvbTogMXB4OyAiLgogU3VjY2Vzc2Z1bGx5IHNldCBk aXNwbGF5IHRvICIiIHdpdGggc2V0UHJvcGVydHk7IGNzc1RleHQgaXMgbm93OiAidG9wOiAwcHg7 IGJvdHRvbTogMXB4OyAiLgpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MzcwKQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAwNi0xMi0yMCAgTWFyayBSb3dlICA8 YmRhc2hAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBGaXggZm9yIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExODg4CisgICAgICAgIEJ1ZyAxMTg4ODogUkVHUkVTU0lPTiAocjE4MzIwKTogV2ViIEluc3Bl Y3RvciBwYW5lcyBicm9rZW4KKworICAgICAgICBEb24ndCB0aHJvdyBhbiBleGNlcHRpb24gd2hl biBzZXR0aW5nIHRoZSB2YWx1ZSBvZiBhIFNTU3R5bGVEZWNsYXJhdGlvbi4KKworICAgICAgICAq IGJpbmRpbmdzL2pzL2tqc19jc3MuY3BwOgorICAgICAgICAoS0pTOjpET01DU1NTdHlsZURlY2xh cmF0aW9uOjpwdXQpOiBJZiB0aGUgbmV3IHZhbHVlIGlzIG51bGwsIHRha2UgdGhlIGNvZGUgcGF0 aCB0aGF0IGRvZXNuJ3QgdGhyb3cgYW4gZXhjZXB0aW9uLgorCiAyMDA2LTEyLTIxICBOaWtvbGFz IFppbW1lcm1hbm4gIDx6aW1tZXJtYW5uQGtkZS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg T2xpdmVyLgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9qcy9ranNfY3NzLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL2pzL2tqc19jc3MuY3BwCShyZXZpc2lvbiAxODM3MCkKKysr IFdlYkNvcmUvYmluZGluZ3MvanMva2pzX2Nzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyMSw3 ICsyMjEsNyBAQCB2b2lkIERPTUNTU1N0eWxlRGVjbGFyYXRpb246OnB1dChFeGVjU3RhCiAjZW5k aWYKICAgICAgIEFTU0VSVChzdHlsZURlY2wuc3R5bGVzaGVldCgpLT5pc0NTU1N0eWxlU2hlZXQo KSk7CiAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gc3RhdGljX2Nhc3Q8Q1NTU3R5bGVTaGVldCo+ KHN0eWxlRGVjbC5zdHlsZXNoZWV0KCkpLT5kb2MoKS0+ZnJhbWUoKSkKLSAgICAgICAgaWYgKGZy YW1lLT5zZXR0aW5ncygpLT5zaG91bGRVc2VEYXNoYm9hcmRCYWNrd2FyZENvbXBhdGliaWxpdHlN b2RlKCkpIHsKKyAgICAgICAgaWYgKHZhbHVlLT5pc051bGwoKSB8fCBmcmFtZS0+c2V0dGluZ3Mo KS0+c2hvdWxkVXNlRGFzaGJvYXJkQmFja3dhcmRDb21wYXRpYmlsaXR5TW9kZSgpKSB7CiAgICAg ICAgICAgc3R5bGVEZWNsLnJlbW92ZVByb3BlcnR5KHByb3AsIGV4Y2VwdGlvbik7CiAgICAgICAg ICAgaWYgKCFleGNlcHRpb24pIHsKICAgICAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZXhjZXB0aW9u SWdub3JlZCA9IDA7Cg== 11944 2006-12-21 00:10:24 -0800 2006-12-21 00:15:04 -0800 Patch - fix Inspector and Drosera to do the right thing webkit-bug-11888-v2.patch text/plain 9440 mrowe SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L0NoYW5nZUxvZwko cmV2aXNpb24gMTgzNzIpCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTMgQEAKKzIwMDYtMTItMjEgIE1hcmsgUm93ZSAgPGJkYXNoQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cDovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4ODgKKyAgICAgICAgQnVnIDExODg4OiBS RUdSRVNTSU9OIChyMTgzMjApOiBXZWIgSW5zcGVjdG9yIHBhbmVzIGJyb2tlbgorCisgICAgICAg ICogV2ViSW5zcGVjdG9yL3dlYkluc3BlY3Rvci9pbnNwZWN0b3IuanM6IFVzZSByZW1vdmVQcm9w ZXJ0eSB0byByZXNldCBhIHN0eWxlIHByb3BlcnR5IHRvIGl0cworICAgICAgICBpbml0aWFsIHZh bHVlLiAgQmFpbCBvdXQgZWFybHkgZnJvbSB1cGRhdGVOb2RlUGFuZSBpZiBJbnNwZWN0b3IgaGFz IG5vdCB5ZXQgYmVlbiBzZXQuCisKIDIwMDYtMTItMTkgIEpvaG4gU3VsbGl2YW4gIDxzdWxsaXZh bkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4KSW5kZXg6IFdlYktpdC9X ZWJJbnNwZWN0b3Ivd2ViSW5zcGVjdG9yL2luc3BlY3Rvci5qcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQvV2ViSW5zcGVjdG9yL3dlYkluc3BlY3Rvci9pbnNwZWN0b3IuanMJKHJldmlzaW9uIDE4Mzcw KQorKysgV2ViS2l0L1dlYkluc3BlY3Rvci93ZWJJbnNwZWN0b3IvaW5zcGVjdG9yLmpzCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNTksNyArMjU5LDcgQEAgZnVuY3Rpb24gbG9hZGVkKCkKICAgICB9CiAg ICAgQXBwbGVTY3JvbGxiYXIucHJvdG90eXBlLnNob3cgPSBmdW5jdGlvbigpIHsKICAgICAgICAg dGhpcy5fdHJhY2suc3R5bGUuZGlzcGxheSA9ICJibG9jayI7Ci0gICAgICAgIHRoaXMuc2Nyb2xs YmFyLnN0eWxlLmRpc3BsYXkgPSBudWxsOworICAgICAgICB0aGlzLnNjcm9sbGJhci5zdHlsZS5y ZW1vdmVQcm9wZXJ0eSgiZGlzcGxheSIpOwogICAgICAgICBpZiAodGhpcy5oaWRkZW4pIHsKICAg ICAgICAgICAgIHRoaXMuaGlkZGVuID0gZmFsc2U7CiAgICAgICAgICAgICB0aGlzLnJlZnJlc2go KTsKQEAgLTI5NSw5ICsyOTUsOSBAQCBmdW5jdGlvbiBwZXJmb3JtU2VhcmNoKHF1ZXJ5KQogICAg ICAgICBzZWFyY2hGaWVsZC5zdHlsZS53aWR0aCA9ICIxNTBweCI7CiAgICAgICAgIHNlYXJjaEFj dGl2ZSA9IHRydWU7CiAgICAgfSBlbHNlIGlmICghcXVlcnkubGVuZ3RoICYmIHNlYXJjaEFjdGl2 ZSkgewotICAgICAgICB0cmVlUG9wdXAuc3R5bGUuZGlzcGxheSA9IG51bGw7Ci0gICAgICAgIHNl YXJjaENvdW50LnN0eWxlLmRpc3BsYXkgPSBudWxsOwotICAgICAgICBzZWFyY2hGaWVsZC5zdHls ZS53aWR0aCA9IG51bGw7CisgICAgICAgIHRyZWVQb3B1cC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgi ZGlzcGxheSIpOworICAgICAgICBzZWFyY2hDb3VudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgiZGlz cGxheSIpOworICAgICAgICBzZWFyY2hGaWVsZC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgid2lkdGgi KTsKICAgICAgICAgc2VhcmNoQWN0aXZlID0gZmFsc2U7CiAgICAgfQogCkBAIC0zMjcsNyArMzI3 LDcgQEAgZnVuY3Rpb24gdG9nZ2xlTm9TZWxlY3Rpb24oc3RhdGUpCiAgICAgaWYgKG5vU2VsZWN0 aW9uKSB7CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGFiTmFtZXMubGVuZ3RoOyBpKysp CiAgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCh0YWJOYW1lc1tpXSArICJQYW5l Iikuc3R5bGUuZGlzcGxheSA9ICJub25lIjsKLSAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoIm5vU2VsZWN0aW9uIikuc3R5bGUuZGlzcGxheSA9IG51bGw7CisgICAgICAgIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJub1NlbGVjdGlvbiIpLnN0eWxlLnJlbW92ZVByb3BlcnR5KCJkaXNw bGF5Iik7CiAgICAgfSBlbHNlIHsKICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm5v U2VsZWN0aW9uIikuc3R5bGUuZGlzcGxheSA9ICJub25lIjsKICAgICAgICAgc3dpdGNoUGFuZShj dXJyZW50UGFuZSk7CkBAIC0zNDQsNyArMzQ0LDcgQEAgZnVuY3Rpb24gc3dpdGNoUGFuZShwYW5l KQogICAgICAgICAgICAgYnV0dG9uLm9yaWdpbmFsQ2xhc3NOYW1lID0gYnV0dG9uLmNsYXNzTmFt ZTsKICAgICAgICAgaWYgKHBhbmUgPT0gdGFiTmFtZXNbaV0pIHsKICAgICAgICAgICAgIGlmICgh bm9TZWxlY3Rpb24pCi0gICAgICAgICAgICAgICAgcGFuZUVsZW1lbnQuc3R5bGUuZGlzcGxheSA9 IG51bGw7CisgICAgICAgICAgICAgICAgcGFuZUVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHko ImRpc3BsYXkiKTsKICAgICAgICAgICAgIGJ1dHRvbi5jbGFzc05hbWUgPSBidXR0b24ub3JpZ2lu YWxDbGFzc05hbWUgKyAiIHNlbGVjdGVkIjsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg IHBhbmVFbGVtZW50LnN0eWxlLmRpc3BsYXkgPSAibm9uZSI7CkBAIC00MzksMTcgKzQzOSwxOSBA QCBmdW5jdGlvbiB1cGRhdGVFbGVtZW50QXR0cmlidXRlcygpCiAKIGZ1bmN0aW9uIHVwZGF0ZU5v ZGVQYW5lKCkKIHsKKyAgICBpZiAoIUluc3BlY3RvcikKKyAgICAgICAgcmV0dXJuOwogICAgIHZh ciBmb2N1c2VkTm9kZSA9IEluc3BlY3Rvci5mb2N1c2VkRE9NTm9kZSgpOwogCiAgICAgaWYgKGZv Y3VzZWROb2RlLm5vZGVUeXBlID09IE5vZGUuVEVYVF9OT0RFIHx8IGZvY3VzZWROb2RlLm5vZGVU eXBlID09IE5vZGUuQ09NTUVOVF9OT0RFKSB7CiAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJub2RlTmFtZXNwYWNlUm93Iikuc3R5bGUuZGlzcGxheSA9ICJub25lIjsKICAgICAgICAg ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImVsZW1lbnRBdHRyaWJ1dGVzIikuc3R5bGUuZGlzcGxh eSA9ICJub25lIjsKLSAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm5vZGVDb250ZW50 cyIpLnN0eWxlLmRpc3BsYXkgPSBudWxsOworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgibm9kZUNvbnRlbnRzIikuc3R5bGUucmVtb3ZlUHJvcGVydHkoImRpc3BsYXkiKTsKIAogICAg ICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibm9kZUNvbnRlbnRzU2Nyb2xsdmlldyIpLnRl eHRDb250ZW50ID0gZm9jdXNlZE5vZGUubm9kZVZhbHVlOwogICAgICAgICBub2RlQ29udGVudHNT Y3JvbGxBcmVhLnJlZnJlc2goKTsKICAgICB9IGVsc2UgaWYgKGZvY3VzZWROb2RlLm5vZGVUeXBl ID09IE5vZGUuRUxFTUVOVF9OT0RFKSB7Ci0gICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJlbGVtZW50QXR0cmlidXRlcyIpLnN0eWxlLmRpc3BsYXkgPSBudWxsOworICAgICAgICBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiZWxlbWVudEF0dHJpYnV0ZXMiKS5zdHlsZS5yZW1vdmVQcm9w ZXJ0eSgiZGlzcGxheSIpOwogICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibm9kZUNv bnRlbnRzIikuc3R5bGUuZGlzcGxheSA9ICJub25lIjsKIAogICAgICAgICB1cGRhdGVFbGVtZW50 QXR0cmlidXRlcygpOwpAQCAtNDU3LDcgKzQ1OSw3IEBAIGZ1bmN0aW9uIHVwZGF0ZU5vZGVQYW5l KCkKICAgICAgICAgaWYgKGZvY3VzZWROb2RlLm5hbWVzcGFjZVVSSS5sZW5ndGggPiAwKSB7CiAg ICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibm9kZU5hbWVzcGFjZSIpLnRleHRD b250ZW50ID0gZm9jdXNlZE5vZGUubmFtZXNwYWNlVVJJOwogICAgICAgICAgICAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoIm5vZGVOYW1lc3BhY2UiKS50aXRsZSA9IGZvY3VzZWROb2RlLm5hbWVz cGFjZVVSSTsKLSAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJub2RlTmFtZXNw YWNlUm93Iikuc3R5bGUuZGlzcGxheSA9IG51bGw7CisgICAgICAgICAgICBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgibm9kZU5hbWVzcGFjZVJvdyIpLnN0eWxlLnJlbW92ZVByb3BlcnR5KCJkaXNw bGF5Iik7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgibm9kZU5hbWVzcGFjZVJvdyIpLnN0eWxlLmRpc3BsYXkgPSAibm9uZSI7CiAgICAgICAg IH0KQEAgLTQ5Miw4ICs0OTQsOCBAQCBmdW5jdGlvbiB1cGRhdGVTdHlsZVBhbmUoKQogICAgIHN0 eWxlUHJvcGVydGllcyA9IFtdOwogCiAgICAgaWYgKGZvY3VzZWROb2RlLm5vZGVUeXBlID09IE5v ZGUuRUxFTUVOVF9OT0RFKSB7Ci0gICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzdHls ZVJ1bGVzIikuc3R5bGUuZGlzcGxheSA9IG51bGw7Ci0gICAgICAgIGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJzdHlsZVByb3BlcnRpZXMiKS5zdHlsZS5kaXNwbGF5ID0gbnVsbDsKKyAgICAgICAg ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInN0eWxlUnVsZXMiKS5zdHlsZS5yZW1vdmVQcm9wZXJ0 eSgiZGlzcGxheSIpOworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3R5bGVQcm9w ZXJ0aWVzIikuc3R5bGUucmVtb3ZlUHJvcGVydHkoImRpc3BsYXkiKTsKICAgICAgICAgZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoIm5vU3R5bGUiKS5zdHlsZS5kaXNwbGF5ID0gIm5vbmUiOwogCiAg ICAgICAgIHZhciBwcm9wZXJ0eUNvdW50ID0gW107CkBAIC02NzAsNyArNjcyLDcgQEAgZnVuY3Rp b24gdXBkYXRlU3R5bGVQYW5lKCkKICAgICAgICAgbm9TdHlsZS50ZXh0Q29udGVudCA9ICJDYW4n dCBzdHlsZSAiICsgbm9kZVR5cGVOYW1lKGZvY3VzZWROb2RlKSArICIgbm9kZXMuIjsKICAgICAg ICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInN0eWxlUnVsZXMiKS5zdHlsZS5kaXNwbGF5ID0g Im5vbmUiOwogICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3R5bGVQcm9wZXJ0aWVz Iikuc3R5bGUuZGlzcGxheSA9ICJub25lIjsKLSAgICAgICAgbm9TdHlsZS5zdHlsZS5kaXNwbGF5 ID0gbnVsbDsKKyAgICAgICAgbm9TdHlsZS5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgiZGlzcGxheSIp OwogICAgIH0KIAogICAgIHN0eWxlUnVsZXNTY3JvbGxBcmVhLnJlZnJlc2goKTsKQEAgLTc5Nyw3 ICs3OTksNyBAQCBmdW5jdGlvbiB0b2dnbGVTdHlsZVNob3J0aGFuZChldmVudCkKICAgICAgICAg ZXhwYW5kZWRTdHlsZVNob3J0aGFuZHNbbGkuc2hvcnRoYW5kXSA9IGZhbHNlOwogICAgIH0gZWxz ZSB7CiAgICAgICAgIGxpLmNsYXNzTmFtZSArPSAiIGV4cGFuZGVkIjsKLSAgICAgICAgbGkubmV4 dFNpYmxpbmcuc3R5bGUuZGlzcGxheSA9IG51bGw7CisgICAgICAgIGxpLm5leHRTaWJsaW5nLnN0 eWxlLnJlbW92ZVByb3BlcnR5KCJkaXNwbGF5Iik7CiAgICAgICAgIGV4cGFuZGVkU3R5bGVTaG9y dGhhbmRzW2xpLnNob3J0aGFuZF0gPSB0cnVlOwogICAgIH0KIApAQCAtODYzLDEzICs4NjUsMTMg QEAgZnVuY3Rpb24gdXBkYXRlTWV0cmljc1BhbmUoKQogICAgIGlmIChmb2N1c2VkTm9kZS5ub2Rl VHlwZSA9PSBOb2RlLkVMRU1FTlRfTk9ERSkKICAgICAgICAgc3R5bGUgPSBmb2N1c2VkTm9kZS5v d25lckRvY3VtZW50LmRlZmF1bHRWaWV3LmdldENvbXB1dGVkU3R5bGUoZm9jdXNlZE5vZGUpOwog ICAgIGlmICghc3R5bGUgfHwgc3R5bGUubGVuZ3RoID09IDApIHsKLSAgICAgICAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoIm5vTWV0cmljcyIpLnN0eWxlLmRpc3BsYXkgPSBudWxsOworICAgICAg ICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibm9NZXRyaWNzIikuc3R5bGUucmVtb3ZlUHJvcGVy dHkoImRpc3BsYXkiKTsKICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm1hcmdpbkJv eFRhYmxlIikuc3R5bGUuZGlzcGxheSA9ICJub25lIjsKICAgICAgICAgcmV0dXJuOwogICAgIH0K IAogICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJub01ldHJpY3MiKS5zdHlsZS5kaXNwbGF5 ID0gIm5vbmUiOwotICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJtYXJnaW5Cb3hUYWJsZSIp LnN0eWxlLmRpc3BsYXkgPSBudWxsOworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJtYXJn aW5Cb3hUYWJsZSIpLnN0eWxlLnJlbW92ZVByb3BlcnR5KCJkaXNwbGF5Iik7CiAKICAgICBzZXRC b3hNZXRyaWNzKHN0eWxlLCAibWFyZ2luIiwgIiIpOwogICAgIHNldEJveE1ldHJpY3Moc3R5bGUs ICJib3JkZXIiLCAiLXdpZHRoIik7CkluZGV4OiBXZWJLaXRUb29scy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxODM3MikKKysrIFdlYktp dFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDA2LTEy LTIxICBNYXJrIFJvd2UgIDxiZGFzaEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExODg4CisgICAgICAgIEJ1ZyAxMTg4ODogUkVHUkVTU0lPTiAocjE4MzIwKTog V2ViIEluc3BlY3RvciBwYW5lcyBicm9rZW4KKworICAgICAgICAqIERyb3NlcmEvZGVidWdnZXIu anM6IFVzZSByZW1vdmVQcm9wZXJ0eSB0byByZXNldCBhIHN0eWxlIHByb3BlcnR5IHRvIGl0cyBp bml0aWFsIHZhbHVlLgorCiAyMDA2LTEyLTE4ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQmV0aCBEYWtpbi4KSW5kZXg6IFdlYktpdFRv b2xzL0Ryb3NlcmEvZGVidWdnZXIuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHJvc2Vy YS9kZWJ1Z2dlci5qcwkocmV2aXNpb24gMTgzNzApCisrKyBXZWJLaXRUb29scy9Ecm9zZXJhL2Rl YnVnZ2VyLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xNTgsNyArMTU4LDcgQEAgZnVuY3Rpb24gZGl2 aWRlckRyYWdFbmQoZWxlbWVudCwgZGl2aWRlcgogICAgIGVsZW1lbnQuZHJhZ2dpbmcgPSBmYWxz ZTsKICAgICBkb2N1bWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJtb3VzZW1vdmUiLCBkaXZpZGVy RHJhZywgdHJ1ZSk7CiAgICAgZG9jdW1lbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcigibW91c2V1cCIs IGRpdmlkZXJEcmFnRW5kLCB0cnVlKTsKLSAgICBkb2N1bWVudC5ib2R5LnN0eWxlLmN1cnNvciA9 IG51bGw7CisgICAgZG9jdW1lbnQuYm9keS5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgiY3Vyc29yIik7 CiB9CiAKIGZ1bmN0aW9uIGRpdmlkZXJEcmFnKGV2ZW50KSAKQEAgLTU0MCw3ICs1NDAsNyBAQCBm dW5jdGlvbiBicmVha3BvaW50RHJhZyhldmVudCkKICAgICBpZiAoIWRyYWdnaW5nQnJlYWtwb2lu dCkgewogICAgICAgICBzb3VyY2VzRG9jdW1lbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcigibW91c2Vt b3ZlIiwgYnJlYWtwb2ludERyYWcsIHRydWUpOwogICAgICAgICBzb3VyY2VzRG9jdW1lbnQucmVt b3ZlRXZlbnRMaXN0ZW5lcigibW91c2V1cCIsIGJyZWFrcG9pbnREcmFnRW5kLCB0cnVlKTsKLSAg ICAgICAgc291cmNlc0RvY3VtZW50LmJvZHkuc3R5bGUuY3Vyc29yID0gbnVsbDsKKyAgICAgICAg c291cmNlc0RvY3VtZW50LmJvZHkuc3R5bGUucmVtb3ZlUHJvcGVydHkoImN1cnNvciIpOwogICAg ICAgICByZXR1cm47CiAgICAgfQogCkBAIC01ODEsNyArNTgxLDcgQEAgZnVuY3Rpb24gYnJlYWtw b2ludERyYWcoZXZlbnQpCiAgICAgICAgICAgICBpZiAoIWRyYWdJbWFnZSkgewogICAgICAgICAg ICAgICAgIHNvdXJjZXNEb2N1bWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJtb3VzZW1vdmUiLCBi cmVha3BvaW50RHJhZywgdHJ1ZSk7CiAgICAgICAgICAgICAgICAgc291cmNlc0RvY3VtZW50LnJl bW92ZUV2ZW50TGlzdGVuZXIoIm1vdXNldXAiLCBicmVha3BvaW50RHJhZ0VuZCwgdHJ1ZSk7Ci0g ICAgICAgICAgICAgICAgc291cmNlc0RvY3VtZW50LmJvZHkuc3R5bGUuY3Vyc29yID0gbnVsbDsK KyAgICAgICAgICAgICAgICBzb3VyY2VzRG9jdW1lbnQuYm9keS5zdHlsZS5yZW1vdmVQcm9wZXJ0 eSgiY3Vyc29yIik7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCkBA IC01OTAsNyArNTkwLDcgQEAgZnVuY3Rpb24gYnJlYWtwb2ludERyYWcoZXZlbnQpCiAgICAgICAg ICAgICBpZiAoeCA+IDQwKQogICAgICAgICAgICAgICAgIGRyYWdJbWFnZS5zdHlsZS52aXNpYmls aXR5ID0gImhpZGRlbiI7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgZHJhZ0lt YWdlLnN0eWxlLnZpc2liaWxpdHkgPSBudWxsOworICAgICAgICAgICAgICAgIGRyYWdJbWFnZS5z dHlsZS5yZW1vdmVQcm9wZXJ0eSgidmlzaWJpbGl0eSIpOwogICAgICAgICB9CiAKICAgICAgICAg ZHJhZ2dpbmdCcmVha3BvaW50LmRyYWdMYXN0WCA9IHg7CkBAIC02MDMsNyArNjAzLDcgQEAgZnVu Y3Rpb24gYnJlYWtwb2ludERyYWdFbmQoZXZlbnQpCiAgICAgdmFyIHNvdXJjZXNEb2N1bWVudCA9 IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzb3VyY2VzIikuY29udGVudERvY3VtZW50OwogICAg IHNvdXJjZXNEb2N1bWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJtb3VzZW1vdmUiLCBicmVha3Bv aW50RHJhZywgdHJ1ZSk7CiAgICAgc291cmNlc0RvY3VtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIo Im1vdXNldXAiLCBicmVha3BvaW50RHJhZ0VuZCwgdHJ1ZSk7Ci0gICAgc291cmNlc0RvY3VtZW50 LmJvZHkuc3R5bGUuY3Vyc29yID0gbnVsbDsKKyAgICBzb3VyY2VzRG9jdW1lbnQuYm9keS5zdHls ZS5yZW1vdmVQcm9wZXJ0eSgiY3Vyc29yIik7CiAKICAgICB2YXIgZHJhZ0ltYWdlID0gc291cmNl c0RvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJicmVha3BvaW50RHJhZyIpOwogICAgIGlmICghZHJh Z0ltYWdlKQpAQCAtMTAxMiw3ICsxMDEyLDcgQEAgZnVuY3Rpb24gbG9hZEZpbGUoZmlsZUluZGV4 LCBtYW5hZ2VOYXZMaQogICAgICAgICBmaWxlLmxvYWRlZCA9IHRydWU7CiAgICAgfQogCi0gICAg ZmlsZS5lbGVtZW50LnN0eWxlLmRpc3BsYXkgPSBudWxsOworICAgIGZpbGUuZWxlbWVudC5zdHls ZS5yZW1vdmVQcm9wZXJ0eSgiZGlzcGxheSIpOwogCiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoImZpbGVzUG9wdXBCdXR0b25Db250ZW50IikuaW5uZXJUZXh0ID0gKGZpbGUudXJsID8gZmls ZS51cmwgOiAiKHVua25vd24gc2NyaXB0KSIpOwogICAgIAo=