86751 2012-05-17 10:32:15 -0700 Web Inspector: implement Go To selector for stylesheet files. 2012-05-17 10:51:51 -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 626689 0 pfeldman 2012-05-17 10:32:15 -0700 StyleSheetOutlineDialog is introduced. 626692 1 142501 pfeldman 2012-05-17 10:36:00 -0700 Created attachment 142501 Patch 626704 2 142501 yurys 2012-05-17 10:47:26 -0700 Comment on attachment 142501 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142501&action=review > Source/WebCore/inspector/front-end/StylesPanel.js:255 > + callback(0, this._rules.length, 0, this._rules.length); 4th parameter should be 1 here. 626713 3 pfeldman 2012-05-17 10:51:51 -0700 Committed r117462: <http://trac.webkit.org/changeset/117462> 142501 2012-05-17 10:36:00 -0700 2012-05-17 10:47:26 -0700 Patch bug-86751-20120517213558.patch text/plain 15469 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NDU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjRjMmEzM2ZkZGM1MmJi N2YzMDdkNGYzMDkyNWU1Y2MwODk2ZTQxMS4uOWQ1YWMyNTI2N2Y4M2U0MmU3ZTU5OTg0MTRjZDI1 NThhN2FlZTNlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDEyLTA1LTE3ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGltcGxlbWVudCBHbyBUbyBzZWxlY3RvciBmb3Igc3R5bGVzaGVldCBmaWxlcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2NzUxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3R5bGVTaGVldE91dGxp bmVEaWFsb2cgaXMgaW50cm9kdWNlZC4KKworICAgICAgICAqIEVuZ2xpc2gubHByb2ovbG9jYWxp emVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbHRlcmVkSXRl bVNlbGVjdGlvbkRpYWxvZy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Njcmlw dHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBl Ll9jcmVhdGVEZWJ1Z1Rvb2xiYXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5l bC5wcm90b3R5cGUuX2NyZWF0ZUJ1dHRvbkFuZFJlZ2lzdGVyU2hvcnRjdXRzKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9zaG93T3V0bGluZURpYWxvZyk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TdHlsZVNoZWV0T3V0bGluZURpYWxvZyk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU3R5bGVTaGVldE91dGxpbmVEaWFsb2cuc2hvdyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU3R5bGVTaGVldE91dGxpbmVEaWFsb2cucHJvdG90eXBlLml0ZW1UaXRsZUF0KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TdHlsZVNoZWV0T3V0bGluZURpYWxvZy5wcm90b3R5cGUuaXRlbUtl eUF0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVNoZWV0T3V0bGluZURpYWxvZy5wcm90 b3R5cGUuaXRlbXNDb3VudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVTaGVldE91dGxp bmVEaWFsb2cucHJvdG90eXBlLnJlcXVlc3RJdGVtcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U3R5bGVTaGVldE91dGxpbmVEaWFsb2cucHJvdG90eXBlLnJlcXVlc3RJdGVtcy5kaWRHZXRTdHls ZVNoZWV0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVNoZWV0T3V0bGluZURpYWxvZy5w cm90b3R5cGUuc2VsZWN0SXRlbSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJi ZWRFZGl0b3JDb250YWluZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9y Q29udGFpbmVyLnByb3RvdHlwZS5fZ2VuZXJhdGVUYWJJZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZS5jdXJyZW50RmlsZSk6CisKKzIwMTIt MDUtMTcgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAg V2ViIEluc3BlY3RvcjogY3JlYXRlIFNvdXJjZUZyYW1lcyB3aXRoIGNvbnRlbnQgcHJvdmlkZXJz LgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY3NDIK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJp bmdzLmpzIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz CmluZGV4IDk2NjU2YWEzODhhMmFlNWE3ZmEzMGQ0MmFlZmJlNmJiZmVlYjJhODMuLjMyNjljOGU3 NTE4ZTdmOTBiMmYxMDkwZjcwM2EyNDMwMmJiYTBjMDIgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gK ZGVsdGEgOTcKemNtWnBoJmlZfEc+eFB0Nj9wJWdjaEZwZHVBWHpsfFptSnxabHQyMDZKTj9QRzsm fj4yT1hiYEFBbDFsamFAIUotCnkkd3RpKmxrWTl6bkxKPyQqV14yKVd9NXw7bHl5JSZXRmF6SHU4 b1UxalVqWExMdTM4el93KlQ4TkNOO2YhWH1qZgoKZGVsdGEgODAKemNtZXdgb3dhUWA+eFB1biRz c31sbE1QYU1DZkI2JGZaMEFOSS0zdXFkZjgyMHUkWDdfZ2U0aT4re0Z5WjNgR28/CmkzPFY0Jmxs TTFeR1pzKGdVdS0lIz5wIyEqSl9BT1Q/RyotJDcxOTlEZyZrKUEKCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxv Zy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsdGVyZWRJdGVtU2Vs ZWN0aW9uRGlhbG9nLmpzCmluZGV4IDg3NmQ4ZmViZTM2Nzk0ZTFlMjg5OTk3MmU3MzI5NjBmMzMz ZjdmM2YuLmJjYzRlN2NiYzQ2Njc0YmU0ZTk0MzMyZDczMWI1NDdiYzNiMzZhYmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsdGVyZWRJdGVtU2VsZWN0 aW9uRGlhbG9nLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmls dGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9nLmpzCkBAIC00ODksMTEgKzQ4OSw2IEBAIFdlYkluc3Bl Y3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5zaG93ID0gZnVuY3Rpb24odmlldywgY29udGVu dFByb3ZpZGVyKQogICAgIFdlYkluc3BlY3Rvci5EaWFsb2cuc2hvdyh2aWV3LmVsZW1lbnQsIGZp bHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZyk7CiB9CiAKLVdlYkluc3BlY3Rvci5KYXZhU2NyaXB0 T3V0bGluZURpYWxvZy5jcmVhdGVTaG9ydGN1dCA9IGZ1bmN0aW9uKCkKLXsKLSAgICByZXR1cm4g V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZURlc2NyaXB0b3IoIm8iLCBXZWJJbnNw ZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllcnMuQ3RybE9yTWV0YSB8IFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5TaGlmdCk7Ci19Ci0KIFdlYkluc3BlY3Rvci5K YXZhU2NyaXB0T3V0bGluZURpYWxvZy5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHBh cmFtIHtudW1iZXJ9IGl0ZW1JbmRleApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA0NGQ2YjNjZmUxYTFiMjRiZWExOTQyYjQ2 NjdiZGM4ODUxODQwODY4Li5kMmZjZjM4YWNjMmJkM2NkZDRhOTZkNzA5NjA3ZDY4NzVhNDQxNzhh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQ YW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQ YW5lbC5qcwpAQCAtNTQsNyArNTQsOCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVu Y3Rpb24odWlTb3VyY2VDb2RlUHJvdmlkZXJGb3JUZXN0KQogICAgIH0KICAgICBXZWJJbnNwZWN0 b3IuR29Ub0xpbmVEaWFsb2cuaW5zdGFsbCh0aGlzLCB2aWV3R2V0dGVyLmJpbmQodGhpcykpOwog Ci0gICAgdGhpcy5kZWJ1Z1Rvb2xiYXIgPSB0aGlzLl9jcmVhdGVEZWJ1Z1Rvb2xiYXIoKTsKKyAg ICB2YXIgaGVscFNlY3Rpb24gPSBXZWJJbnNwZWN0b3Iuc2hvcnRjdXRzU2NyZWVuLnNlY3Rpb24o V2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci5leHBlcmltZW50c1NldHRpbmdzLnNv dXJjZUNvZGVQYW5lbC5pc0VuYWJsZWQoKSA/ICJTb3VyY2UgQ29kZSBQYW5lbCIgOiAiU2NyaXB0 cyBQYW5lbCIpKTsKKyAgICB0aGlzLmRlYnVnVG9vbGJhciA9IHRoaXMuX2NyZWF0ZURlYnVnVG9v bGJhcihoZWxwU2VjdGlvbik7CiAKICAgICBjb25zdCBpbml0aWFsRGVidWdTaWRlYmFyV2lkdGgg PSAyMjU7CiAgICAgY29uc3QgbWF4aW1hbERlYnVnU2lkZWJhcldpZHRoUGVyY2VudCA9IDUwOwpA QCAtMTI2LDE4ICsxMjcsMTcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9u KHVpU291cmNlQ29kZVByb3ZpZGVyRm9yVGVzdCkKICAgICB0aGlzLnNpZGViYXJQYW5lcy5zY29w ZWNoYWluLmV4cGFuZGVkID0gdHJ1ZTsKICAgICB0aGlzLnNpZGViYXJQYW5lcy5qc0JyZWFrcG9p bnRzLmV4cGFuZGVkID0gdHJ1ZTsKIAotICAgIHZhciBoZWxwU2VjdGlvbiA9IFdlYkluc3BlY3Rv ci5zaG9ydGN1dHNTY3JlZW4uc2VjdGlvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjcmlwdHMg UGFuZWwiKSk7CiAgICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnJlZ2lzdGVyU2hvcnRj dXRzKGhlbHBTZWN0aW9uLCB0aGlzLnJlZ2lzdGVyU2hvcnRjdXQuYmluZCh0aGlzKSk7CiAgICAg dmFyIGV2YWx1YXRlSW5Db25zb2xlU2hvcnRjdXQgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5tYWtlRGVzY3JpcHRvcigiZSIsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1v ZGlmaWVycy5TaGlmdCB8IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5D dHJsKTsKICAgICBoZWxwU2VjdGlvbi5hZGRLZXkoZXZhbHVhdGVJbkNvbnNvbGVTaG9ydGN1dC5u YW1lLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkV2YWx1YXRlIHNlbGVjdGlvbiBpbiBjb25zb2xl IikpOwogICAgIHRoaXMucmVnaXN0ZXJTaG9ydGN1dChldmFsdWF0ZUluQ29uc29sZVNob3J0Y3V0 LmtleSwgdGhpcy5fZXZhbHVhdGVTZWxlY3Rpb25JbkNvbnNvbGUuYmluZCh0aGlzKSk7CiAKICAg ICB2YXIgb3BlblJlc291cmNlU2hvcnRjdXQgPSBXZWJJbnNwZWN0b3IuT3BlblJlc291cmNlRGlh bG9nLmNyZWF0ZVNob3J0Y3V0KCk7Ci0gICAgaGVscFNlY3Rpb24uYWRkS2V5KG9wZW5SZXNvdXJj ZVNob3J0Y3V0Lm5hbWUsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiT3BlbiBzY3JpcHQiKSk7Cisg ICAgaGVscFNlY3Rpb24uYWRkS2V5KG9wZW5SZXNvdXJjZVNob3J0Y3V0Lm5hbWUsIFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiT3BlbiBmaWxlIikpOwogCi0gICAgdmFyIHNjcmlwdE91dGxpbmVTaG9y dGN1dCA9IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5jcmVhdGVTaG9ydGN1 dCgpOwotICAgIGhlbHBTZWN0aW9uLmFkZEtleShzY3JpcHRPdXRsaW5lU2hvcnRjdXQubmFtZSwg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJHbyB0byBmdW5jdGlvbiIpKTsKLSAgICB0aGlzLnJlZ2lz dGVyU2hvcnRjdXQoc2NyaXB0T3V0bGluZVNob3J0Y3V0LmtleSwgdGhpcy5fc2hvd0phdmFTY3Jp cHRPdXRsaW5lRGlhbG9nLmJpbmQodGhpcykpOworICAgIHZhciBvdXRsaW5lU2hvcnRjdXQgPSBX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcigibyIsIFdlYkluc3Bl Y3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5DdHJsT3JNZXRhIHwgV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzLlNoaWZ0KTsKKyAgICBoZWxwU2VjdGlvbi5hZGRL ZXkob3V0bGluZVNob3J0Y3V0Lm5hbWUsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiR28gdG8gbWVt YmVyIikpOworICAgIHRoaXMucmVnaXN0ZXJTaG9ydGN1dChvdXRsaW5lU2hvcnRjdXQua2V5LCB0 aGlzLl9zaG93T3V0bGluZURpYWxvZy5iaW5kKHRoaXMpKTsKIAogICAgIHZhciBwYW5lbEVuYWJs ZXJIZWFkaW5nID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJZb3UgbmVlZCB0byBlbmFibGUgZGVi dWdnaW5nIGJlZm9yZSB5b3UgY2FuIHVzZSB0aGUgU2NyaXB0cyBwYW5lbC4iKTsKICAgICB2YXIg cGFuZWxFbmFibGVyRGlzY2xhaW1lciA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRW5hYmxpbmcg ZGVidWdnaW5nIHdpbGwgbWFrZSBzY3JpcHRzIHJ1biBzbG93ZXIuIik7CkBAIC03ODQsNyArNzg0 LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuZXZhbHVhdGVJbkNvbnNvbGUoc2VsZWN0aW9uLnRvU3RyaW5nKCkpOwog ICAgIH0sCiAKLSAgICBfY3JlYXRlRGVidWdUb29sYmFyOiBmdW5jdGlvbigpCisgICAgX2NyZWF0 ZURlYnVnVG9vbGJhcjogZnVuY3Rpb24oc2VjdGlvbikKICAgICB7CiAgICAgICAgIHZhciBkZWJ1 Z1Rvb2xiYXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgZGVidWdU b29sYmFyLmNsYXNzTmFtZSA9ICJzdGF0dXMtYmFyIjsKQEAgLTc5OSw3ICs3OTksNyBAQCBXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgc2hvcnRjdXRzID0g W107CiAgICAgICAgIHNob3J0Y3V0cy5wdXNoKFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 Lm1ha2VEZXNjcmlwdG9yKFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuRjgpKTsK ICAgICAgICAgc2hvcnRjdXRzLnB1c2goV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFr ZURlc2NyaXB0b3IoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5TbGFzaCwgcGxh dGZvcm1TcGVjaWZpY01vZGlmaWVyKSk7Ci0gICAgICAgIHRoaXMucGF1c2VCdXR0b24gPSB0aGlz Ll9jcmVhdGVCdXR0b25BbmRSZWdpc3RlclNob3J0Y3V0cygic2NyaXB0cy1wYXVzZSIsIHRpdGxl LCBoYW5kbGVyLCBzaG9ydGN1dHMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUGF1c2UvQ29udGlu dWUiKSk7CisgICAgICAgIHRoaXMucGF1c2VCdXR0b24gPSB0aGlzLl9jcmVhdGVCdXR0b25BbmRS ZWdpc3RlclNob3J0Y3V0cyhzZWN0aW9uLCAic2NyaXB0cy1wYXVzZSIsIHRpdGxlLCBoYW5kbGVy LCBzaG9ydGN1dHMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUGF1c2UvQ29udGludWUiKSk7CiAg ICAgICAgIGRlYnVnVG9vbGJhci5hcHBlbmRDaGlsZCh0aGlzLnBhdXNlQnV0dG9uKTsKIAogICAg ICAgICAvLyBTdGVwIG92ZXIuCkBAIC04MDgsNyArODA4LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHNob3J0Y3V0cyA9IFtdOwogICAgICAgICBz aG9ydGN1dHMucHVzaChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRv cihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLkYxMCkpOwogICAgICAgICBzaG9y dGN1dHMucHVzaChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLlNpbmdsZVF1b3RlLCBwbGF0Zm9ybVNw ZWNpZmljTW9kaWZpZXIpKTsKLSAgICAgICAgdGhpcy5zdGVwT3ZlckJ1dHRvbiA9IHRoaXMuX2Ny ZWF0ZUJ1dHRvbkFuZFJlZ2lzdGVyU2hvcnRjdXRzKCJzY3JpcHRzLXN0ZXAtb3ZlciIsIHRpdGxl LCBoYW5kbGVyLCBzaG9ydGN1dHMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RlcCBvdmVyIikp OworICAgICAgICB0aGlzLnN0ZXBPdmVyQnV0dG9uID0gdGhpcy5fY3JlYXRlQnV0dG9uQW5kUmVn aXN0ZXJTaG9ydGN1dHMoc2VjdGlvbiwgInNjcmlwdHMtc3RlcC1vdmVyIiwgdGl0bGUsIGhhbmRs ZXIsIHNob3J0Y3V0cywgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGVwIG92ZXIiKSk7CiAgICAg ICAgIGRlYnVnVG9vbGJhci5hcHBlbmRDaGlsZCh0aGlzLnN0ZXBPdmVyQnV0dG9uKTsKIAogICAg ICAgICAvLyBTdGVwIGludG8uCkBAIC04MTcsNyArODE3LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHNob3J0Y3V0cyA9IFtdOwogICAgICAgICBz aG9ydGN1dHMucHVzaChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRv cihXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLkYxMSkpOwogICAgICAgICBzaG9y dGN1dHMucHVzaChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLlNlbWljb2xvbiwgcGxhdGZvcm1TcGVj aWZpY01vZGlmaWVyKSk7Ci0gICAgICAgIHRoaXMuc3RlcEludG9CdXR0b24gPSB0aGlzLl9jcmVh dGVCdXR0b25BbmRSZWdpc3RlclNob3J0Y3V0cygic2NyaXB0cy1zdGVwLWludG8iLCB0aXRsZSwg aGFuZGxlciwgc2hvcnRjdXRzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0ZXAgaW50byIpKTsK KyAgICAgICAgdGhpcy5zdGVwSW50b0J1dHRvbiA9IHRoaXMuX2NyZWF0ZUJ1dHRvbkFuZFJlZ2lz dGVyU2hvcnRjdXRzKHNlY3Rpb24sICJzY3JpcHRzLXN0ZXAtaW50byIsIHRpdGxlLCBoYW5kbGVy LCBzaG9ydGN1dHMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RlcCBpbnRvIikpOwogICAgICAg ICBkZWJ1Z1Rvb2xiYXIuYXBwZW5kQ2hpbGQodGhpcy5zdGVwSW50b0J1dHRvbik7CiAKICAgICAg ICAgLy8gU3RlcCBvdXQuCkBAIC04MjYsNyArODI2LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHNob3J0Y3V0cyA9IFtdOwogICAgICAgICBzaG9y dGN1dHMucHVzaChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvcihX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLkYxMSwgV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQuTW9kaWZpZXJzLlNoaWZ0KSk7CiAgICAgICAgIHNob3J0Y3V0cy5wdXNoKFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9yKFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0LktleXMuU2VtaWNvbG9uLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5Nb2RpZmllcnMuU2hpZnQgfCBwbGF0Zm9ybVNwZWNpZmljTW9kaWZpZXIpKTsKLSAgICAg ICAgdGhpcy5zdGVwT3V0QnV0dG9uID0gdGhpcy5fY3JlYXRlQnV0dG9uQW5kUmVnaXN0ZXJTaG9y dGN1dHMoInNjcmlwdHMtc3RlcC1vdXQiLCB0aXRsZSwgaGFuZGxlciwgc2hvcnRjdXRzLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlN0ZXAgb3V0IikpOworICAgICAgICB0aGlzLnN0ZXBPdXRCdXR0 b24gPSB0aGlzLl9jcmVhdGVCdXR0b25BbmRSZWdpc3RlclNob3J0Y3V0cyhzZWN0aW9uLCAic2Ny aXB0cy1zdGVwLW91dCIsIHRpdGxlLCBoYW5kbGVyLCBzaG9ydGN1dHMsIFdlYkluc3BlY3Rvci5V SVN0cmluZygiU3RlcCBvdXQiKSk7CiAgICAgICAgIGRlYnVnVG9vbGJhci5hcHBlbmRDaGlsZCh0 aGlzLnN0ZXBPdXRCdXR0b24pOwogCiAgICAgICAgIHRoaXMuX3RvZ2dsZUJyZWFrcG9pbnRzQnV0 dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJEZWFjdGl2YXRlIGFsbCBicmVha3BvaW50cy4iKSwgInRvZ2dsZS1icmVha3BvaW50cyIp OwpAQCAtODQxLDcgKzg0MSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICByZXR1cm4gZGVidWdUb29sYmFyOwogICAgIH0sCiAKLSAgICBfY3JlYXRl QnV0dG9uQW5kUmVnaXN0ZXJTaG9ydGN1dHM6IGZ1bmN0aW9uKGJ1dHRvbklkLCBidXR0b25UaXRs ZSwgaGFuZGxlciwgc2hvcnRjdXRzLCBzaG9ydGN1dERlc2NyaXB0aW9uKQorICAgIF9jcmVhdGVC dXR0b25BbmRSZWdpc3RlclNob3J0Y3V0czogZnVuY3Rpb24oc2VjdGlvbiwgYnV0dG9uSWQsIGJ1 dHRvblRpdGxlLCBoYW5kbGVyLCBzaG9ydGN1dHMsIHNob3J0Y3V0RGVzY3JpcHRpb24pCiAgICAg ewogICAgICAgICB2YXIgYnV0dG9uID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9uIik7 CiAgICAgICAgIGJ1dHRvbi5jbGFzc05hbWUgPSAic3RhdHVzLWJhci1pdGVtIjsKQEAgLTg1Niw3 ICs4NTYsNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHRoaXMucmVnaXN0ZXJTaG9ydGN1dChzaG9ydGN1dHNbaV0ua2V5LCBoYW5kbGVyKTsK ICAgICAgICAgICAgIHNob3J0Y3V0TmFtZXMucHVzaChzaG9ydGN1dHNbaV0ubmFtZSk7CiAgICAg ICAgIH0KLSAgICAgICAgdmFyIHNlY3Rpb24gPSBXZWJJbnNwZWN0b3Iuc2hvcnRjdXRzU2NyZWVu LnNlY3Rpb24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTY3JpcHRzIFBhbmVsIikpOwogICAgICAg ICBzZWN0aW9uLmFkZEFsdGVybmF0ZUtleXMoc2hvcnRjdXROYW1lcywgc2hvcnRjdXREZXNjcmlw dGlvbik7CiAKICAgICAgICAgcmV0dXJuIGJ1dHRvbjsKQEAgLTk0Niw5ICs5NDUsMTYgQEAgV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuc2lkZWJh clBhbmVzLndhdGNoRXhwcmVzc2lvbnMuYWRkRXhwcmVzc2lvbihleHByZXNzaW9uKTsKICAgICB9 LAogCi0gICAgX3Nob3dKYXZhU2NyaXB0T3V0bGluZURpYWxvZzogZnVuY3Rpb24oKQorICAgIF9z aG93T3V0bGluZURpYWxvZzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgIFdlYkluc3BlY3Rv ci5KYXZhU2NyaXB0T3V0bGluZURpYWxvZy5zaG93KHRoaXMudmlzaWJsZVZpZXcsIHRoaXMudmlz aWJsZVZpZXcpOworICAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IHRoaXMuX2VkaXRvckNvbnRh aW5lci5jdXJyZW50RmlsZSgpOworICAgICAgICAgaWYgKCF1aVNvdXJjZUNvZGUpCisgICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgICBpZiAodWlTb3VyY2VDb2RlIGluc3RhbmNlb2YgV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UpCisgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkph dmFTY3JpcHRPdXRsaW5lRGlhbG9nLnNob3codGhpcy52aXNpYmxlVmlldywgdWlTb3VyY2VDb2Rl KTsKKyAgICAgICAgIGVsc2UgaWYgKHVpU291cmNlQ29kZSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rv ci5TdHlsZVNvdXJjZSkKKyAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuU3R5bGVTaGVldE91dGxp bmVEaWFsb2cuc2hvdyh0aGlzLnZpc2libGVWaWV3LCAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5T dHlsZVNvdXJjZX0gKi8gdWlTb3VyY2VDb2RlKTsKICAgICB9LAogCiAgICAgX2luc3RhbGxEZWJ1 Z2dlclNpZGViYXJDb250cm9sbGVyOiBmdW5jdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qcwppbmRleCAwNWQ0MjBhMTkxNzU1Zjlj ZDBmNjk4ZWMxYjdiNTI4ZWI1M2QxMjkzLi4zZTlhMjcyMmQ4NjFhNmE0ZmQ1ZWEzYzQ0NTA1ZGYw YWU3ZWY1YzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1N0eWxlc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U3R5bGVzUGFuZWwuanMKQEAgLTE2MSwzICsxNjEsMTExIEBAIFdlYkluc3BlY3Rvci5TdHlsZVNv dXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKIH0KIAogV2ViSW5zcGVjdG9yLlN0eWxlU291cmNlRnJh bWUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5 cGU7CisKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAaW1wbGVtZW50cyB7V2ViSW5zcGVjdG9y LlNlbGVjdGlvbkRpYWxvZ0NvbnRlbnRQcm92aWRlcn0KKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9y LlZpZXd9IHZpZXcKKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlN0eWxlU291cmNlfSBzdHlsZVNv dXJjZQorICovCitXZWJJbnNwZWN0b3IuU3R5bGVTaGVldE91dGxpbmVEaWFsb2cgPSBmdW5jdGlv bih2aWV3LCBzdHlsZVNvdXJjZSkKK3sKKyAgICBXZWJJbnNwZWN0b3IuU2VsZWN0aW9uRGlhbG9n Q29udGVudFByb3ZpZGVyLmNhbGwodGhpcyk7CisKKyAgICB0aGlzLl9ydWxlcyA9IFtdOworICAg IHRoaXMuX3ZpZXcgPSB2aWV3OworICAgIHRoaXMuX3N0eWxlU291cmNlID0gc3R5bGVTb3VyY2U7 Cit9CisKKy8qKgorICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVmlld30gdmlldworICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuU3R5bGVTb3VyY2V9IHN0eWxlU291cmNlCisgKi8KK1dlYkluc3BlY3Rv ci5TdHlsZVNoZWV0T3V0bGluZURpYWxvZy5zaG93ID0gZnVuY3Rpb24odmlldywgc3R5bGVTb3Vy Y2UpCit7CisgICAgaWYgKFdlYkluc3BlY3Rvci5EaWFsb2cuY3VycmVudEluc3RhbmNlKCkpCisg ICAgICAgIHJldHVybiBudWxsOworICAgIHZhciBkZWxlZ2F0ZSA9IG5ldyBXZWJJbnNwZWN0b3Iu U3R5bGVTaGVldE91dGxpbmVEaWFsb2codmlldywgc3R5bGVTb3VyY2UpOworICAgIHZhciBmaWx0 ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cgPSBuZXcgV2ViSW5zcGVjdG9yLkZpbHRlcmVkSXRlbVNl bGVjdGlvbkRpYWxvZyhkZWxlZ2F0ZSk7CisgICAgV2ViSW5zcGVjdG9yLkRpYWxvZy5zaG93KHZp ZXcuZWxlbWVudCwgZmlsdGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9nKTsKK30KKworV2ViSW5zcGVj dG9yLlN0eWxlU2hlZXRPdXRsaW5lRGlhbG9nLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAg KiBAcGFyYW0ge251bWJlcn0gaXRlbUluZGV4CisgICAgICogQHJldHVybiB7c3RyaW5nfQorICAg ICAqLworICAgIGl0ZW1UaXRsZUF0OiBmdW5jdGlvbihpdGVtSW5kZXgpCisgICAgeworICAgICAg ICByZXR1cm4gdGhpcy5fcnVsZXNbaXRlbUluZGV4XS5zZWxlY3RvclRleHQ7CisgICAgfSwKKwor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7bnVtYmVyfSBpdGVtSW5kZXgKKyAgICAgKiBAcmV0dXJu IHtzdHJpbmd9CisgICAgICovCisgICAgaXRlbUtleUF0OiBmdW5jdGlvbihpdGVtSW5kZXgpCisg ICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcnVsZXNbaXRlbUluZGV4XS5zZWxlY3RvclRleHQ7 CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge251bWJlcn0KKyAgICAgKi8KKyAg ICBpdGVtc0NvdW50OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcnVs ZXMubGVuZ3RoOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKG51 bWJlciwgbnVtYmVyLCBudW1iZXIsIG51bWJlcil9IGNhbGxiYWNrCisgICAgICovCisgICAgcmVx dWVzdEl0ZW1zOiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAgIGZ1bmN0aW9uIGRp ZEdldEFsbFN0eWxlU2hlZXRzKGVycm9yLCBpbmZvcykKKyAgICAgICAgeworICAgICAgICAgICAg aWYgKGVycm9yKSB7CisgICAgICAgICAgICAgICAgY2FsbGJhY2soMCwgMCwgMCwgMCk7CisgICAg ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAKKyAgICAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgaW5mb3MubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgICAgICB2YXIg aW5mbyA9IGluZm9zW2ldOworICAgICAgICAgICAgICAgIGlmIChpbmZvLnNvdXJjZVVSTCA9PT0g dGhpcy5fc3R5bGVTb3VyY2UuY29udGVudFVSTCgpKSB7CisgICAgICAgICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LmNyZWF0ZUZvcklkKGluZm8uc3R5bGVTaGVldElkLCBk aWRHZXRTdHlsZVNoZWV0LmJpbmQodGhpcykpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICAgICAgY2FsbGJhY2so MCwgMCwgMCwgMCk7CisgICAgICAgIH0KKworICAgICAgICBDU1NBZ2VudC5nZXRBbGxTdHlsZVNo ZWV0cyhkaWRHZXRBbGxTdHlsZVNoZWV0cy5iaW5kKHRoaXMpKTsKKworICAgICAgICAvKioKKyAg ICAgICAgICogQHBhcmFtIHs/V2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXR9IHN0eWxlU2hlZXQK KyAgICAgICAgICovCisgICAgICAgIGZ1bmN0aW9uIGRpZEdldFN0eWxlU2hlZXQoc3R5bGVTaGVl dCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKCFzdHlsZVNoZWV0KSB7CisgICAgICAgICAg ICAgICAgY2FsbGJhY2soMCwgMCwgMCwgMCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICAgICAgfQorCisgICAgICAgICAgICB0aGlzLl9ydWxlcyA9IHN0eWxlU2hlZXQucnVsZXM7 CisgICAgICAgICAgICBjYWxsYmFjaygwLCB0aGlzLl9ydWxlcy5sZW5ndGgsIDAsIHRoaXMuX3J1 bGVzLmxlbmd0aCk7CisgICAgICAgIH0KKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFt IHtudW1iZXJ9IGl0ZW1JbmRleAorICAgICAqLworICAgIHNlbGVjdEl0ZW06IGZ1bmN0aW9uKGl0 ZW1JbmRleCkKKyAgICB7CisgICAgICAgIHZhciBsaW5lTnVtYmVyID0gdGhpcy5fcnVsZXNbaXRl bUluZGV4XS5zb3VyY2VMaW5lOworICAgICAgICBpZiAoIWlzTmFOKGxpbmVOdW1iZXIpICYmIGxp bmVOdW1iZXIgPj0gMCkKKyAgICAgICAgICAgIHRoaXMuX3ZpZXcuaGlnaGxpZ2h0TGluZShsaW5l TnVtYmVyKTsKKyAgICAgICAgdGhpcy5fdmlldy5mb2N1cygpOworICAgIH0KK30KKworV2ViSW5z cGVjdG9yLlN0eWxlU2hlZXRPdXRsaW5lRGlhbG9nLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJ bnNwZWN0b3IuU2VsZWN0aW9uRGlhbG9nQ29udGVudFByb3ZpZGVyLnByb3RvdHlwZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkRWRpdG9yQ29u dGFpbmVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0 b3JDb250YWluZXIuanMKaW5kZXggNTY5MDlkNWRjMDE2M2YyMmQyMjE3N2Y5M2NiY2Q5ZGJmZjUz YzQxZi4uNThjMGUxOTM0MjllZDc1NDgxYTRmMTEyNTU1MzRjZGRjYjZjNjliOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0b3JDb250YWlu ZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0 b3JDb250YWluZXIuanMKQEAgLTM0Niw2ICszNDYsMTQgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZEVk aXRvckNvbnRhaW5lci5wcm90b3R5cGUgPSB7CiAgICAgX2dlbmVyYXRlVGFiSWQ6IGZ1bmN0aW9u KCkKICAgICB7CiAgICAgICAgIHJldHVybiAidGFiXyIgKyAoV2ViSW5zcGVjdG9yLlRhYmJlZEVk aXRvckNvbnRhaW5lci5fdGFiSWQrKyk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1 cm4ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQorICAgICAqLworICAg IGN1cnJlbnRGaWxlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fY3Vy cmVudEZpbGU7CiAgICAgfQogfQogCg==