77624 2012-02-02 04:07:32 -0800 Web Inspector: add experiment for single click styles editing. 2012-02-02 06:25:34 -0800 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 547766 0 pfeldman 2012-02-02 04:07:32 -0800 Patch to follow. 547770 1 125106 pfeldman 2012-02-02 04:12:29 -0800 Created attachment 125106 Patch 547772 2 125108 pfeldman 2012-02-02 04:15:11 -0800 Created attachment 125108 [Patch] with lint 547792 3 125108 apavlov 2012-02-02 04:52:21 -0800 Comment on attachment 125108 [Patch] with lint View in context: https://bugs.webkit.org/attachment.cgi?id=125108&action=review Looks good. Make sure this code works when a single-click in commits a selector and switches to editing a property name/value and vice versa. > Source/WebCore/inspector/front-end/StylesSidebarPane.js:1860 > + return element.enclosingNodeOrSelfWithClass("value"); return !!... to get the correct type 547842 4 pfeldman 2012-02-02 06:25:34 -0800 Committed r106550: <http://trac.webkit.org/changeset/106550> 125106 2012-02-02 04:12:29 -0800 2012-02-02 04:15:04 -0800 Patch bug-77624-20120202161227.patch text/plain 6999 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NDYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjI3MGIzNzg2ZDQ4ZTMw OWVkMTZhZDUxMTBiYjE1OTUxMjU2NDVhNy4uMjQ5ZTA0ODNmZTA4NTI1NmMzYzhhY2Q3MWQ3ZDll Y2Y3YzEyYTk0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTAyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBhZGQgZXhwZXJpbWVudCBmb3Igc2luZ2xlIGNsaWNrIHN0eWxlcyBlZGl0aW5nLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc2MjQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU2V0dGluZ3MuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNTZXR0 aW5ncyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0 YWNoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJv dG90eXBlLl9tb3VzZURvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlU cmVlRWxlbWVudC5wcm90b3R5cGUuX3Jlc2V0TW91c2VEb3duRWxlbWVudCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS5zZWxlY3RF bGVtZW50LmNvbnRleHQpOgorCiAyMDEyLTAxLTMxICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNjcmlwdHMgbmF2aWdhdG9y IGJlY29tZXMgZW1wdHkgYWZ0ZXIgInNob3cgZm9sZGVycyIgc2V0dGluZ3MgY2hhbmdlLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKaW5kZXggYjBj NTc2MzhmNmYzMzI4OTMwMzc4MzgwZDNlYWMzM2RjMDQxNWYzOC4uMjNmMGNmYWE4NTJjM2UwMDc3 ODE0ODMxZDJjZTQ0YjgxOGQzMjc2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NldHRpbmdzLmpzCkBAIC0xNzIsNiArMTcyLDcgQEAgV2ViSW5zcGVjdG9yLkV4 cGVyaW1lbnRzU2V0dGluZ3MgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5zb3VyY2VGcmFtZUFsd2F5 c0VkaXRhYmxlID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgic291cmNlRnJhbWVBbHdheXNFZGl0 YWJsZSIsICJNYWtlIHJlc291cmNlcyBhbHdheXMgZWRpdGFibGUiKTsKICAgICB0aGlzLmZyZWVG bG93RE9NRWRpdGluZyA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoImZyZWVGbG93RE9NRWRpdGlu ZyIsICJFbmFibGUgZnJlZSBmbG93IERPTSBlZGl0aW5nIik7CiAgICAgdGhpcy5zaG93TWVtb3J5 Q291bnRlcnMgPSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJzaG93TWVtb3J5Q291bnRlcnMiLCAi U2hvdyBtZW1vcnkgY291bnRlcnMgaW4gVGltZWxpbmUgcGFuZWwiKTsKKyAgICB0aGlzLnNpbmds ZUNsaWNrRWRpdGluZyA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoInNpbmdsZUNsaWNrRWRpdGlu ZyIsICJTaW5nbGUgY2xpY2sgQ1NTIGVkaXRpbmciKTsKIAogICAgIHRoaXMuX2NsZWFuVXBTZXR0 aW5nKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCA1OTQ1OWU0NTljZDdmMzE4ZTQ1YzA0YzY5MzI3 NDdiZDAxZjFlNzA3Li5mZjYzYzQ3MDU5ZjIxYzQyZjg4NzBhZmU2MDlmZDA1NTJkYzQ2N2E2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGVi YXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVz U2lkZWJhclBhbmUuanMKQEAgLTg5OSw4ICs4OTksOSBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9w ZXJ0aWVzU2VjdGlvbiA9IGZ1bmN0aW9uKHBhcmVudFBhbmUsIHN0eWxlUnVsZSwgZWRpdGFibGUs CiAgICAgY2xvc2VCcmFjZS50ZXh0Q29udGVudCA9ICJ9IjsKICAgICB0aGlzLmVsZW1lbnQuYXBw ZW5kQ2hpbGQoY2xvc2VCcmFjZSk7CiAKLSAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQuYWRkRXZl bnRMaXN0ZW5lcigiZGJsY2xpY2siLCB0aGlzLl9oYW5kbGVTZWxlY3RvckRvdWJsZUNsaWNrLmJp bmQodGhpcyksIGZhbHNlKTsKLSAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZGJs Y2xpY2siLCB0aGlzLl9oYW5kbGVFbXB0eVNwYWNlRG91YmxlQ2xpY2suYmluZCh0aGlzKSwgZmFs c2UpOworICAgIHZhciBldmVudE5hbWUgPSBXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5n cy5zaW5nbGVDbGlja0VkaXRpbmcuaXNFbmFibGVkKCkgPyAiY2xpY2siIDogImRibGNsaWNrIjsK KyAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcihldmVudE5hbWUsIHRo aXMuX2hhbmRsZVNlbGVjdG9yRG91YmxlQ2xpY2suYmluZCh0aGlzKSwgZmFsc2UpOworICAgIHRo aXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKGV2ZW50TmFtZSwgdGhpcy5faGFuZGxlRW1wdHlT cGFjZURvdWJsZUNsaWNrLmJpbmQodGhpcyksIGZhbHNlKTsKIAogICAgIHRoaXMuX3BhcmVudFBh bmUgPSBwYXJlbnRQYW5lOwogICAgIHRoaXMuc3R5bGVSdWxlID0gc3R5bGVSdWxlOwpAQCAtMTUy Miw2ICsxNTIzLDI3IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJv dG90eXBlID0gewogICAgIG9uYXR0YWNoOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlz LnVwZGF0ZVRpdGxlKCk7CisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0 aW5ncy5zaW5nbGVDbGlja0VkaXRpbmcuaXNFbmFibGVkKCkpIHsKKyAgICAgICAgICAgIHRoaXMu bGlzdEl0ZW1FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX21vdXNl RG93bi5iaW5kKHRoaXMpKTsKKyAgICAgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmFkZEV2 ZW50TGlzdGVuZXIoIm1vdXNldXAiLCB0aGlzLl9yZXNldE1vdXNlRG93bkVsZW1lbnQuYmluZCh0 aGlzKSk7CisgICAgICAgICAgICBldmVudE5hbWUgPSAiY2xpY2siOworICAgICAgICB9IGVsc2UK KyAgICAgICAgICAgIGV2ZW50TmFtZSA9ICJkYmxjbGljayI7CisgICAgICAgIHRoaXMubGlzdEl0 ZW1FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoZXZlbnROYW1lLCB0aGlzLl9zdGFydEVkaXRpbmcu YmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIF9tb3VzZURvd246IGZ1bmN0aW9uKGV2ZW50KQor ICAgIHsKKyAgICAgICAgdGhpcy5fcGFyZW50UGFuZS5fbW91c2VEb3duVHJlZUVsZW1lbnQgPSB0 aGlzOworICAgICAgICB0aGlzLl9wYXJlbnRQYW5lLl9tb3VzZURvd25UcmVlRWxlbWVudElzTmFt ZSA9IHRoaXMuX2lzTmFtZUVsZW1lbnQoZXZlbnQudGFyZ2V0KTsKKyAgICAgICAgdGhpcy5fcGFy ZW50UGFuZS5fbW91c2VEb3duVHJlZUVsZW1lbnRJc1ZhbHVlID0gdGhpcy5faXNWYWx1ZUVsZW1l bnQoZXZlbnQudGFyZ2V0KTsKKyAgICB9LAorCisgICAgX3Jlc2V0TW91c2VEb3duRWxlbWVudDog ZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICBkZWxldGUgdGhpcy5fcGFyZW50UGFuZS5f bW91c2VEb3duVHJlZUVsZW1lbnQ7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9wYXJlbnRQYW5lLl9t b3VzZURvd25UcmVlRWxlbWVudElzTmFtZTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX3BhcmVudFBh bmUuX21vdXNlRG93blRyZWVFbGVtZW50SXNWYWx1ZTsKICAgICB9LAogCiAgICAgdXBkYXRlVGl0 bGU6IGZ1bmN0aW9uKCkKQEAgLTE3MDgsNyArMTczMCw3IEBAIFdlYkluc3BlY3Rvci5TdHlsZVBy b3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmxpc3RJdGVtRWxl bWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiOiAiKSk7CiAgICAgICAg IHRoaXMubGlzdEl0ZW1FbGVtZW50LmFwcGVuZENoaWxkKHZhbHVlRWxlbWVudCk7CiAgICAgICAg IHRoaXMubGlzdEl0ZW1FbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2Rl KCI7IikpOwotCisgICAgICAgIAogICAgICAgICBpZiAoIXRoaXMucGFyc2VkT2spIHsKICAgICAg ICAgICAgIC8vIEF2b2lkIGhhdmluZyBsb25naGFuZHMgdW5kZXIgYW4gaW52YWxpZCBzaG9ydGhh bmQuCiAgICAgICAgICAgICB0aGlzLmhhc0NoaWxkcmVuID0gZmFsc2U7CkBAIC0xODA5LDEyICsx ODMxLDYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUg PSB7CiAgICAgICAgIH0KICAgICB9LAogCi0gICAgb25kYmxjbGljazogZnVuY3Rpb24oZXZlbnQp Ci0gICAgewotICAgICAgICB0aGlzLnN0YXJ0RWRpdGluZyhldmVudC50YXJnZXQpOwotICAgICAg ICBldmVudC5zdG9wUHJvcGFnYXRpb24oKTsKLSAgICB9LAotCiAgICAgcmVzdG9yZU5hbWVFbGVt ZW50OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICAvLyBSZXN0b3JlIDxzcGFuIGNsYXNzPSJ3 ZWJraXQtY3NzLXByb3BlcnR5Ij4gaWYgaXQgZG9lc24ndCB5ZXQgZXhpc3Qgb3Igd2FzIGFjY2lk ZW50YWxseSBkZWxldGVkLgpAQCAtMTgyNyw2ICsxODQzLDIyIEBAIFdlYkluc3BlY3Rvci5TdHls ZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmxpc3RJdGVt RWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5uYW1lRWxlbWVudCwgdGhpcy5saXN0SXRlbUVsZW1l bnQuZmlyc3RDaGlsZCk7CiAgICAgfSwKIAorICAgIF9zdGFydEVkaXRpbmc6IGZ1bmN0aW9uKGV2 ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5zdGFydEVkaXRpbmcoZXZlbnQudGFyZ2V0KTsKKyAg ICAgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CisgICAgfSwKKworICAgIF9pc05hbWVFbGVt ZW50OiBmdW5jdGlvbihlbGVtZW50KQorICAgIHsKKyAgICAgICAgcmV0dXJuIGVsZW1lbnQuZW5j bG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygid2Via2l0LWNzcy1wcm9wZXJ0eSIpID09PSB0aGlz Lm5hbWVFbGVtZW50OworICAgIH0sCisKKyAgICBfaXNWYWx1ZUVsZW1lbnQ6IGZ1bmN0aW9uKGVs ZW1lbnQpCisgICAgeworICAgICAgICByZXR1cm4gZWxlbWVudC5lbmNsb3NpbmdOb2RlT3JTZWxm V2l0aENsYXNzKCJ2YWx1ZSIpOworICAgIH0sCisKICAgICBzdGFydEVkaXRpbmc6IGZ1bmN0aW9u KHNlbGVjdEVsZW1lbnQpCiAgICAgewogICAgICAgICAvLyBGSVhNRTogd2UgZG9uJ3QgYWxsb3cg ZWRpdGluZyBvZiBsb25naGFuZCBwcm9wZXJ0aWVzIHVuZGVyIGEgc2hvcnRoYW5kIHJpZ2h0IG5v dy4KQEAgLTE4OTIsNyArMTkyNCwxNSBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVF bGVtZW50LnByb3RvdHlwZSA9IHsKIAogICAgICAgICBmdW5jdGlvbiBibHVyTGlzdGVuZXIoY29u dGV4dCwgZXZlbnQpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHRoaXMuZWRpdGluZ0NvbW1pdHRl ZChudWxsLCBldmVudC50YXJnZXQudGV4dENvbnRlbnQsIGNvbnRleHQucHJldmlvdXNDb250ZW50 LCBjb250ZXh0LCAiIik7CisgICAgICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLl9wYXJl bnRQYW5lLl9tb3VzZURvd25UcmVlRWxlbWVudDsKKyAgICAgICAgICAgIHZhciBtb3ZlRGlyZWN0 aW9uID0gIiI7CisgICAgICAgICAgICBpZiAodHJlZUVsZW1lbnQgPT09IHRoaXMpIHsKKyAgICAg ICAgICAgICAgICBpZiAoaXNFZGl0aW5nTmFtZSAmJiB0aGlzLl9wYXJlbnRQYW5lLl9tb3VzZURv d25UcmVlRWxlbWVudElzVmFsdWUpCisgICAgICAgICAgICAgICAgICAgIG1vdmVEaXJlY3Rpb24g PSAiZm9yd2FyZCI7CisgICAgICAgICAgICAgICAgaWYgKCFpc0VkaXRpbmdOYW1lICYmIHRoaXMu X3BhcmVudFBhbmUuX21vdXNlRG93blRyZWVFbGVtZW50SXNOYW1lKQorICAgICAgICAgICAgICAg ICAgICBtb3ZlRGlyZWN0aW9uID0gImJhY2t3YXJkIjsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIHRoaXMuZWRpdGluZ0NvbW1pdHRlZChudWxsLCBldmVudC50YXJnZXQudGV4dENvbnRlbnQs IGNvbnRleHQucHJldmlvdXNDb250ZW50LCBjb250ZXh0LCBtb3ZlRGlyZWN0aW9uKTsKICAgICAg ICAgfQogCiAgICAgICAgIGRlbGV0ZSB0aGlzLm9yaWdpbmFsUHJvcGVydHlUZXh0OwpAQCAtMjAw NCw2ICsyMDQ0LDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90 b3R5cGUgPSB7CiAKICAgICBlZGl0aW5nRW5kZWQ6IGZ1bmN0aW9uKGNvbnRleHQpCiAgICAgewor ICAgICAgICB0aGlzLl9yZXNldE1vdXNlRG93bkVsZW1lbnQoKTsKICAgICAgICAgaWYgKHRoaXMu X2FwcGx5RnJlZUZsb3dTdHlsZVRleHRFZGl0VGltZXIpCiAgICAgICAgICAgICBjbGVhclRpbWVv dXQodGhpcy5fYXBwbHlGcmVlRmxvd1N0eWxlVGV4dEVkaXRUaW1lcik7CiAK 125108 2012-02-02 04:15:11 -0800 2012-02-02 05:27:49 -0800 [Patch] with lint bug-77624-20120202161510.patch text/plain 6591 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NDYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjI3MGIzNzg2ZDQ4ZTMw OWVkMTZhZDUxMTBiYjE1OTUxMjU2NDVhNy4uMjQ5ZTA0ODNmZTA4NTI1NmMzYzhhY2Q3MWQ3ZDll Y2Y3YzEyYTk0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTAyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBhZGQgZXhwZXJpbWVudCBmb3Igc2luZ2xlIGNsaWNrIHN0eWxlcyBlZGl0aW5nLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc2MjQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU2V0dGluZ3MuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNTZXR0 aW5ncyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0 YWNoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJv dG90eXBlLl9tb3VzZURvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlU cmVlRWxlbWVudC5wcm90b3R5cGUuX3Jlc2V0TW91c2VEb3duRWxlbWVudCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS5zZWxlY3RF bGVtZW50LmNvbnRleHQpOgorCiAyMDEyLTAxLTMxICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNjcmlwdHMgbmF2aWdhdG9y IGJlY29tZXMgZW1wdHkgYWZ0ZXIgInNob3cgZm9sZGVycyIgc2V0dGluZ3MgY2hhbmdlLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKaW5kZXggYjBj NTc2MzhmNmYzMzI4OTMwMzc4MzgwZDNlYWMzM2RjMDQxNWYzOC4uMjNmMGNmYWE4NTJjM2UwMDc3 ODE0ODMxZDJjZTQ0YjgxOGQzMjc2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NldHRpbmdzLmpzCkBAIC0xNzIsNiArMTcyLDcgQEAgV2ViSW5zcGVjdG9yLkV4 cGVyaW1lbnRzU2V0dGluZ3MgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5zb3VyY2VGcmFtZUFsd2F5 c0VkaXRhYmxlID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgic291cmNlRnJhbWVBbHdheXNFZGl0 YWJsZSIsICJNYWtlIHJlc291cmNlcyBhbHdheXMgZWRpdGFibGUiKTsKICAgICB0aGlzLmZyZWVG bG93RE9NRWRpdGluZyA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoImZyZWVGbG93RE9NRWRpdGlu ZyIsICJFbmFibGUgZnJlZSBmbG93IERPTSBlZGl0aW5nIik7CiAgICAgdGhpcy5zaG93TWVtb3J5 Q291bnRlcnMgPSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJzaG93TWVtb3J5Q291bnRlcnMiLCAi U2hvdyBtZW1vcnkgY291bnRlcnMgaW4gVGltZWxpbmUgcGFuZWwiKTsKKyAgICB0aGlzLnNpbmds ZUNsaWNrRWRpdGluZyA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoInNpbmdsZUNsaWNrRWRpdGlu ZyIsICJTaW5nbGUgY2xpY2sgQ1NTIGVkaXRpbmciKTsKIAogICAgIHRoaXMuX2NsZWFuVXBTZXR0 aW5nKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCA1OTQ1OWU0NTljZDdmMzE4ZTQ1YzA0YzY5MzI3 NDdiZDAxZjFlNzA3Li4yYTAzMTIwODJhMTczZjJiNmIwYzM3ODkyNzNlNThiNzVkNDRhMjc2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGVi YXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVz U2lkZWJhclBhbmUuanMKQEAgLTg5OSw4ICs4OTksOSBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9w ZXJ0aWVzU2VjdGlvbiA9IGZ1bmN0aW9uKHBhcmVudFBhbmUsIHN0eWxlUnVsZSwgZWRpdGFibGUs CiAgICAgY2xvc2VCcmFjZS50ZXh0Q29udGVudCA9ICJ9IjsKICAgICB0aGlzLmVsZW1lbnQuYXBw ZW5kQ2hpbGQoY2xvc2VCcmFjZSk7CiAKLSAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQuYWRkRXZl bnRMaXN0ZW5lcigiZGJsY2xpY2siLCB0aGlzLl9oYW5kbGVTZWxlY3RvckRvdWJsZUNsaWNrLmJp bmQodGhpcyksIGZhbHNlKTsKLSAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZGJs Y2xpY2siLCB0aGlzLl9oYW5kbGVFbXB0eVNwYWNlRG91YmxlQ2xpY2suYmluZCh0aGlzKSwgZmFs c2UpOworICAgIHZhciBldmVudE5hbWUgPSBXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5n cy5zaW5nbGVDbGlja0VkaXRpbmcuaXNFbmFibGVkKCkgPyAiY2xpY2siIDogImRibGNsaWNrIjsK KyAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcihldmVudE5hbWUsIHRo aXMuX2hhbmRsZVNlbGVjdG9yRG91YmxlQ2xpY2suYmluZCh0aGlzKSwgZmFsc2UpOworICAgIHRo aXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKGV2ZW50TmFtZSwgdGhpcy5faGFuZGxlRW1wdHlT cGFjZURvdWJsZUNsaWNrLmJpbmQodGhpcyksIGZhbHNlKTsKIAogICAgIHRoaXMuX3BhcmVudFBh bmUgPSBwYXJlbnRQYW5lOwogICAgIHRoaXMuc3R5bGVSdWxlID0gc3R5bGVSdWxlOwpAQCAtMTUy Miw2ICsxNTIzLDI4IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJv dG90eXBlID0gewogICAgIG9uYXR0YWNoOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlz LnVwZGF0ZVRpdGxlKCk7CisgICAgICAgIHZhciBldmVudE5hbWU7CisgICAgICAgIGlmIChXZWJJ bnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5zaW5nbGVDbGlja0VkaXRpbmcuaXNFbmFibGVk KCkpIHsKKyAgICAgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIo Im1vdXNlZG93biIsIHRoaXMuX21vdXNlRG93bi5iaW5kKHRoaXMpKTsKKyAgICAgICAgICAgIHRo aXMubGlzdEl0ZW1FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNldXAiLCB0aGlzLl9yZXNl dE1vdXNlRG93bkVsZW1lbnQuYmluZCh0aGlzKSk7CisgICAgICAgICAgICBldmVudE5hbWUgPSAi Y2xpY2siOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIGV2ZW50TmFtZSA9ICJkYmxjbGlj ayI7CisgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoZXZlbnRO YW1lLCB0aGlzLl9zdGFydEVkaXRpbmcuYmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIF9tb3Vz ZURvd246IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fcGFyZW50UGFuZS5f bW91c2VEb3duVHJlZUVsZW1lbnQgPSB0aGlzOworICAgICAgICB0aGlzLl9wYXJlbnRQYW5lLl9t b3VzZURvd25UcmVlRWxlbWVudElzTmFtZSA9IHRoaXMuX2lzTmFtZUVsZW1lbnQoZXZlbnQudGFy Z2V0KTsKKyAgICAgICAgdGhpcy5fcGFyZW50UGFuZS5fbW91c2VEb3duVHJlZUVsZW1lbnRJc1Zh bHVlID0gdGhpcy5faXNWYWx1ZUVsZW1lbnQoZXZlbnQudGFyZ2V0KTsKKyAgICB9LAorCisgICAg X3Jlc2V0TW91c2VEb3duRWxlbWVudDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgZGVsZXRl IHRoaXMuX3BhcmVudFBhbmUuX21vdXNlRG93blRyZWVFbGVtZW50OworICAgICAgICBkZWxldGUg dGhpcy5fcGFyZW50UGFuZS5fbW91c2VEb3duVHJlZUVsZW1lbnRJc05hbWU7CisgICAgICAgIGRl bGV0ZSB0aGlzLl9wYXJlbnRQYW5lLl9tb3VzZURvd25UcmVlRWxlbWVudElzVmFsdWU7CiAgICAg fSwKIAogICAgIHVwZGF0ZVRpdGxlOiBmdW5jdGlvbigpCkBAIC0xODA5LDEyICsxODMyLDYgQEAg V2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIH0KICAgICB9LAogCi0gICAgb25kYmxjbGljazogZnVuY3Rpb24oZXZlbnQpCi0gICAgewot ICAgICAgICB0aGlzLnN0YXJ0RWRpdGluZyhldmVudC50YXJnZXQpOwotICAgICAgICBldmVudC5z dG9wUHJvcGFnYXRpb24oKTsKLSAgICB9LAotCiAgICAgcmVzdG9yZU5hbWVFbGVtZW50OiBmdW5j dGlvbigpCiAgICAgewogICAgICAgICAvLyBSZXN0b3JlIDxzcGFuIGNsYXNzPSJ3ZWJraXQtY3Nz LXByb3BlcnR5Ij4gaWYgaXQgZG9lc24ndCB5ZXQgZXhpc3Qgb3Igd2FzIGFjY2lkZW50YWxseSBk ZWxldGVkLgpAQCAtMTgyNyw2ICsxODQ0LDIyIEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5 VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmxpc3RJdGVtRWxlbWVudC5p bnNlcnRCZWZvcmUodGhpcy5uYW1lRWxlbWVudCwgdGhpcy5saXN0SXRlbUVsZW1lbnQuZmlyc3RD aGlsZCk7CiAgICAgfSwKIAorICAgIF9zdGFydEVkaXRpbmc6IGZ1bmN0aW9uKGV2ZW50KQorICAg IHsKKyAgICAgICAgdGhpcy5zdGFydEVkaXRpbmcoZXZlbnQudGFyZ2V0KTsKKyAgICAgICAgZXZl bnQuc3RvcFByb3BhZ2F0aW9uKCk7CisgICAgfSwKKworICAgIF9pc05hbWVFbGVtZW50OiBmdW5j dGlvbihlbGVtZW50KQorICAgIHsKKyAgICAgICAgcmV0dXJuIGVsZW1lbnQuZW5jbG9zaW5nTm9k ZU9yU2VsZldpdGhDbGFzcygid2Via2l0LWNzcy1wcm9wZXJ0eSIpID09PSB0aGlzLm5hbWVFbGVt ZW50OworICAgIH0sCisKKyAgICBfaXNWYWx1ZUVsZW1lbnQ6IGZ1bmN0aW9uKGVsZW1lbnQpCisg ICAgeworICAgICAgICByZXR1cm4gZWxlbWVudC5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aENsYXNz KCJ2YWx1ZSIpOworICAgIH0sCisKICAgICBzdGFydEVkaXRpbmc6IGZ1bmN0aW9uKHNlbGVjdEVs ZW1lbnQpCiAgICAgewogICAgICAgICAvLyBGSVhNRTogd2UgZG9uJ3QgYWxsb3cgZWRpdGluZyBv ZiBsb25naGFuZCBwcm9wZXJ0aWVzIHVuZGVyIGEgc2hvcnRoYW5kIHJpZ2h0IG5vdy4KQEAgLTE4 OTIsNyArMTkyNSwxNSBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnBy b3RvdHlwZSA9IHsKIAogICAgICAgICBmdW5jdGlvbiBibHVyTGlzdGVuZXIoY29udGV4dCwgZXZl bnQpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHRoaXMuZWRpdGluZ0NvbW1pdHRlZChudWxsLCBl dmVudC50YXJnZXQudGV4dENvbnRlbnQsIGNvbnRleHQucHJldmlvdXNDb250ZW50LCBjb250ZXh0 LCAiIik7CisgICAgICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLl9wYXJlbnRQYW5lLl9t b3VzZURvd25UcmVlRWxlbWVudDsKKyAgICAgICAgICAgIHZhciBtb3ZlRGlyZWN0aW9uID0gIiI7 CisgICAgICAgICAgICBpZiAodHJlZUVsZW1lbnQgPT09IHRoaXMpIHsKKyAgICAgICAgICAgICAg ICBpZiAoaXNFZGl0aW5nTmFtZSAmJiB0aGlzLl9wYXJlbnRQYW5lLl9tb3VzZURvd25UcmVlRWxl bWVudElzVmFsdWUpCisgICAgICAgICAgICAgICAgICAgIG1vdmVEaXJlY3Rpb24gPSAiZm9yd2Fy ZCI7CisgICAgICAgICAgICAgICAgaWYgKCFpc0VkaXRpbmdOYW1lICYmIHRoaXMuX3BhcmVudFBh bmUuX21vdXNlRG93blRyZWVFbGVtZW50SXNOYW1lKQorICAgICAgICAgICAgICAgICAgICBtb3Zl RGlyZWN0aW9uID0gImJhY2t3YXJkIjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHRoaXMu ZWRpdGluZ0NvbW1pdHRlZChudWxsLCBldmVudC50YXJnZXQudGV4dENvbnRlbnQsIGNvbnRleHQu cHJldmlvdXNDb250ZW50LCBjb250ZXh0LCBtb3ZlRGlyZWN0aW9uKTsKICAgICAgICAgfQogCiAg ICAgICAgIGRlbGV0ZSB0aGlzLm9yaWdpbmFsUHJvcGVydHlUZXh0OwpAQCAtMjAwNCw2ICsyMDQ1 LDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7 CiAKICAgICBlZGl0aW5nRW5kZWQ6IGZ1bmN0aW9uKGNvbnRleHQpCiAgICAgeworICAgICAgICB0 aGlzLl9yZXNldE1vdXNlRG93bkVsZW1lbnQoKTsKICAgICAgICAgaWYgKHRoaXMuX2FwcGx5RnJl ZUZsb3dTdHlsZVRleHRFZGl0VGltZXIpCiAgICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5f YXBwbHlGcmVlRmxvd1N0eWxlVGV4dEVkaXRUaW1lcik7CiAK