36884 2010-03-31 07:30:06 -0700 Web Inspector: [REGRESSION] Can't creating new style with class foo if foo::after is defined. 2010-03-31 09:24:14 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck rik timothy oldest_to_newest 206485 0 pfeldman 2010-03-31 07:30:06 -0700 Several things including usability changes and regression fixes: - InspectorDOMAgent should clear internal state upon reset (we are re-using single dom agent instance throughout entire inspector controller lifetime) - Brought back blank style 'refresh' processing logic - remove it by mistake earlier - Blocked couple of click handlers so that double-click to edit was not expanding / collapsing the pane - There is no need to reach out for matched rules upon 'refresh' update - getting computed style is sufficient 206489 1 52161 pfeldman 2010-03-31 07:36:21 -0700 Created attachment 52161 [PATCH] Proposed fix. One more thing: style selector had wrong code for pseudo elements (for a long time already). It was doing return instead of continue, as a result, styles declared with pseudo modifiers were preventing subsequent styles with same classes from being returned. 206545 2 pfeldman 2010-03-31 09:24:14 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/css/CSSStyleSelector.cpp M WebCore/inspector/InspectorDOMAgent.cpp M WebCore/inspector/front-end/StylesSidebarPane.js Committed r56846 52161 2010-03-31 07:36:21 -0700 2010-03-31 09:06:34 -0700 [PATCH] Proposed fix. new_style_fix text/plain 10905 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Njk1NzVlOS4uYzUzNGMwMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMC0wMy0zMSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBjcmVhdGluZyBuZXcgc3R5bGUgYnVn Zml4aW5nLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zNjg4NAorCisgICAgICAgIC0gSW5zcGVjdG9yRE9NQWdlbnQgc2hvdWxkIGNsZWFyIGludGVy bmFsIHN0YXRlIHVwb24gcmVzZXQgKHdlIGFyZSByZS11c2luZworICAgICAgICAgIHNpbmdsZSBk b20gYWdlbnQgaW5zdGFuY2UgdGhyb3VnaG91dCBlbnRpcmUgaW5zcGVjdG9yIGNvbnRyb2xsZXIg bGlmZXRpbWUpIAorICAgICAgICAtIEJyb3VnaHQgYmFjayBibGFuayBzdHlsZSAncmVmcmVzaCcg cHJvY2Vzc2luZyBsb2dpYyAtIHJlbW92ZSBpdCBieSBtaXN0YWtlIGVhcmxpZXIKKyAgICAgICAg LSBCbG9ja2VkIGNvdXBsZSBvZiBjbGljayBoYW5kbGVycyBzbyB0aGF0IGRvdWJsZS1jbGljayB0 byBlZGl0IHdhcyBub3QKKyAgICAgICAgICBleHBhbmRpbmcgLyBjb2xsYXBzaW5nIHRoZSBwYW5l CisgICAgICAgIC0gVGhlcmUgaXMgbm8gbmVlZCB0byByZWFjaCBvdXQgZm9yIG1hdGNoZWQgcnVs ZXMgdXBvbiAncmVmcmVzaCcgdXBkYXRlIC0KKyAgICAgICAgICBnZXR0aW5nIGNvbXB1dGVkIHN0 eWxlIGlzIHN1ZmZpY2llbnQuCisKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjptYXRjaFJ1bGVzRm9yTGlzdCk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpkaXNjYXJkQmluZGluZ3MpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBlLnVwZGF0ZS5nZXRTdHlsZXNDYWxsYmFj ayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBlLnVw ZGF0ZS5nZXRDb21wdXRlZFN0eWxlQ2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0 eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZS51cGRhdGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlN0eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZS5fcmVmcmVzaFVwZGF0ZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBlLl9yZWJ1aWxkVXBkYXRlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUuX3JlZnJl c2hTdHlsZVJ1bGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5w cm90b3R5cGUuYWRkQmxhbmtTZWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVBy b3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5fZGJsY2xpY2tFbXB0eVNwYWNlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS5fY2xpY2tTZWxl Y3Rvcik6CisKIDIwMTAtMDMtMzAgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTmF0ZSBDaGFwaW4uCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcCBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3Iu Y3BwCmluZGV4IGYzNmIyNjUuLjFlZDRlZGEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvY3NzL0NTU1N0 eWxlU2VsZWN0b3IuY3BwCisrKyBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBA IC03MTAsNyArNzEwLDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjptYXRjaFJ1bGVzRm9yTGlz dChDU1NSdWxlRGF0YUxpc3QqIHJ1bGVzLCBpbnQmIGZpcnN0UnVsZUkKICAgICAgICAgICAgIC8v IHdlIHJlYWxseSBqdXN0IG1hdGNoZWQgYSBwc2V1ZG8tZWxlbWVudC4KICAgICAgICAgICAgIGlm IChtX2R5bmFtaWNQc2V1ZG8gIT0gTk9QU0VVRE8gJiYgbV9jaGVja2VyLm1fcHNldWRvU3R5bGUg PT0gTk9QU0VVRE8pIHsKICAgICAgICAgICAgICAgICBpZiAobV9jaGVja2VyLm1fY29sbGVjdFJ1 bGVzT25seSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgICAgICAgICBpZiAobV9keW5hbWljUHNldWRvIDwgRklSU1Rf SU5URVJOQUxfUFNFVURPSUQpCiAgICAgICAgICAgICAgICAgICAgIG1fc3R5bGUtPnNldEhhc1Bz ZXVkb1N0eWxlKG1fZHluYW1pY1BzZXVkbyk7CiAgICAgICAgICAgICB9IGVsc2UgewpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IDNlMDA1NDAuLmQ4MzI4NmEgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKQEAgLTIzNiw2ICsyMzYsMTIg QEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6ZGlzY2FyZEJpbmRpbmdzKCkKICAgICBtX2lkVG9O b2RlLmNsZWFyKCk7CiAgICAgcmVsZWFzZURhbmdsaW5nTm9kZXMoKTsKICAgICBtX2NoaWxkcmVu UmVxdWVzdGVkLmNsZWFyKCk7CisgICAgbV9zdHlsZVRvSWQuY2xlYXIoKTsKKyAgICBtX2lkVG9T dHlsZS5jbGVhcigpOworICAgIG1fcnVsZVRvSWQuY2xlYXIoKTsKKyAgICBtX2lkVG9SdWxlLmNs ZWFyKCk7CisgICAgbV9pZFRvRGlzYWJsZWRTdHlsZS5jbGVhcigpOworICAgIG1faW5zcGVjdG9y U3R5bGVTaGVldCA9IDA7CiB9CiAKIE5vZGUqIEluc3BlY3RvckRPTUFnZW50Ojpub2RlRm9ySWQo bG9uZyBpZCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNT aWRlYmFyUGFuZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFy UGFuZS5qcwppbmRleCA5Yzc1OTJjLi4yZDRmNDhhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCkBAIC0xMzMsNjMgKzEzMyw3MyBAQCBX ZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgdmFyIHNlbGYgPSB0aGlzOwotICAgICAgICBm dW5jdGlvbiBjYWxsYmFjayhzdHlsZXMpCisgICAgICAgIGZ1bmN0aW9uIGdldFN0eWxlc0NhbGxi YWNrKHN0eWxlcykKICAgICAgICAgewotICAgICAgICAgICAgaWYgKCFzdHlsZXMpCi0gICAgICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgc2VsZi5fdXBkYXRlKHJlZnJlc2gsIG5vZGUs IHN0eWxlcywgZWRpdGVkU2VjdGlvbik7CisgICAgICAgICAgICBpZiAoc3R5bGVzKQorICAgICAg ICAgICAgICAgIHRoaXMuX3JlYnVpbGRVcGRhdGUobm9kZSwgc3R5bGVzKTsKICAgICAgICAgfQog Ci0gICAgICAgIEluc3BlY3RvckJhY2tlbmQuZ2V0U3R5bGVzKFdlYkluc3BlY3Rvci5DYWxsYmFj ay53cmFwKGNhbGxiYWNrKSwgbm9kZS5pZCwgIVdlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93VXNl ckFnZW50U3R5bGVzKTsKKyAgICAgICAgZnVuY3Rpb24gZ2V0Q29tcHV0ZWRTdHlsZUNhbGxiYWNr KGNvbXB1dGVkU3R5bGUpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmIChjb21wdXRlZFN0eWxl KQorICAgICAgICAgICAgICAgIHRoaXMuX3JlZnJlc2hVcGRhdGUobm9kZSwgY29tcHV0ZWRTdHls ZSwgZWRpdGVkU2VjdGlvbik7CisgICAgICAgIH07CisKKyAgICAgICAgaWYgKHJlZnJlc2gpCisg ICAgICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLmdldENvbXB1dGVkU3R5bGUoV2ViSW5zcGVjdG9y LkNhbGxiYWNrLndyYXAoZ2V0Q29tcHV0ZWRTdHlsZUNhbGxiYWNrLmJpbmQodGhpcykpLCBub2Rl LmlkKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5nZXRTdHls ZXMoV2ViSW5zcGVjdG9yLkNhbGxiYWNrLndyYXAoZ2V0U3R5bGVzQ2FsbGJhY2suYmluZCh0aGlz KSksIG5vZGUuaWQsICFXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hvd1VzZXJBZ2VudFN0eWxlcyk7 CiAgICAgfSwKIAotICAgIF91cGRhdGU6IGZ1bmN0aW9uKHJlZnJlc2gsIG5vZGUsIHN0eWxlcywg ZWRpdGVkU2VjdGlvbikKKyAgICBfcmVmcmVzaFVwZGF0ZTogZnVuY3Rpb24obm9kZSwgY29tcHV0 ZWRTdHlsZSwgZWRpdGVkU2VjdGlvbikKICAgICB7Ci0gICAgICAgIGlmIChyZWZyZXNoKSB7Ci0g ICAgICAgICAgICBmb3IgKHZhciBwc2V1ZG9JZCBpbiB0aGlzLnNlY3Rpb25zKSB7Ci0gICAgICAg ICAgICAgICAgdmFyIHN0eWxlUnVsZXMgPSB0aGlzLl9yZWZyZXNoU3R5bGVSdWxlcyh0aGlzLnNl Y3Rpb25zW3BzZXVkb0lkXSwgc3R5bGVzKTsKLSAgICAgICAgICAgICAgICB2YXIgdXNlZFByb3Bl cnRpZXMgPSB7fTsKLSAgICAgICAgICAgICAgICB2YXIgZGlzYWJsZWRDb21wdXRlZFByb3BlcnRp ZXMgPSB7fTsKLSAgICAgICAgICAgICAgICB0aGlzLl9tYXJrVXNlZFByb3BlcnRpZXMoc3R5bGVS dWxlcywgdXNlZFByb3BlcnRpZXMsIGRpc2FibGVkQ29tcHV0ZWRQcm9wZXJ0aWVzKTsKLSAgICAg ICAgICAgICAgICB0aGlzLl9yZWZyZXNoU2VjdGlvbnNGb3JTdHlsZVJ1bGVzKHN0eWxlUnVsZXMs IHVzZWRQcm9wZXJ0aWVzLCBkaXNhYmxlZENvbXB1dGVkUHJvcGVydGllcywgZWRpdGVkU2VjdGlv bik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB0aGlzLmJv ZHlFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7Ci0gICAgICAgICAgICB2YXIgc3R5bGVSdWxlcyA9 IHRoaXMuX3JlYnVpbGRTdHlsZVJ1bGVzKG5vZGUsIHN0eWxlcyk7CisgICAgICAgIGZvciAodmFy IHBzZXVkb0lkIGluIHRoaXMuc2VjdGlvbnMpIHsKKyAgICAgICAgICAgIHZhciBzdHlsZVJ1bGVz ID0gdGhpcy5fcmVmcmVzaFN0eWxlUnVsZXModGhpcy5zZWN0aW9uc1twc2V1ZG9JZF0sIGNvbXB1 dGVkU3R5bGUpOwogICAgICAgICAgICAgdmFyIHVzZWRQcm9wZXJ0aWVzID0ge307CiAgICAgICAg ICAgICB2YXIgZGlzYWJsZWRDb21wdXRlZFByb3BlcnRpZXMgPSB7fTsKICAgICAgICAgICAgIHRo aXMuX21hcmtVc2VkUHJvcGVydGllcyhzdHlsZVJ1bGVzLCB1c2VkUHJvcGVydGllcywgZGlzYWJs ZWRDb21wdXRlZFByb3BlcnRpZXMpOwotICAgICAgICAgICAgdGhpcy5zZWN0aW9uc1swXSA9IHRo aXMuX3JlYnVpbGRTZWN0aW9uc0ZvclN0eWxlUnVsZXMoc3R5bGVSdWxlcywgdXNlZFByb3BlcnRp ZXMsIGRpc2FibGVkQ29tcHV0ZWRQcm9wZXJ0aWVzLCAwKTsKKyAgICAgICAgICAgIHRoaXMuX3Jl ZnJlc2hTZWN0aW9uc0ZvclN0eWxlUnVsZXMoc3R5bGVSdWxlcywgdXNlZFByb3BlcnRpZXMsIGRp c2FibGVkQ29tcHV0ZWRQcm9wZXJ0aWVzLCBlZGl0ZWRTZWN0aW9uKTsKKyAgICAgICAgfQorICAg IH0sCiAKLSAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgc3R5bGVzLnBzZXVkb0VsZW1l bnRzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgdmFyIHBzZXVkb0VsZW1lbnRDU1NS dWxlcyA9IHN0eWxlcy5wc2V1ZG9FbGVtZW50c1tpXTsKKyAgICBfcmVidWlsZFVwZGF0ZTogZnVu Y3Rpb24obm9kZSwgc3R5bGVzKQorICAgIHsKKyAgICAgICAgdGhpcy5ib2R5RWxlbWVudC5yZW1v dmVDaGlsZHJlbigpOworICAgICAgICB2YXIgc3R5bGVSdWxlcyA9IHRoaXMuX3JlYnVpbGRTdHls ZVJ1bGVzKG5vZGUsIHN0eWxlcyk7CisgICAgICAgIHZhciB1c2VkUHJvcGVydGllcyA9IHt9Owor ICAgICAgICB2YXIgZGlzYWJsZWRDb21wdXRlZFByb3BlcnRpZXMgPSB7fTsKKyAgICAgICAgdGhp cy5fbWFya1VzZWRQcm9wZXJ0aWVzKHN0eWxlUnVsZXMsIHVzZWRQcm9wZXJ0aWVzLCBkaXNhYmxl ZENvbXB1dGVkUHJvcGVydGllcyk7CisgICAgICAgIHRoaXMuc2VjdGlvbnNbMF0gPSB0aGlzLl9y ZWJ1aWxkU2VjdGlvbnNGb3JTdHlsZVJ1bGVzKHN0eWxlUnVsZXMsIHVzZWRQcm9wZXJ0aWVzLCBk aXNhYmxlZENvbXB1dGVkUHJvcGVydGllcywgMCk7CiAKLSAgICAgICAgICAgICAgICBzdHlsZVJ1 bGVzID0gW107Ci0gICAgICAgICAgICAgICAgdmFyIHBzZXVkb0lkID0gcHNldWRvRWxlbWVudENT U1J1bGVzLnBzZXVkb0lkOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHN0eWxlcy5wc2V1 ZG9FbGVtZW50cy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgdmFyIHBzZXVkb0VsZW1lbnRD U1NSdWxlcyA9IHN0eWxlcy5wc2V1ZG9FbGVtZW50c1tpXTsKIAotICAgICAgICAgICAgICAgIHZh ciBlbnRyeSA9IHsgaXNTdHlsZVNlcGFyYXRvcjogdHJ1ZSwgcHNldWRvSWQ6IHBzZXVkb0lkIH07 Ci0gICAgICAgICAgICAgICAgc3R5bGVSdWxlcy5wdXNoKGVudHJ5KTsKKyAgICAgICAgICAgIHN0 eWxlUnVsZXMgPSBbXTsKKyAgICAgICAgICAgIHZhciBwc2V1ZG9JZCA9IHBzZXVkb0VsZW1lbnRD U1NSdWxlcy5wc2V1ZG9JZDsKIAotICAgICAgICAgICAgICAgIC8vIEFkZCBydWxlcyBpbiByZXZl cnNlIG9yZGVyIHRvIG1hdGNoIHRoZSBjYXNjYWRlIG9yZGVyLgotICAgICAgICAgICAgICAgIGZv ciAodmFyIGogPSBwc2V1ZG9FbGVtZW50Q1NTUnVsZXMucnVsZXMubGVuZ3RoIC0gMTsgaiA+PSAw OyAtLWopIHsKLSAgICAgICAgICAgICAgICAgICAgdmFyIHJ1bGUgPSBXZWJJbnNwZWN0b3IuQ1NT U3R5bGVEZWNsYXJhdGlvbi5wYXJzZVJ1bGUocHNldWRvRWxlbWVudENTU1J1bGVzLnJ1bGVzW2pd KTsKLSAgICAgICAgICAgICAgICAgICAgc3R5bGVSdWxlcy5wdXNoKHsgc3R5bGU6IHJ1bGUuc3R5 bGUsIHNlbGVjdG9yVGV4dDogcnVsZS5zZWxlY3RvclRleHQsIHBhcmVudFN0eWxlU2hlZXQ6IHJ1 bGUucGFyZW50U3R5bGVTaGVldCwgcnVsZTogcnVsZSB9KTsKLSAgICAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICAgICAgdXNlZFByb3BlcnRpZXMgPSB7fTsKLSAgICAgICAgICAgICAgICBkaXNh YmxlZENvbXB1dGVkUHJvcGVydGllcyA9IHt9OwotICAgICAgICAgICAgICAgIHRoaXMuX21hcmtV c2VkUHJvcGVydGllcyhzdHlsZVJ1bGVzLCB1c2VkUHJvcGVydGllcywgZGlzYWJsZWRDb21wdXRl ZFByb3BlcnRpZXMpOwotICAgICAgICAgICAgICAgIHRoaXMuc2VjdGlvbnNbcHNldWRvSWRdID0g dGhpcy5fcmVidWlsZFNlY3Rpb25zRm9yU3R5bGVSdWxlcyhzdHlsZVJ1bGVzLCB1c2VkUHJvcGVy dGllcywgZGlzYWJsZWRDb21wdXRlZFByb3BlcnRpZXMsIHBzZXVkb0lkKTsKKyAgICAgICAgICAg IHZhciBlbnRyeSA9IHsgaXNTdHlsZVNlcGFyYXRvcjogdHJ1ZSwgcHNldWRvSWQ6IHBzZXVkb0lk IH07CisgICAgICAgICAgICBzdHlsZVJ1bGVzLnB1c2goZW50cnkpOworCisgICAgICAgICAgICAv LyBBZGQgcnVsZXMgaW4gcmV2ZXJzZSBvcmRlciB0byBtYXRjaCB0aGUgY2FzY2FkZSBvcmRlci4K KyAgICAgICAgICAgIGZvciAodmFyIGogPSBwc2V1ZG9FbGVtZW50Q1NTUnVsZXMucnVsZXMubGVu Z3RoIC0gMTsgaiA+PSAwOyAtLWopIHsKKyAgICAgICAgICAgICAgICB2YXIgcnVsZSA9IFdlYklu c3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uLnBhcnNlUnVsZShwc2V1ZG9FbGVtZW50Q1NTUnVs ZXMucnVsZXNbal0pOworICAgICAgICAgICAgICAgIHN0eWxlUnVsZXMucHVzaCh7IHN0eWxlOiBy dWxlLnN0eWxlLCBzZWxlY3RvclRleHQ6IHJ1bGUuc2VsZWN0b3JUZXh0LCBwYXJlbnRTdHlsZVNo ZWV0OiBydWxlLnBhcmVudFN0eWxlU2hlZXQsIHJ1bGU6IHJ1bGUgfSk7CiAgICAgICAgICAgICB9 CisgICAgICAgICAgICB1c2VkUHJvcGVydGllcyA9IHt9OworICAgICAgICAgICAgZGlzYWJsZWRD b21wdXRlZFByb3BlcnRpZXMgPSB7fTsKKyAgICAgICAgICAgIHRoaXMuX21hcmtVc2VkUHJvcGVy dGllcyhzdHlsZVJ1bGVzLCB1c2VkUHJvcGVydGllcywgZGlzYWJsZWRDb21wdXRlZFByb3BlcnRp ZXMpOworICAgICAgICAgICAgdGhpcy5zZWN0aW9uc1twc2V1ZG9JZF0gPSB0aGlzLl9yZWJ1aWxk U2VjdGlvbnNGb3JTdHlsZVJ1bGVzKHN0eWxlUnVsZXMsIHVzZWRQcm9wZXJ0aWVzLCBkaXNhYmxl ZENvbXB1dGVkUHJvcGVydGllcywgcHNldWRvSWQpOwogICAgICAgICB9CiAgICAgfSwKIAotICAg IF9yZWZyZXNoU3R5bGVSdWxlczogZnVuY3Rpb24oc2VjdGlvbnMsIHN0eWxlcykKKyAgICBfcmVm cmVzaFN0eWxlUnVsZXM6IGZ1bmN0aW9uKHNlY3Rpb25zLCBjb21wdXRlZFN0eWxlKQogICAgIHsK LSAgICAgICAgdmFyIG5vZGVDb21wdXRlZFN0eWxlID0gbmV3IFdlYkluc3BlY3Rvci5DU1NTdHls ZURlY2xhcmF0aW9uKHN0eWxlcy5jb21wdXRlZFN0eWxlKTsKKyAgICAgICAgdmFyIG5vZGVDb21w dXRlZFN0eWxlID0gbmV3IFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uKGNvbXB1dGVk U3R5bGUpOwogICAgICAgICB2YXIgc3R5bGVSdWxlcyA9IFtdOwogICAgICAgICBmb3IgKHZhciBp ID0gMDsgc2VjdGlvbnMgJiYgaSA8IHNlY3Rpb25zLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAg ICB2YXIgc2VjdGlvbiA9IHNlY3Rpb25zW2ldOworICAgICAgICAgICAgaWYgKHNlY3Rpb24gaW5z dGFuY2VvZiBXZWJJbnNwZWN0b3IuQmxhbmtTdHlsZVByb3BlcnRpZXNTZWN0aW9uKQorICAgICAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgaWYgKHNlY3Rpb24uY29tcHV0ZWRTdHls ZSkKICAgICAgICAgICAgICAgICBzZWN0aW9uLnN0eWxlUnVsZS5zdHlsZSA9IG5vZGVDb21wdXRl ZFN0eWxlOwogICAgICAgICAgICAgdmFyIHN0eWxlUnVsZSA9IHsgc2VjdGlvbjogc2VjdGlvbiwg c3R5bGU6IHNlY3Rpb24uc3R5bGVSdWxlLnN0eWxlLCBjb21wdXRlZFN0eWxlOiBzZWN0aW9uLmNv bXB1dGVkU3R5bGUsIHJ1bGU6IHNlY3Rpb24ucnVsZSB9OwpAQCAtNTA3LDYgKzUxNyw4IEBAIFdl Ykluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBl bGVtZW50U3R5bGVTZWN0aW9uID0gdGhpcy5zZWN0aW9uc1swXVsxXTsKICAgICAgICAgdGhpcy5i b2R5RWxlbWVudC5pbnNlcnRCZWZvcmUoYmxhbmtTZWN0aW9uLmVsZW1lbnQsIGVsZW1lbnRTdHls ZVNlY3Rpb24uZWxlbWVudC5uZXh0U2libGluZyk7CiAKKyAgICAgICAgdGhpcy5zZWN0aW9uc1sw XS5zcGxpY2UoMiwgMCwgYmxhbmtTZWN0aW9uKTsKKwogICAgICAgICByZXR1cm4gYmxhbmtTZWN0 aW9uOwogICAgIH0sCiAKQEAgLTUzMSw2ICs1NDMsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9w ZXJ0aWVzU2VjdGlvbiA9IGZ1bmN0aW9uKHN0eWxlUnVsZSwgc3VidGl0bGUsIGNvbXB1dGVkU3R5 bAogICAgIFdlYkluc3BlY3Rvci5Qcm9wZXJ0aWVzU2VjdGlvbi5jYWxsKHRoaXMsIHN0eWxlUnVs ZS5zZWxlY3RvclRleHQpOwogCiAgICAgdGhpcy50aXRsZUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigiZGJsY2xpY2siLCB0aGlzLl9kYmxjbGlja1NlbGVjdG9yLmJpbmQodGhpcyksIGZhbHNlKTsK KyAgICB0aGlzLnRpdGxlRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2Ns aWNrU2VsZWN0b3IuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMuZWxlbWVudC5hZGRFdmVu dExpc3RlbmVyKCJkYmxjbGljayIsIHRoaXMuX2RibGNsaWNrRW1wdHlTcGFjZS5iaW5kKHRoaXMp LCBmYWxzZSk7CiAKICAgICB0aGlzLnN0eWxlUnVsZSA9IHN0eWxlUnVsZTsKQEAgLTY2NCwxMSAr Njc3LDYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0g ewogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9LAogCi0gICAgaXNJbnNwZWN0b3JTdHlsZXNo ZWV0OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1cm4gKHRoaXMuc3R5bGVSdWxlLnBh cmVudFN0eWxlU2hlZXQgPT09IFdlYkluc3BlY3Rvci5wYW5lbHMuZWxlbWVudHMuc3R5bGVzaGVl dCk7Ci0gICAgfSwKLQogICAgIHVwZGF0ZTogZnVuY3Rpb24oZnVsbCkKICAgICB7CiAgICAgICAg IGlmIChmdWxsIHx8IHRoaXMuY29tcHV0ZWRTdHlsZSkgewpAQCAtNzU2LDEwICs3NjQsMTkgQEAg V2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogCiAgICAg X2RibGNsaWNrRW1wdHlTcGFjZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgeworICAgICAgICBpZiAo ZXZlbnQudGFyZ2V0Lmhhc1N0eWxlQ2xhc3MoImhlYWRlciIpKSB7CisgICAgICAgICAgICBldmVu dC5zdG9wUHJvcGFnYXRpb24oKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogICAg ICAgICB0aGlzLmV4cGFuZCgpOwogICAgICAgICB0aGlzLmFkZE5ld0JsYW5rUHJvcGVydHkoKS5z dGFydEVkaXRpbmcoKTsKICAgICB9LAogCisgICAgX2NsaWNrU2VsZWN0b3I6IGZ1bmN0aW9uKGV2 ZW50KQorICAgIHsKKyAgICAgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CisgICAgfSwKKwog ICAgIF9kYmxjbGlja1NlbGVjdG9yOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIGlm ICghdGhpcy5lZGl0YWJsZSkK