113496 2013-03-28 03:28:52 -0700 Web Inspector: [Cookies] CookiesTable should integrate with DataGrid context menu. 2013-03-28 23:29:45 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 eustas eustas apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 865300 0 eustas 2013-03-28 03:28:52 -0700 In recent path CookiesTable added context menu listener on DataGrid element to override behavior. Integrating with DataGrid instead of overriding looks better. Actually that patch is reduced version of patch that was waiting for better back-end cookies management. 865304 1 195517 eustas 2013-03-28 03:34:40 -0700 Created attachment 195517 Patch 865355 2 195517 pfeldman 2013-03-28 05:02:11 -0700 Comment on attachment 195517 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195517&action=review > Source/WebCore/inspector/front-end/CookiesTable.js:281 > + _refresh: function() { { on the next line. > Source/WebCore/inspector/front-end/CookiesTable.js:282 > + this._refreshCallback && this._refreshCallback(); We never do this, please use explicit if. > Source/WebCore/inspector/front-end/DataGrid.js:33 > + * @param {?function(!WebInspector.ContextMenu, WebInspector.DataGridNode)=} contextMenuCallback We don't use nullable optional fields. Please remove ? from here and above. 865991 3 195517 eustas 2013-03-28 22:28:21 -0700 Comment on attachment 195517 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195517&action=review >> Source/WebCore/inspector/front-end/CookiesTable.js:281 >> + _refresh: function() { > > { on the next line. oops. fixed >> Source/WebCore/inspector/front-end/CookiesTable.js:282 >> + this._refreshCallback && this._refreshCallback(); > > We never do this, please use explicit if. Done. >> Source/WebCore/inspector/front-end/DataGrid.js:33 >> + * @param {?function(!WebInspector.ContextMenu, WebInspector.DataGridNode)=} contextMenuCallback > > We don't use nullable optional fields. Please remove ? from here and above. OK 865993 4 195697 eustas 2013-03-28 22:33:12 -0700 Created attachment 195697 Patch 866000 5 195697 webkit.review.bot 2013-03-28 23:29:42 -0700 Comment on attachment 195697 Patch Clearing flags on attachment: 195697 Committed r147198: <http://trac.webkit.org/changeset/147198> 866001 6 webkit.review.bot 2013-03-28 23:29:45 -0700 All reviewed patches have been landed. Closing bug. 195517 2013-03-28 03:34:40 -0700 2013-03-28 22:33:08 -0700 Patch bug-113496-20130328143438.patch text/plain 6047 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmQ1NTlmNzJmMWIyNzA1 ZDQ2MzQ5YWNhY2FhNWE4NmY1NDM4YjVlYy4uZGYzOTQwYzM3MTMxZGQ0MjA4ZmRhYWJiZjA3Zjg4 N2UyNDJkMWZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAzLTI4ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtDb29raWVzXSBDb29raWVzVGFibGUgc2hvdWxkIGludGVncmF0ZSB3aXRoIERhdGFH cmlkIGNvbnRleHQgbWVudS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMzQ5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEludGVncmF0ZSBDb29raWVzVGFibGUgd2l0aCBEYXRhR3JpZCBjb250ZXh0IG1l bnUKKyAgICAgICAgaW5zdGVhZCBvZiBvdmVycmlkaW5nIGl0LgorCisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanM6CisgICAgICAgIFBhc3MgY29udGV4dCBtZW51 IGNhbGxiYWNrIHRvIERhdGFHcmlkIGNvbnN0cnVjdG9yLgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvRGF0YUdyaWQuanM6CisgICAgICAgIEFkZGVkIGNvbnRleHQgbWVudSBjYWxsYmFj ayBjb25zdHJ1Y3RvciBwYXJhbWV0ZXIuCisKIDIwMTMtMDMtMjcgIFNpbW9uIEZyYXNlciAgPHNp bW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgd2F5IHRvIHVwZGF0ZSBHcmFw aGljc0xheWVyQ0EgdmlzaWJsZVJlY3RzIHdpdGhvdXQgaGF2aW5nIHRvIGRvIGEgZmx1c2gKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llc1RhYmxl LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanMK aW5kZXggNDMwMGU1MzM3NGU2NTg3M2RmNzNkNzkzZmFlN2E2NDNkOWViZTIzNy4uYjUwNWQzMGQz NWZiZmIzZDZkNjQ3NjU5YTNhMTU1OWYyZmQ4ODBmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanMKQEAgLTU1LDExICs1NSw5IEBA IFdlYkluc3BlY3Rvci5Db29raWVzVGFibGUgPSBmdW5jdGlvbihleHBhbmRhYmxlLCByZWZyZXNo Q2FsbGJhY2ssIHNlbGVjdGVkQ2FsbGJhCiAgICAgXTsKIAogICAgIGlmIChyZWFkT25seSkKLSAg ICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlkKGNvbHVtbnMs IG51bGwsIG51bGwsIHJlZnJlc2hDYWxsYmFjayk7Ci0gICAgZWxzZSB7CiAgICAgICAgIHRoaXMu X2RhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5EYXRhR3JpZChjb2x1bW5zKTsKLSAgICAgICAg dGhpcy5fZGF0YUdyaWQuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRo aXMuX2hhbmRsZUNvbnRleHRNZW51RXZlbnQuYmluZCh0aGlzKSwgdHJ1ZSk7Ci0gICAgfQorICAg IGVsc2UKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlk KGNvbHVtbnMsIG51bGwsIHRoaXMuX29uRGVsZXRlQ29va2llLmJpbmQodGhpcyksIHJlZnJlc2hD YWxsYmFjaywgdGhpcy5fb25Db250ZXh0TWVudS5iaW5kKHRoaXMpKTsKIAogICAgIHRoaXMuX2Rh dGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLkV2ZW50cy5Tb3J0 aW5nQ2hhbmdlZCwgdGhpcy5fcmVidWlsZFRhYmxlLCB0aGlzKTsKIApAQCAtODUsMzUgKzgzLDIy IEBAIFdlYkluc3BlY3Rvci5Db29raWVzVGFibGUucHJvdG90eXBlID0gewogICAgIF9jbGVhckFu ZFJlZnJlc2g6IGZ1bmN0aW9uKGRvbWFpbikKICAgICB7CiAgICAgICAgIHRoaXMuY2xlYXIoZG9t YWluKTsKLSAgICAgICAgaWYgKHRoaXMuX3JlZnJlc2hDYWxsYmFjaykKLSAgICAgICAgICAgIHRo aXMuX3JlZnJlc2hDYWxsYmFjaygpOworICAgICAgICB0aGlzLl9yZWZyZXNoKCk7CiAgICAgfSwK IAotICAgIF9oYW5kbGVDb250ZXh0TWVudUV2ZW50OiBmdW5jdGlvbihldmVudCkKKyAgICAvKioK KyAgICAgKiBAcGFyYW0geyFXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnV9IGNvbnRleHRNZW51Cisg ICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlfSBub2RlCisgICAgICovCisg ICAgX29uQ29udGV4dE1lbnU6IGZ1bmN0aW9uKGNvbnRleHRNZW51LCBub2RlKQogICAgIHsKLSAg ICAgICAgdmFyIGdyaWROb2RlID0gdGhpcy5fZGF0YUdyaWQuZGF0YUdyaWROb2RlRnJvbU5vZGUo ZXZlbnQudGFyZ2V0KTsKLQotICAgICAgICBpZiAoIWdyaWROb2RlKQorICAgICAgICBpZiAobm9k ZSA9PT0gdGhpcy5fZGF0YUdyaWQuY3JlYXRpb25Ob2RlKQogICAgICAgICAgICAgcmV0dXJuOwot Ci0gICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUo ZXZlbnQpOwotICAgICAgICB2YXIgY29va2llID0gZ3JpZE5vZGUuY29va2llOwotCi0gICAgICAg IGlmICh0aGlzLl9yZWZyZXNoQ2FsbGJhY2spCi0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBl bmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVmcmVzaCIpLCB0aGlzLl9yZWZyZXNoQ2Fs bGJhY2spOwotCi0gICAgICAgIGlmIChjb29raWUpIHsKLSAgICAgICAgICAgIGNvbnRleHRNZW51 LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZWxldGUiKSwgdGhpcy5fb25EZWxl dGVDb29raWUuYmluZCh0aGlzLCBncmlkTm9kZSkpOwotICAgICAgICAgICAgY29udGV4dE1lbnUu YXBwZW5kU2VwYXJhdG9yKCk7Ci0gICAgICAgICAgICB2YXIgY29va2llRG9tYWluID0gY29va2ll LmRvbWFpbigpOwotICAgICAgICAgICAgCi0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJ dGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRp dGxlcygpID8gIkNsZWFyIGFsbCBmcm9tIFwiJXNcIiIgOiAiQ2xlYXIgQWxsIGZyb20gXCIlc1wi IiwgY29va2llRG9tYWluKSwgdGhpcy5fY2xlYXJBbmRSZWZyZXNoLmJpbmQodGhpcywgY29va2ll RG9tYWluKSk7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5k U2VwYXJhdG9yKCk7Ci0KKyAgICAgICAgdmFyIGNvb2tpZSA9IG5vZGUuY29va2llOworICAgICAg ICB2YXIgZG9tYWluID0gY29va2llLmRvbWFpbigpOworICAgICAgICBpZiAoZG9tYWluKQorICAg ICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2Vi SW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJDbGVhciBhbGwgZnJvbSBcIiVz XCIiIDogIkNsZWFyIEFsbCBmcm9tIFwiJXNcIiIsIGRvbWFpbiksIHRoaXMuX2NsZWFyQW5kUmVm cmVzaC5iaW5kKHRoaXMsIGRvbWFpbikpOwogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVt KFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxl cygpID8gIkNsZWFyIGFsbCIgOiAiQ2xlYXIgQWxsIiksIHRoaXMuX2NsZWFyQW5kUmVmcmVzaC5i aW5kKHRoaXMsIG51bGwpKTsKLQotICAgICAgICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAgfSwK IAogICAgIC8qKgpAQCAtMjkwLDggKzI3NSwxMSBAQCBXZWJJbnNwZWN0b3IuQ29va2llc1RhYmxl LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKG5laWdoYm91cikKICAgICAgICAgICAgIHRoaXMu X25leHRTZWxlY3RlZENvb2tpZSA9IG5laWdoYm91ci5jb29raWU7CiAgICAgICAgIGNvb2tpZS5y ZW1vdmUoKTsKLSAgICAgICAgaWYgKHRoaXMuX3JlZnJlc2hDYWxsYmFjaykKLSAgICAgICAgICAg IHRoaXMuX3JlZnJlc2hDYWxsYmFjaygpOworICAgICAgICB0aGlzLl9yZWZyZXNoKCk7CisgICAg fSwKKworICAgIF9yZWZyZXNoOiBmdW5jdGlvbigpIHsKKyAgICAgICAgdGhpcy5fcmVmcmVzaENh bGxiYWNrICYmIHRoaXMuX3JlZnJlc2hDYWxsYmFjaygpOwogICAgIH0sCiAKICAgICBfX3Byb3Rv X186IFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMKaW5kZXggNjdkZjM5YTc1YjNmNjg0MmUyZDE2MTQx OWExYTdmM2I3N2Y5MDYxMi4uYjFhZWMyNDAyNTBjZDM5NDliZjFlMmJkYjQwMWYzNTYwMjc1NGZj MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3Jp ZC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpz CkBAIC0zMCw4ICszMCw5IEBACiAgKiBAcGFyYW0gez9mdW5jdGlvbihXZWJJbnNwZWN0b3IuRGF0 YUdyaWROb2RlLCBzdHJpbmcsIHN0cmluZywgc3RyaW5nKT19IGVkaXRDYWxsYmFjawogICogQHBh cmFtIHs/ZnVuY3Rpb24oV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZSk9fSBkZWxldGVDYWxsYmFj awogICogQHBhcmFtIHs/ZnVuY3Rpb24oKT19IHJlZnJlc2hDYWxsYmFjaworICogQHBhcmFtIHs/ ZnVuY3Rpb24oIVdlYkluc3BlY3Rvci5Db250ZXh0TWVudSwgV2ViSW5zcGVjdG9yLkRhdGFHcmlk Tm9kZSk9fSBjb250ZXh0TWVudUNhbGxiYWNrCiAgKi8KLVdlYkluc3BlY3Rvci5EYXRhR3JpZCA9 IGZ1bmN0aW9uKGNvbHVtbnNBcnJheSwgZWRpdENhbGxiYWNrLCBkZWxldGVDYWxsYmFjaywgcmVm cmVzaENhbGxiYWNrKQorV2ViSW5zcGVjdG9yLkRhdGFHcmlkID0gZnVuY3Rpb24oY29sdW1uc0Fy cmF5LCBlZGl0Q2FsbGJhY2ssIGRlbGV0ZUNhbGxiYWNrLCByZWZyZXNoQ2FsbGJhY2ssIGNvbnRl eHRNZW51Q2FsbGJhY2spCiB7CiAgICAgV2ViSW5zcGVjdG9yLlZpZXcuY2FsbCh0aGlzKTsKICAg ICB0aGlzLnJlZ2lzdGVyUmVxdWlyZWRDU1MoImRhdGFHcmlkLmNzcyIpOwpAQCAtNTksNiArNjAs NyBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBmdW5jdGlvbihjb2x1bW5zQXJyYXksIGVkaXRD YWxsYmFjaywgZGVsZXRlQ2FsbGJhY2ssIHJlZgogICAgIHRoaXMuX2VkaXRDYWxsYmFjayA9IGVk aXRDYWxsYmFjazsKICAgICB0aGlzLl9kZWxldGVDYWxsYmFjayA9IGRlbGV0ZUNhbGxiYWNrOwog ICAgIHRoaXMuX3JlZnJlc2hDYWxsYmFjayA9IHJlZnJlc2hDYWxsYmFjazsKKyAgICB0aGlzLl9j b250ZXh0TWVudUNhbGxiYWNrID0gY29udGV4dE1lbnVDYWxsYmFjazsKIAogICAgIHRoaXMuX3Nj cm9sbENvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHRoaXMu X3Njcm9sbENvbnRhaW5lci5jbGFzc05hbWUgPSAiZGF0YS1jb250YWluZXIiOwpAQCAtOTQxLDYg Kzk0Myw4IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICB9CiAgICAgICAgICAgICBpZiAodGhpcy5fZGVsZXRlQ2FsbGJhY2sgJiYgZ3JpZE5vZGUgIT09 IHRoaXMuY3JlYXRpb25Ob2RlKQogICAgICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0 ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZWxldGUiKSwgdGhpcy5fZGVsZXRlQ2FsbGJhY2su YmluZCh0aGlzLCBncmlkTm9kZSkpOworICAgICAgICAgICAgaWYgKHRoaXMuX2NvbnRleHRNZW51 Q2FsbGJhY2spCisgICAgICAgICAgICAgICAgdGhpcy5fY29udGV4dE1lbnVDYWxsYmFjayhjb250 ZXh0TWVudSwgZ3JpZE5vZGUpOwogICAgICAgICB9CiAKICAgICAgICAgY29udGV4dE1lbnUuc2hv dygpOwo= 195697 2013-03-28 22:33:12 -0700 2013-03-28 23:29:41 -0700 Patch bug-113496-20130329093308.patch text/plain 6252 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzA4MmMxNzhhOWJhMjE2 NmM3YjBiY2MyOWRiZmQzMzUwMmJhNzMyNC4uMDBhMDA1N2Q0ZGNjNTg5ODlkMGU4ZGNkMzYyNDUz NDU4ZjE3YzgzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAzLTI4ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtDb29raWVzXSBDb29raWVzVGFibGUgc2hvdWxkIGludGVncmF0ZSB3aXRoIERhdGFH cmlkIGNvbnRleHQgbWVudS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMzQ5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEludGVncmF0ZSBDb29raWVzVGFibGUgd2l0aCBEYXRhR3JpZCBjb250ZXh0IG1l bnUKKyAgICAgICAgaW5zdGVhZCBvZiBvdmVycmlkaW5nIGl0LgorCisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanM6CisgICAgICAgIFBhc3MgY29udGV4dCBtZW51 IGNhbGxiYWNrIHRvIERhdGFHcmlkIGNvbnN0cnVjdG9yLgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvRGF0YUdyaWQuanM6CisgICAgICAgIEFkZGVkIGNvbnRleHQgbWVudSBjYWxsYmFj ayBjb25zdHJ1Y3RvciBwYXJhbWV0ZXIuIEZpeGVkIEpTRG9jLgorCiAyMDEzLTAzLTI4ICBQaGls aXAgUm9nZXJzICA8cGRyQGdvb2dsZS5jb20+CiAKICAgICAgICAgRml4IGNvbXBpbGVyIHdhcm5p bmcgaW4gSURCVHJhbnNhY3Rpb246Om1vZGVUb1N0cmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZXNUYWJsZS5qcwppbmRleCBkYmI3NWM0ZGU2MTJk OTIwZTdmODAzNDA3ZjA0Mzc3NTRhMTU4ZGY4Li5kZjA3NTE0ZDVlNGU3YzFjMzA4YjY3YjVmYjQy NjUyNTAzNWYyZDg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0Nvb2tpZXNUYWJsZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0Nvb2tpZXNUYWJsZS5qcwpAQCAtNTUsMTEgKzU1LDkgQEAgV2ViSW5zcGVjdG9yLkNvb2tp ZXNUYWJsZSA9IGZ1bmN0aW9uKGV4cGFuZGFibGUsIHJlZnJlc2hDYWxsYmFjaywgc2VsZWN0ZWRD YWxsYmEKICAgICBdOwogCiAgICAgaWYgKHJlYWRPbmx5KQotICAgICAgICB0aGlzLl9kYXRhR3Jp ZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucywgbnVsbCwgbnVsbCwgcmVmcmVz aENhbGxiYWNrKTsKLSAgICBlbHNlIHsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2Vi SW5zcGVjdG9yLkRhdGFHcmlkKGNvbHVtbnMpOwotICAgICAgICB0aGlzLl9kYXRhR3JpZC5lbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5faGFuZGxlQ29udGV4dE1l bnVFdmVudC5iaW5kKHRoaXMpLCB0cnVlKTsKLSAgICB9CisgICAgZWxzZQorICAgICAgICB0aGlz Ll9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucywgdW5kZWZpbmVk LCB0aGlzLl9vbkRlbGV0ZUNvb2tpZS5iaW5kKHRoaXMpLCByZWZyZXNoQ2FsbGJhY2ssIHRoaXMu X29uQ29udGV4dE1lbnUuYmluZCh0aGlzKSk7CiAKICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudHMuU29ydGluZ0NoYW5nZWQsIHRo aXMuX3JlYnVpbGRUYWJsZSwgdGhpcyk7CiAKQEAgLTg1LDM1ICs4MywyMiBAQCBXZWJJbnNwZWN0 b3IuQ29va2llc1RhYmxlLnByb3RvdHlwZSA9IHsKICAgICBfY2xlYXJBbmRSZWZyZXNoOiBmdW5j dGlvbihkb21haW4pCiAgICAgewogICAgICAgICB0aGlzLmNsZWFyKGRvbWFpbik7Ci0gICAgICAg IGlmICh0aGlzLl9yZWZyZXNoQ2FsbGJhY2spCi0gICAgICAgICAgICB0aGlzLl9yZWZyZXNoQ2Fs bGJhY2soKTsKKyAgICAgICAgdGhpcy5fcmVmcmVzaCgpOwogICAgIH0sCiAKLSAgICBfaGFuZGxl Q29udGV4dE1lbnVFdmVudDogZnVuY3Rpb24oZXZlbnQpCisgICAgLyoqCisgICAgICogQHBhcmFt IHshV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51fSBjb250ZXh0TWVudQorICAgICAqIEBwYXJhbSB7 V2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZX0gbm9kZQorICAgICAqLworICAgIF9vbkNvbnRleHRN ZW51OiBmdW5jdGlvbihjb250ZXh0TWVudSwgbm9kZSkKICAgICB7Ci0gICAgICAgIHZhciBncmlk Tm9kZSA9IHRoaXMuX2RhdGFHcmlkLmRhdGFHcmlkTm9kZUZyb21Ob2RlKGV2ZW50LnRhcmdldCk7 Ci0KLSAgICAgICAgaWYgKCFncmlkTm9kZSkKKyAgICAgICAgaWYgKG5vZGUgPT09IHRoaXMuX2Rh dGFHcmlkLmNyZWF0aW9uTm9kZSkKICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB2YXIg Y29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KGV2ZW50KTsKLSAgICAg ICAgdmFyIGNvb2tpZSA9IGdyaWROb2RlLmNvb2tpZTsKLQotICAgICAgICBpZiAodGhpcy5fcmVm cmVzaENhbGxiYWNrKQotICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlJlZnJlc2giKSwgdGhpcy5fcmVmcmVzaENhbGxiYWNrKTsKLQotICAg ICAgICBpZiAoY29va2llKSB7Ci0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdl Ykluc3BlY3Rvci5VSVN0cmluZygiRGVsZXRlIiksIHRoaXMuX29uRGVsZXRlQ29va2llLmJpbmQo dGhpcywgZ3JpZE5vZGUpKTsKLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZFNlcGFyYXRv cigpOwotICAgICAgICAgICAgdmFyIGNvb2tpZURvbWFpbiA9IGNvb2tpZS5kb21haW4oKTsKLSAg ICAgICAgICAgIAotICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJDbGVh ciBhbGwgZnJvbSBcIiVzXCIiIDogIkNsZWFyIEFsbCBmcm9tIFwiJXNcIiIsIGNvb2tpZURvbWFp biksIHRoaXMuX2NsZWFyQW5kUmVmcmVzaC5iaW5kKHRoaXMsIGNvb2tpZURvbWFpbikpOwotICAg ICAgICB9IGVsc2UKLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOwot CisgICAgICAgIHZhciBjb29raWUgPSBub2RlLmNvb2tpZTsKKyAgICAgICAgdmFyIGRvbWFpbiA9 IGNvb2tpZS5kb21haW4oKTsKKyAgICAgICAgaWYgKGRvbWFpbikKKyAgICAgICAgICAgIGNvbnRl eHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VM b3dlckNhc2VNZW51VGl0bGVzKCkgPyAiQ2xlYXIgYWxsIGZyb20gXCIlc1wiIiA6ICJDbGVhciBB bGwgZnJvbSBcIiVzXCIiLCBkb21haW4pLCB0aGlzLl9jbGVhckFuZFJlZnJlc2guYmluZCh0aGlz LCBkb21haW4pKTsKICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJDbGVhciBh bGwiIDogIkNsZWFyIEFsbCIpLCB0aGlzLl9jbGVhckFuZFJlZnJlc2guYmluZCh0aGlzLCBudWxs KSk7Ci0KLSAgICAgICAgY29udGV4dE1lbnUuc2hvdygpOwogICAgIH0sCiAKICAgICAvKioKQEAg LTI5MCw2ICsyNzUsMTEgQEAgV2ViSW5zcGVjdG9yLkNvb2tpZXNUYWJsZS5wcm90b3R5cGUgPSB7 CiAgICAgICAgIGlmIChuZWlnaGJvdXIpCiAgICAgICAgICAgICB0aGlzLl9uZXh0U2VsZWN0ZWRD b29raWUgPSBuZWlnaGJvdXIuY29va2llOwogICAgICAgICBjb29raWUucmVtb3ZlKCk7CisgICAg ICAgIHRoaXMuX3JlZnJlc2goKTsKKyAgICB9LAorCisgICAgX3JlZnJlc2g6IGZ1bmN0aW9uKCkK KyAgICB7CiAgICAgICAgIGlmICh0aGlzLl9yZWZyZXNoQ2FsbGJhY2spCiAgICAgICAgICAgICB0 aGlzLl9yZWZyZXNoQ2FsbGJhY2soKTsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMKaW5kZXggNjdkZjM5YTc1YjNmNjg0MmUyZDE2MTQx OWExYTdmM2I3N2Y5MDYxMi4uOWM5NGE4NDdiYWE4YmRmOWQyOTZkMzlhN2MxY2U4NTM5NDk2MGQ0 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3Jp ZC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpz CkBAIC0yNywxMSArMjcsMTIgQEAKICAqIEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYklu c3BlY3Rvci5WaWV3fQogICogQHBhcmFtIHshQXJyYXkuPCFXZWJJbnNwZWN0b3IuRGF0YUdyaWQu Q29sdW1uRGVzY3JpcHRvcj59IGNvbHVtbnNBcnJheQotICogQHBhcmFtIHs/ZnVuY3Rpb24oV2Vi SW5zcGVjdG9yLkRhdGFHcmlkTm9kZSwgc3RyaW5nLCBzdHJpbmcsIHN0cmluZyk9fSBlZGl0Q2Fs bGJhY2sKLSAqIEBwYXJhbSB7P2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUpPX0g ZGVsZXRlQ2FsbGJhY2sKLSAqIEBwYXJhbSB7P2Z1bmN0aW9uKCk9fSByZWZyZXNoQ2FsbGJhY2sK KyAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZSwgc3RyaW5nLCBz dHJpbmcsIHN0cmluZyk9fSBlZGl0Q2FsbGJhY2sKKyAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5z cGVjdG9yLkRhdGFHcmlkTm9kZSk9fSBkZWxldGVDYWxsYmFjaworICogQHBhcmFtIHtmdW5jdGlv bigpPX0gcmVmcmVzaENhbGxiYWNrCisgKiBAcGFyYW0ge2Z1bmN0aW9uKCFXZWJJbnNwZWN0b3Iu Q29udGV4dE1lbnUsIFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUpPX0gY29udGV4dE1lbnVDYWxs YmFjawogICovCi1XZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBmdW5jdGlvbihjb2x1bW5zQXJyYXks IGVkaXRDYWxsYmFjaywgZGVsZXRlQ2FsbGJhY2ssIHJlZnJlc2hDYWxsYmFjaykKK1dlYkluc3Bl Y3Rvci5EYXRhR3JpZCA9IGZ1bmN0aW9uKGNvbHVtbnNBcnJheSwgZWRpdENhbGxiYWNrLCBkZWxl dGVDYWxsYmFjaywgcmVmcmVzaENhbGxiYWNrLCBjb250ZXh0TWVudUNhbGxiYWNrKQogewogICAg IFdlYkluc3BlY3Rvci5WaWV3LmNhbGwodGhpcyk7CiAgICAgdGhpcy5yZWdpc3RlclJlcXVpcmVk Q1NTKCJkYXRhR3JpZC5jc3MiKTsKQEAgLTU5LDYgKzYwLDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFH cmlkID0gZnVuY3Rpb24oY29sdW1uc0FycmF5LCBlZGl0Q2FsbGJhY2ssIGRlbGV0ZUNhbGxiYWNr LCByZWYKICAgICB0aGlzLl9lZGl0Q2FsbGJhY2sgPSBlZGl0Q2FsbGJhY2s7CiAgICAgdGhpcy5f ZGVsZXRlQ2FsbGJhY2sgPSBkZWxldGVDYWxsYmFjazsKICAgICB0aGlzLl9yZWZyZXNoQ2FsbGJh Y2sgPSByZWZyZXNoQ2FsbGJhY2s7CisgICAgdGhpcy5fY29udGV4dE1lbnVDYWxsYmFjayA9IGNv bnRleHRNZW51Q2FsbGJhY2s7CiAKICAgICB0aGlzLl9zY3JvbGxDb250YWluZXIgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLl9zY3JvbGxDb250YWluZXIuY2xhc3NO YW1lID0gImRhdGEtY29udGFpbmVyIjsKQEAgLTk0MSw2ICs5NDMsOCBAQCBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKHRo aXMuX2RlbGV0ZUNhbGxiYWNrICYmIGdyaWROb2RlICE9PSB0aGlzLmNyZWF0aW9uTm9kZSkKICAg ICAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiRGVsZXRlIiksIHRoaXMuX2RlbGV0ZUNhbGxiYWNrLmJpbmQodGhpcywgZ3JpZE5vZGUpKTsK KyAgICAgICAgICAgIGlmICh0aGlzLl9jb250ZXh0TWVudUNhbGxiYWNrKQorICAgICAgICAgICAg ICAgIHRoaXMuX2NvbnRleHRNZW51Q2FsbGJhY2soY29udGV4dE1lbnUsIGdyaWROb2RlKTsKICAg ICAgICAgfQogCiAgICAgICAgIGNvbnRleHRNZW51LnNob3coKTsK