81898 2012-03-22 05:35:03 -0700 Web Inspector: allow on-hover popover while in edit mode. 2012-03-22 05:54:47 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 585158 0 pfeldman 2012-03-22 05:35:03 -0700 This change allows popover while in-edit mode, hides is upon Esc. It also introduces anchorOverride concept in ObjectPopoverHelper that allows dynamically switching the anchor (say if we want to highlight anchor itself). 585160 1 133234 pfeldman 2012-03-22 05:37:24 -0700 Created attachment 133234 Patch 585167 2 133234 vsevik 2012-03-22 05:42:54 -0700 Comment on attachment 133234 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133234&action=review > Source/WebCore/ChangeLog:8 > + This change allows popover while in-edit mode, hides is upon Esc. It also introduces anchorOverride is -> it 585179 3 pfeldman 2012-03-22 05:54:47 -0700 Committed r111676: <http://trac.webkit.org/changeset/111676> 133234 2012-03-22 05:37:24 -0700 2012-03-22 05:42:54 -0700 Patch bug-81898-20120322163722.patch text/plain 10572 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGNhZTM4YjJjZmM2ZGMz MmY2OWJhODNiOWFiY2E5NDc2M2U1OTlmOS4uZThkYWE1ZjU1MmFlMzZmYTM3MTc3Y2ZlM2UzNjI3 NTExN2JjOWEzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTAzLTIyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGFsbG93IG9uLWhvdmVyIHBvcG92ZXIgd2hpbGUgaW4gZWRpdCBtb2RlLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE4OTgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBhbGxvd3Mg cG9wb3ZlciB3aGlsZSBpbi1lZGl0IG1vZGUsIGhpZGVzIGlzIHVwb24gRXNjLiBJdCBhbHNvIGlu dHJvZHVjZXMgYW5jaG9yT3ZlcnJpZGUKKyAgICAgICAgY29uY2VwdCBpbiBPYmplY3RQb3BvdmVy SGVscGVyIHRoYXQgYWxsb3dzIGR5bmFtaWNhbGx5IHN3aXRjaGluZyB0aGUgYW5jaG9yIChzYXkg aWYgd2Ugd2FudCB0byBoaWdobGlnaHQgYW5jaG9yIGl0c2VsZikuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5K YXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLl9yZXNvbHZlT2JqZWN0Rm9yUG9wb3Zlci5z aG93T2JqZWN0UG9wb3Zlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJj ZUZyYW1lLnByb3RvdHlwZS5fcmVzb2x2ZU9iamVjdEZvclBvcG92ZXIpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuX29uS2V5RG93bik6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanM6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQb3BvdmVySGVscGVyLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLk9iamVjdFBvcG92ZXJIZWxwZXIucHJvdG90eXBlLl9zaG93T2JqZWN0UG9wb3Zl ci5zaG93T2JqZWN0UG9wb3Zlci4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFBvcG92 ZXJIZWxwZXIucHJvdG90eXBlLl9zaG93T2JqZWN0UG9wb3Zlcik6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9Qb3BvdmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBvcG92ZXJI ZWxwZXIucHJvdG90eXBlLmlzUG9wb3ZlclZpc2libGUpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKwogMjAxMi0wMy0yMiAgTWFyaW8gU2FuY2hleiBQ cmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRml4IHRoZSBvbmx5 IHJlbWFpbmluZyBjb2Rpbmcgc3R5bGUgaXNzdWUgaW4gR1RLIGFjY2Vzc2liaWxpdHkgY29kZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhl YXBzaG90Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWls ZWRIZWFwc2hvdFZpZXcuanMKaW5kZXggYzZiM2QxMTE1YThkOWViOWRlMTUzMjRmNDZlZTViOWZm OWJhMmM3YS4uODY3NjE3Mzk1OGJjMWUzY2RkOTIyNjE4NzdhZjg4MGI4M2I2NDI1MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90 Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVk SGVhcHNob3RWaWV3LmpzCkBAIC01MjcsNyArNTI3LDcgQEAgV2ViSW5zcGVjdG9yLkRldGFpbGVk SGVhcHNob3RWaWV3ID0gZnVuY3Rpb24ocGFyZW50LCBwcm9maWxlKQogICAgIHRoaXMuaGVscEJ1 dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKCIiLCAiaGVhcHNob3QtaGVs cC1zdGF0dXMtYmFyLWl0ZW0gc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy5oZWxwQnV0dG9u LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5faGVscENsaWNrZWQuYmluZCh0aGlzKSwg ZmFsc2UpOwogCi0gICAgdGhpcy5fcG9wb3ZlckhlbHBlciA9IG5ldyBXZWJJbnNwZWN0b3IuT2Jq ZWN0UG9wb3ZlckhlbHBlcih0aGlzLmVsZW1lbnQsIHRoaXMuX2dldEhvdmVyQW5jaG9yLmJpbmQo dGhpcyksIHRoaXMuX3Jlc29sdmVPYmplY3RGb3JQb3BvdmVyLmJpbmQodGhpcyksIG51bGwsIHRy dWUpOworICAgIHRoaXMuX3BvcG92ZXJIZWxwZXIgPSBuZXcgV2ViSW5zcGVjdG9yLk9iamVjdFBv cG92ZXJIZWxwZXIodGhpcy5lbGVtZW50LCB0aGlzLl9nZXRIb3ZlckFuY2hvci5iaW5kKHRoaXMp LCB0aGlzLl9yZXNvbHZlT2JqZWN0Rm9yUG9wb3Zlci5iaW5kKHRoaXMpLCB1bmRlZmluZWQsIHRy dWUpOwogCiAgICAgdGhpcy5fbG9hZFByb2ZpbGUodGhpcy5fcHJvZmlsZVVpZCwgcHJvZmlsZUNh bGxiYWNrLmJpbmQodGhpcykpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKaW5kZXggN2RiYzJjOGZmZjMwNWQwZTNjZTE3NGEy OGM1MDAwN2VlY2Q3M2M1Ny4uMTkzZThkZjkyNDhhODUyNzVmYjMwMDQyZGQ3MTRiMGYyMDVlYTgx NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50 c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVu dHNQYW5lbC5qcwpAQCAtMzkxLDYgKzM5MSwxMCBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNQYW5l bC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCisgICAgLyoqCisgICAgICogQHBh cmFtIHtFbGVtZW50fSBhbmNob3IKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Qb3BvdmVy fSBwb3BvdmVyCisgICAgICovCiAgICAgX3Nob3dQb3BvdmVyOiBmdW5jdGlvbihhbmNob3IsIHBv cG92ZXIpCiAgICAgewogICAgICAgICB2YXIgbGlzdEl0ZW0gPSBhbmNob3IuZW5jbG9zaW5nTm9k ZU9yU2VsZldpdGhOb2RlTmFtZUluQXJyYXkoWyJsaSJdKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMK aW5kZXggMGI2ZmMxOGMyZWVlNmFhZTZhNThmMGY4NGU3NDE5YTQwY2NhOGMxNi4uNmJjNTQzZTc3 MGFkMWMxMmFkNTBjMmY0MzFkYjUyZDljZDE5OGY2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMK QEAgLTMwMywxMCArMzAzLDYgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5w cm90b3R5cGUgPSB7CiAKICAgICBfcmVzb2x2ZU9iamVjdEZvclBvcG92ZXI6IGZ1bmN0aW9uKGVs ZW1lbnQsIHNob3dDYWxsYmFjaywgb2JqZWN0R3JvdXBOYW1lKQogICAgIHsKLSAgICAgICAgaWYg KCF0aGlzLnJlYWRPbmx5KSB7Ci0gICAgICAgICAgICB0aGlzLl9wb3BvdmVySGVscGVyLmhpZGVQ b3BvdmVyKCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KICAgICAgICAgdGhpcy5f aGlnaGxpZ2h0RWxlbWVudCA9IHRoaXMuX2hpZ2hsaWdodEV4cHJlc3Npb24oZWxlbWVudCk7CiAK ICAgICAgICAgZnVuY3Rpb24gc2hvd09iamVjdFBvcG92ZXIocmVzdWx0LCB3YXNUaHJvd24pCkBA IC0zMTUsNyArMzExLDcgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgdGhpcy5fcG9wb3ZlckhlbHBlci5oaWRlUG9wb3Zl cigpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAg IHNob3dDYWxsYmFjayhXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QYXlsb2FkKHJlc3Vs dCksIHdhc1Rocm93bik7CisgICAgICAgICAgICBzaG93Q2FsbGJhY2soV2ViSW5zcGVjdG9yLlJl bW90ZU9iamVjdC5mcm9tUGF5bG9hZChyZXN1bHQpLCB3YXNUaHJvd24sIHRoaXMuX2hpZ2hsaWdo dEVsZW1lbnQpOwogICAgICAgICAgICAgLy8gUG9wb3ZlciBtYXkgaGF2ZSBiZWVuIHJlbW92ZWQg Ynkgc2hvd0NhbGxiYWNrKCkuCiAgICAgICAgICAgICBpZiAodGhpcy5faGlnaGxpZ2h0RWxlbWVu dCkKICAgICAgICAgICAgICAgICB0aGlzLl9oaWdobGlnaHRFbGVtZW50LmFkZFN0eWxlQ2xhc3Mo InNvdXJjZS1mcmFtZS1ldmFsLWV4cHJlc3Npb24iKTsKQEAgLTQxOSw2ICs0MTUsMTYgQEAgV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGV2 ZW50LnByZXZlbnREZWZhdWx0KCk7CiAgICAgfSwKIAorICAgIF9vbktleURvd246IGZ1bmN0aW9u KGV2ZW50KQorICAgIHsKKyAgICAgICAgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJVKzAw MUIiKSB7IC8vIEVzY2FwZSBrZXkKKyAgICAgICAgICAgIGlmICh0aGlzLl9wb3BvdmVySGVscGVy LmlzUG9wb3ZlclZpc2libGUoKSkgeworICAgICAgICAgICAgICAgIHRoaXMuX3BvcG92ZXJIZWxw ZXIuaGlkZVBvcG92ZXIoKTsKKyAgICAgICAgICAgICAgICBldmVudC5jb25zdW1lKCk7CisgICAg ICAgICAgICB9CisgICAgICAgIH0KKyAgICB9LAorCiAgICAgX2VkaXRCcmVha3BvaW50Q29uZGl0 aW9uOiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb25kaXRpb24sIGNhbGxiYWNrKQogICAgIHsKICAg ICAgICAgdGhpcy5fY29uZGl0aW9uRWxlbWVudCA9IHRoaXMuX2NyZWF0ZUNvbmRpdGlvbkVsZW1l bnQobGluZU51bWJlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IGRkM2E4NGRlNGY1YzZjYThlZDI0ZWY0ZDc2ZDY1ZWQy MTRmMGE2MGMuLmNjNjcxNzk5MTA1NDQ0ZjhhNDEzMjM1MDg5OTg0MjQ4NDM4OTExNWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpz CkBAIC05MTcsNiArOTE3LDEwIEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHJldHVybiByZXNvdXJjZSAmJiByZXNvdXJjZS50aW1pbmcgPyBhbmNo b3IgOiBudWxsOwogICAgIH0sCiAKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0VsZW1lbnR9IGFu Y2hvcgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlBvcG92ZXJ9IHBvcG92ZXIKKyAgICAg Ki8KICAgICBfc2hvd1BvcG92ZXI6IGZ1bmN0aW9uKGFuY2hvciwgcG9wb3ZlcikKICAgICB7CiAg ICAgICAgIHZhciByZXNvdXJjZSA9IGFuY2hvci5wYXJlbnRFbGVtZW50LnJlc291cmNlOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQb3BvdmVy SGVscGVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQb3Bv dmVySGVscGVyLmpzCmluZGV4IGY0YTA5OWQ4NmUwNjBiMDY2NzFkMWI4MjBiODlkMzQ4YmMwNzk0 NGEuLjU4ODYyMTNkNzNkNDJiZDA1MmIwYjIzNTJjMzM0Yjg5NGVlMzdmNWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UG9wb3ZlckhlbHBlci5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFBvcG92ZXJI ZWxwZXIuanMKQEAgLTMxLDYgKzMxLDExIEBACiAvKioKICAqIEBjb25zdHJ1Y3RvcgogICogQGV4 dGVuZHMge1dlYkluc3BlY3Rvci5Qb3BvdmVySGVscGVyfQorICogQHBhcmFtIHtFbGVtZW50fSBw YW5lbEVsZW1lbnQKKyAqIEBwYXJhbSB7ZnVuY3Rpb24oRWxlbWVudCwgRXZlbnQpOkVsZW1lbnR8 dW5kZWZpbmVkfSBnZXRBbmNob3IKKyAqIEBwYXJhbSB7ZnVuY3Rpb24oRWxlbWVudCwgZnVuY3Rp b24oV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdCwgYm9vbGVhbiwgRWxlbWVudD0pOnVuZGVmaW5l ZCwgc3RyaW5nKTp1bmRlZmluZWR9IHF1ZXJ5T2JqZWN0CisgKiBAcGFyYW0ge2Z1bmN0aW9uKCk9 fSBvbkhpZGUKKyAqIEBwYXJhbSB7Ym9vbGVhbj19IGRpc2FibGVPbkNsaWNrCiAgKi8KIFdlYklu c3BlY3Rvci5PYmplY3RQb3BvdmVySGVscGVyID0gZnVuY3Rpb24ocGFuZWxFbGVtZW50LCBnZXRB bmNob3IsIHF1ZXJ5T2JqZWN0LCBvbkhpZGUsIGRpc2FibGVPbkNsaWNrKQogewpAQCAtNDIsOSAr NDcsMTggQEAgV2ViSW5zcGVjdG9yLk9iamVjdFBvcG92ZXJIZWxwZXIgPSBmdW5jdGlvbihwYW5l bEVsZW1lbnQsIGdldEFuY2hvciwgcXVlcnlPYmplY3QKIH07CiAKIFdlYkluc3BlY3Rvci5PYmpl Y3RQb3BvdmVySGVscGVyLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0Vs ZW1lbnR9IGVsZW1lbnQKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Qb3BvdmVyfSBwb3Bv dmVyCisgICAgICovCiAgICAgX3Nob3dPYmplY3RQb3BvdmVyOiBmdW5jdGlvbihlbGVtZW50LCBw b3BvdmVyKQogICAgIHsKLSAgICAgICAgZnVuY3Rpb24gc2hvd09iamVjdFBvcG92ZXIocmVzdWx0 LCB3YXNUaHJvd24pCisgICAgICAgIC8qKgorICAgICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rv ci5SZW1vdGVPYmplY3R9IHJlc3VsdAorICAgICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IHdhc1Ro cm93bgorICAgICAgICAgKiBAcGFyYW0ge0VsZW1lbnQ9fSBhbmNob3JPdmVycmlkZQorICAgICAg ICAgKi8KKyAgICAgICAgZnVuY3Rpb24gc2hvd09iamVjdFBvcG92ZXIocmVzdWx0LCB3YXNUaHJv d24sIGFuY2hvck92ZXJyaWRlKQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAocG9wb3Zlci5k aXNwb3NlZCkKICAgICAgICAgICAgICAgICByZXR1cm47CkBAIC01Miw2ICs2Niw5IEBAIFdlYklu c3BlY3Rvci5PYmplY3RQb3BvdmVySGVscGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAg ICB0aGlzLmhpZGVQb3BvdmVyKCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAg ICAgfQorCisgICAgICAgICAgICB2YXIgYW5jaG9yRWxlbWVudCA9IGFuY2hvck92ZXJyaWRlIHx8 IGVsZW1lbnQ7CisKICAgICAgICAgICAgIHZhciBwb3BvdmVyQ29udGVudEVsZW1lbnQgPSBudWxs OwogICAgICAgICAgICAgaWYgKHJlc3VsdC50eXBlICE9PSAib2JqZWN0IikgewogICAgICAgICAg ICAgICAgIHBvcG92ZXJDb250ZW50RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNw YW4iKTsKQEAgLTc5LDE0ICs5NiwxNCBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0UG9wb3ZlckhlbHBl ci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRhaW5lci5hcHBl bmRDaGlsZChwb3BvdmVyQ29udGVudEVsZW1lbnQpOwogCi0gICAgICAgICAgICAgICAgICAgICAg ICBwb3BvdmVyLnNob3coY29udGFpbmVyLCBlbGVtZW50KTsKKyAgICAgICAgICAgICAgICAgICAg ICAgIHBvcG92ZXIuc2hvdyhjb250YWluZXIsIGFuY2hvckVsZW1lbnQpOwogICAgICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIERlYnVnZ2VyQWdlbnQuZ2V0RnVuY3Rpb25E ZXRhaWxzKHJlc3VsdC5vYmplY3RJZCwgZGlkR2V0RGV0YWlscy5iaW5kKHRoaXMpKTsKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICBpZiAocmVzdWx0LnR5cGUgPT09ICJzdHJpbmciKQogICAgICAgICAgICAgICAgICAgICBwb3Bv dmVyQ29udGVudEVsZW1lbnQudGV4dENvbnRlbnQgPSAiXCIiICsgcG9wb3ZlckNvbnRlbnRFbGVt ZW50LnRleHRDb250ZW50ICsgIlwiIjsKLSAgICAgICAgICAgICAgICBwb3BvdmVyLnNob3cocG9w b3ZlckNvbnRlbnRFbGVtZW50LCBlbGVtZW50KTsKKyAgICAgICAgICAgICAgICBwb3BvdmVyLnNo b3cocG9wb3ZlckNvbnRlbnRFbGVtZW50LCBhbmNob3JFbGVtZW50KTsKICAgICAgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICAgICAgcG9wb3ZlckNvbnRlbnRFbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7CiAKQEAgLTEwOCw3ICsxMjUsNyBAQCBXZWJJbnNwZWN0b3Iu T2JqZWN0UG9wb3ZlckhlbHBlci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgICAgICBjb25z dCBwb3BvdmVyV2lkdGggPSAzMDA7CiAgICAgICAgICAgICAgICAgY29uc3QgcG9wb3ZlckhlaWdo dCA9IDI1MDsKLSAgICAgICAgICAgICAgICBwb3BvdmVyLnNob3cocG9wb3ZlckNvbnRlbnRFbGVt ZW50LCBlbGVtZW50LCBwb3BvdmVyV2lkdGgsIHBvcG92ZXJIZWlnaHQpOworICAgICAgICAgICAg ICAgIHBvcG92ZXIuc2hvdyhwb3BvdmVyQ29udGVudEVsZW1lbnQsIGFuY2hvckVsZW1lbnQsIHBv cG92ZXJXaWR0aCwgcG9wb3ZlckhlaWdodCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICAgICAgdGhpcy5fcXVlcnlPYmplY3QoZWxlbWVudCwgc2hvd09iamVjdFBvcG92ZXIuYmluZCh0 aGlzKSwgdGhpcy5fcG9wb3Zlck9iamVjdEdyb3VwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcwppbmRleCAxYTg0YzMwMzM2ZWE1MmZjYjBkZjE1ZmIz YmI4ZTIyNTc5NmRlOWVkLi4yNGU5YTc5MTRlN2NlYmZjMmJmNGFmNTBhYmZjZGNmNWJjMDJjZjI5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BvcG92ZXIu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qb3BvdmVyLmpzCkBA IC0xOTAsNiArMTkwLDkgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90eXBlID0gewogCiAv KioKICAqIEBjb25zdHJ1Y3RvcgorICogQHBhcmFtIHtFbGVtZW50fSBwYW5lbEVsZW1lbnQKKyAq IEBwYXJhbSB7ZnVuY3Rpb24oRWxlbWVudCwgRXZlbnQpOkVsZW1lbnR8dW5kZWZpbmVkfSBnZXRB bmNob3IKKyAqIEBwYXJhbSB7ZnVuY3Rpb24oRWxlbWVudCwgV2ViSW5zcGVjdG9yLlBvcG92ZXIp OnVuZGVmaW5lZH0gc2hvd1BvcG92ZXIKICAqIEBwYXJhbSB7ZnVuY3Rpb24oKT19IG9uSGlkZQog ICogQHBhcmFtIHtib29sZWFuPX0gZGlzYWJsZU9uQ2xpY2sKICAqLwpAQCAtMjYxLDYgKzI2NCwx MSBAQCBXZWJJbnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0K ICAgICB9LAogCisgICAgaXNQb3BvdmVyVmlzaWJsZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgcmV0dXJuICEhdGhpcy5fcG9wb3ZlcjsKKyAgICB9LAorCiAgICAgaGlkZVBvcG92ZXI6IGZ1 bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX3Jlc2V0SG92ZXJUaW1lcigpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmlu ZGV4IGU5ZjhkOTI3ZWI2YTkwNmQzNmFhMDdmYTE4YmRkNjI2MTZiNjAwNDcuLjcxYzIyZTRhMzAw OGFmNWIxYTg0MjIxODE5ZTBlYTQyOTZmNDUzZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTczMSw2ICs3MzEsMTAg QEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB9CiAg ICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7RWxlbWVudH0gYW5jaG9yCisgICAgICog QHBhcmFtIHtXZWJJbnNwZWN0b3IuUG9wb3Zlcn0gcG9wb3ZlcgorICAgICAqLwogICAgIF9zaG93 UG9wb3ZlcjogZnVuY3Rpb24oYW5jaG9yLCBwb3BvdmVyKQogICAgIHsKICAgICAgICAgdmFyIHJl Y29yZCA9IGFuY2hvci5yb3cuX3JlY29yZDsK