129185 2014-02-21 17:03:46 -0800 Web Inspector: Remove WebInspector.EventHandler in favor of WebInspector.EventListenerSet 2014-03-04 08:26:41 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy webkit-unassigned commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 983447 0 timothy 2014-02-21 17:03:46 -0800 We have two similar classes, WebInspector.EventHandler and WebInspector.EventListenerSet. We should just remove the one client of WebInspector.EventHandler and replace it with WebInspector.EventListenerSet or vanilla listeners. 983448 1 webkit-bug-importer 2014-02-21 17:04:25 -0800 <rdar://problem/16140196> 986535 2 225701 dpino 2014-03-03 15:38:06 -0800 Created attachment 225701 Patch 986537 3 225701 timothy 2014-03-03 15:39:55 -0800 Comment on attachment 225701 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225701&action=review > Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js:1258 > + this._popoverEventHandler = new WebInspector.EventListenerSet(this, "Popover listeners"); This should be called _popoverEventListeners or _popoverEventListenerSet to match the class name better. 986687 4 225743 dpino 2014-03-03 22:58:48 -0800 Created attachment 225743 Patch 986818 5 225743 commit-queue 2014-03-04 08:26:39 -0800 Comment on attachment 225743 Patch Clearing flags on attachment: 225743 Committed r165052: <http://trac.webkit.org/changeset/165052> 986819 6 commit-queue 2014-03-04 08:26:41 -0800 All reviewed patches have been landed. Closing bug. 225701 2014-03-03 15:38:06 -0800 2014-03-03 22:58:41 -0800 Patch bug-129185-20140304003804.patch text/plain 6238 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2 NjZmYzQ5MjdlNzA4ZWQ5NTBmOTAyOGM4NzI5ZWMyNWIyYmE3YjU2Li42YjA4NmQ0ZTgxNDdjMDcz NTViNTFlMGU3ZmJlN2RlNWYwMjg3MzM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxNC0wMy0wMyAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSBXZWJJbnNwZWN0b3IuRXZlbnRI YW5kbGVyIGluIGZhdm9yIG9mIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyU2V0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjkxODUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv QmFzZS9FdmVudEhhbmRsZXIuanM6IFJlbW92ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9N YWluLmh0bWw6IERvbid0IGluY2x1ZGUgRXZlbnRIYW5kbGVyLmpzLgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJvdG90eXBlLl9kaXNtaXNzUG9wb3Zlcik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJvdG90eXBlLl90cmFj a1BvcG92ZXJFdmVudHMpOgorICAgICAgICBVc2UgRXZlbnRMaXN0ZW5lclNldCBpbnN0ZWFkIG9m IEV2ZW50SGFuZGxlci4KKwogMjAxNC0wMi0yNSAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBs ZS5jb20+CiAKICAgICAgICAgUHJ1bmUgZGVhZCBjb2RlIGZvciBXZWIgSW5zcGVjdG9yIG1lbW9y eSBpbnN0cnVtZW50YXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL0V2ZW50SGFuZGxlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvRXZlbnRIYW5kbGVyLmpzCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCBmZjlkMzcyMGU1MmM3YzlkNDk5ODQzYzVmOGY3ZTI5Zjk0NmE0OWMxLi4wMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvRXZlbnRIYW5kbGVyLmpzCisrKyAvZGV2L251bGwKQEAg LTEsNzkgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBt ZXQ6Ci0gKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJp bmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBp biB0aGUKLSAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwotICogQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sCi0gKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKLSAqIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IKLSAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GCi0gKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKLSAqIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVS IElOCi0gKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5F R0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQotICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgotICogVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLVdlYkluc3BlY3Rvci5FdmVudEhhbmRsZXIgPSBm dW5jdGlvbihkZWxlZ2F0ZSwgZXZlbnRIYW5kbGVycykKLXsKLSAgICB0aGlzLl9kZWxlZ2F0ZSA9 IGRlbGVnYXRlOwotICAgIHRoaXMuX2V2ZW50SGFuZGxlcnMgPSBldmVudEhhbmRsZXJzOwotCi0g ICAgdGhpcy5fdHJhY2tpbmcgPSBmYWxzZTsKLSAgICB0aGlzLl90YXJnZXQgPSBudWxsOwotfTsK LQotV2ViSW5zcGVjdG9yLkV2ZW50SGFuZGxlci5wcm90b3R5cGUgPSB7Ci0gICAgY29uc3RydWN0 b3I6IFdlYkluc3BlY3Rvci5FdmVudEhhbmRsZXIsCi0KLSAgICAvLyBQdWJsaWMKLQotICAgIHRy YWNrRXZlbnRzOiBmdW5jdGlvbih0YXJnZXQpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fdHJh Y2tpbmcgJiYgdGFyZ2V0ID09PSB0aGlzLl90YXJnZXQpCi0gICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgaWYgKHRoaXMuX3RyYWNraW5nICYmIHRoaXMuX3RhcmdldCkKLSAgICAgICAgICAg IHRoaXMuc3RvcFRyYWNraW5nRXZlbnRzKCk7Ci0KLSAgICAgICAgT2JqZWN0LmdldE93blByb3Bl cnR5TmFtZXModGhpcy5fZXZlbnRIYW5kbGVycykuZm9yRWFjaChmdW5jdGlvbihldmVudE5hbWUp IHsKLSAgICAgICAgICAgIHRhcmdldC5hZGRFdmVudExpc3RlbmVyKGV2ZW50TmFtZSwgdGhpcyk7 Ci0gICAgICAgIH0sIHRoaXMpOwotCi0gICAgICAgIHRoaXMuX3RhcmdldCA9IHRhcmdldDsKLSAg ICAgICAgdGhpcy5fdHJhY2tpbmcgPSB0cnVlOwotICAgIH0sCi0gICAgCi0gICAgc3RvcFRyYWNr aW5nRXZlbnRzOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAoIXRoaXMuX3RyYWNraW5n KQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIE9iamVjdC5nZXRPd25Qcm9wZXJ0eU5h bWVzKHRoaXMuX2V2ZW50SGFuZGxlcnMpLmZvckVhY2goZnVuY3Rpb24oZXZlbnRUeXBlKSB7Ci0g ICAgICAgICAgICB0aGlzLl90YXJnZXQucmVtb3ZlRXZlbnRMaXN0ZW5lcihldmVudFR5cGUsIHRo aXMpOwotICAgICAgICB9LCB0aGlzKTsKLQotICAgICAgICB0aGlzLl90cmFja2luZyA9IGZhbHNl OwotICAgIH0sCi0KLSAgICBoYW5kbGVFdmVudDogZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAg ICAgICBpZiAoZXZlbnQuY3VycmVudFRhcmdldCAhPT0gdGhpcy5fdGFyZ2V0KQotICAgICAgICAg ICAgcmV0dXJuOwotCi0gICAgICAgIHZhciBoYW5kbGVyID0gdGhpcy5fZXZlbnRIYW5kbGVyc1tl dmVudC50eXBlXTsKLSAgICAgICAgaWYgKGhhbmRsZXIpCi0gICAgICAgICAgICBoYW5kbGVyLmNh bGwodGhpcy5fZGVsZWdhdGUsIGV2ZW50KTsKLSAgICB9Ci19Ci0KLVdlYkluc3BlY3Rvci5FdmVu dEhhbmRsZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90 eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFp bi5odG1sIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCmlu ZGV4IDk1MzQzOGY1OTM5MjIzYjYxN2Q5NTUyNTQ3OGQzZDhlNjU0YjExYjguLmU3OWZkODQ2ZDZj ZjI2MTkxYTM2NDI1MGQ3NWEyZGU4ZDBkZDVmZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKQEAgLTE2Myw3ICsxNjMsNiBAQAogICAgIDxzY3Jp cHQgc3JjPSJCYXNlL09iamVjdC5qcyI+PC9zY3JpcHQ+CiAKICAgICA8c2NyaXB0IHNyYz0iQmFz ZS9ET01VdGlsaXRpZXMuanMiPjwvc2NyaXB0PgotICAgIDxzY3JpcHQgc3JjPSJCYXNlL0V2ZW50 SGFuZGxlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IkJhc2UvRXZlbnRMaXN0ZW5l clNldC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IkJhc2UvSW1hZ2VVdGlsaXRpZXMu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJCYXNlL0xvYWRMb2NhbGl6ZWRTdHJpbmdz LmpzIj48L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanMKaW5kZXggZjc5 ZmE5MGQ3ZDA5MTNmNWZhMGNkYjIyN2U3YjdmNjNhN2NhYzQ0ZC4uM2FlNzhlNTZjZjY1OGY0Mjc3 MGRkMDhiMWI1Y2YyMmI4NGQxZjkxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3Iu anMKQEAgLTEyNDksMTkgKzEyNDksMTUgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRp dG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcG9wb3Zlci5kaXNtaXNzKCk7CiAKICAg ICAgICAgaWYgKHRoaXMuX3BvcG92ZXJFdmVudEhhbmRsZXIpCi0gICAgICAgICAgICB0aGlzLl9w b3BvdmVyRXZlbnRIYW5kbGVyLnN0b3BUcmFja2luZ0V2ZW50cygpOworICAgICAgICAgICAgdGhp cy5fcG9wb3ZlckV2ZW50SGFuZGxlci51bnJlZ2lzdGVyKCk7CiAgICAgfSwKIAogICAgIF90cmFj a1BvcG92ZXJFdmVudHM6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fcG9w b3ZlckV2ZW50SGFuZGxlcikgewotICAgICAgICAgICAgdGhpcy5fcG9wb3ZlckV2ZW50SGFuZGxl ciA9IG5ldyBXZWJJbnNwZWN0b3IuRXZlbnRIYW5kbGVyKHRoaXMsIHsKLSAgICAgICAgICAgICAg ICAibW91c2VvdmVyIjogdGhpcy5fcG9wb3Zlck1vdXNlb3ZlciwKLSAgICAgICAgICAgICAgICAi bW91c2VvdXQiOiB0aGlzLl9wb3BvdmVyTW91c2VvdXQsCi0gICAgICAgICAgICB9KTsKLSAgICAg ICAgfQotCi0gICAgICAgIHRoaXMuX3BvcG92ZXJFdmVudEhhbmRsZXIudHJhY2tFdmVudHModGhp cy5fcG9wb3Zlci5lbGVtZW50KTsKKyAgICAgICAgaWYgKCF0aGlzLl9wb3BvdmVyRXZlbnRIYW5k bGVyKSAKKyAgICAgICAgICAgIHRoaXMuX3BvcG92ZXJFdmVudEhhbmRsZXIgPSBuZXcgV2ViSW5z cGVjdG9yLkV2ZW50TGlzdGVuZXJTZXQodGhpcywgIlBvcG92ZXIgbGlzdGVuZXJzIik7CisgICAg ICAgIHRoaXMuX3BvcG92ZXJFdmVudEhhbmRsZXIucmVnaXN0ZXIodGhpcy5fcG9wb3Zlci5lbGVt ZW50LCAibW91c2VvdmVyIiwgdGhpcy5fcG9wb3Zlck1vdXNlb3Zlcik7CisgICAgICAgIHRoaXMu X3BvcG92ZXJFdmVudEhhbmRsZXIucmVnaXN0ZXIodGhpcy5fcG9wb3Zlci5lbGVtZW50LCAibW91 c2VvdXQiLCB0aGlzLl9wb3BvdmVyTW91c2VvdXQpOwogICAgIH0sCiAKICAgICBfcG9wb3Zlck1v dXNlb3ZlcjogZnVuY3Rpb24oZXZlbnQpCg== 225743 2014-03-03 22:58:48 -0800 2014-03-04 08:26:39 -0800 Patch bug-129185-20140304075847.patch text/plain 6292 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2 NjZmYzQ5MjdlNzA4ZWQ5NTBmOTAyOGM4NzI5ZWMyNWIyYmE3YjU2Li42YjA4NmQ0ZTgxNDdjMDcz NTViNTFlMGU3ZmJlN2RlNWYwMjg3MzM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxNC0wMy0wMyAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSBXZWJJbnNwZWN0b3IuRXZlbnRI YW5kbGVyIGluIGZhdm9yIG9mIFdlYkluc3BlY3Rvci5FdmVudExpc3RlbmVyU2V0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjkxODUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv QmFzZS9FdmVudEhhbmRsZXIuanM6IFJlbW92ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9N YWluLmh0bWw6IERvbid0IGluY2x1ZGUgRXZlbnRIYW5kbGVyLmpzLgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJvdG90eXBlLl9kaXNtaXNzUG9wb3Zlcik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJvdG90eXBlLl90cmFj a1BvcG92ZXJFdmVudHMpOgorICAgICAgICBVc2UgRXZlbnRMaXN0ZW5lclNldCBpbnN0ZWFkIG9m IEV2ZW50SGFuZGxlci4KKwogMjAxNC0wMi0yNSAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBs ZS5jb20+CiAKICAgICAgICAgUHJ1bmUgZGVhZCBjb2RlIGZvciBXZWIgSW5zcGVjdG9yIG1lbW9y eSBpbnN0cnVtZW50YXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL0V2ZW50SGFuZGxlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvRXZlbnRIYW5kbGVyLmpzCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCBmZjlkMzcyMGU1MmM3YzlkNDk5ODQzYzVmOGY3ZTI5Zjk0NmE0OWMxLi4wMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvRXZlbnRIYW5kbGVyLmpzCisrKyAvZGV2L251bGwKQEAg LTEsNzkgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBt ZXQ6Ci0gKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJp bmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBp biB0aGUKLSAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwotICogQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sCi0gKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKLSAqIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IKLSAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GCi0gKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKLSAqIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVS IElOCi0gKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5F R0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQotICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgotICogVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLVdlYkluc3BlY3Rvci5FdmVudEhhbmRsZXIgPSBm dW5jdGlvbihkZWxlZ2F0ZSwgZXZlbnRIYW5kbGVycykKLXsKLSAgICB0aGlzLl9kZWxlZ2F0ZSA9 IGRlbGVnYXRlOwotICAgIHRoaXMuX2V2ZW50SGFuZGxlcnMgPSBldmVudEhhbmRsZXJzOwotCi0g ICAgdGhpcy5fdHJhY2tpbmcgPSBmYWxzZTsKLSAgICB0aGlzLl90YXJnZXQgPSBudWxsOwotfTsK LQotV2ViSW5zcGVjdG9yLkV2ZW50SGFuZGxlci5wcm90b3R5cGUgPSB7Ci0gICAgY29uc3RydWN0 b3I6IFdlYkluc3BlY3Rvci5FdmVudEhhbmRsZXIsCi0KLSAgICAvLyBQdWJsaWMKLQotICAgIHRy YWNrRXZlbnRzOiBmdW5jdGlvbih0YXJnZXQpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fdHJh Y2tpbmcgJiYgdGFyZ2V0ID09PSB0aGlzLl90YXJnZXQpCi0gICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgaWYgKHRoaXMuX3RyYWNraW5nICYmIHRoaXMuX3RhcmdldCkKLSAgICAgICAgICAg IHRoaXMuc3RvcFRyYWNraW5nRXZlbnRzKCk7Ci0KLSAgICAgICAgT2JqZWN0LmdldE93blByb3Bl cnR5TmFtZXModGhpcy5fZXZlbnRIYW5kbGVycykuZm9yRWFjaChmdW5jdGlvbihldmVudE5hbWUp IHsKLSAgICAgICAgICAgIHRhcmdldC5hZGRFdmVudExpc3RlbmVyKGV2ZW50TmFtZSwgdGhpcyk7 Ci0gICAgICAgIH0sIHRoaXMpOwotCi0gICAgICAgIHRoaXMuX3RhcmdldCA9IHRhcmdldDsKLSAg ICAgICAgdGhpcy5fdHJhY2tpbmcgPSB0cnVlOwotICAgIH0sCi0gICAgCi0gICAgc3RvcFRyYWNr aW5nRXZlbnRzOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAoIXRoaXMuX3RyYWNraW5n KQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIE9iamVjdC5nZXRPd25Qcm9wZXJ0eU5h bWVzKHRoaXMuX2V2ZW50SGFuZGxlcnMpLmZvckVhY2goZnVuY3Rpb24oZXZlbnRUeXBlKSB7Ci0g ICAgICAgICAgICB0aGlzLl90YXJnZXQucmVtb3ZlRXZlbnRMaXN0ZW5lcihldmVudFR5cGUsIHRo aXMpOwotICAgICAgICB9LCB0aGlzKTsKLQotICAgICAgICB0aGlzLl90cmFja2luZyA9IGZhbHNl OwotICAgIH0sCi0KLSAgICBoYW5kbGVFdmVudDogZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAg ICAgICBpZiAoZXZlbnQuY3VycmVudFRhcmdldCAhPT0gdGhpcy5fdGFyZ2V0KQotICAgICAgICAg ICAgcmV0dXJuOwotCi0gICAgICAgIHZhciBoYW5kbGVyID0gdGhpcy5fZXZlbnRIYW5kbGVyc1tl dmVudC50eXBlXTsKLSAgICAgICAgaWYgKGhhbmRsZXIpCi0gICAgICAgICAgICBoYW5kbGVyLmNh bGwodGhpcy5fZGVsZWdhdGUsIGV2ZW50KTsKLSAgICB9Ci19Ci0KLVdlYkluc3BlY3Rvci5FdmVu dEhhbmRsZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90 eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFp bi5odG1sIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCmlu ZGV4IDk1MzQzOGY1OTM5MjIzYjYxN2Q5NTUyNTQ3OGQzZDhlNjU0YjExYjguLmU3OWZkODQ2ZDZj ZjI2MTkxYTM2NDI1MGQ3NWEyZGU4ZDBkZDVmZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKQEAgLTE2Myw3ICsxNjMsNiBAQAogICAgIDxzY3Jp cHQgc3JjPSJCYXNlL09iamVjdC5qcyI+PC9zY3JpcHQ+CiAKICAgICA8c2NyaXB0IHNyYz0iQmFz ZS9ET01VdGlsaXRpZXMuanMiPjwvc2NyaXB0PgotICAgIDxzY3JpcHQgc3JjPSJCYXNlL0V2ZW50 SGFuZGxlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IkJhc2UvRXZlbnRMaXN0ZW5l clNldC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IkJhc2UvSW1hZ2VVdGlsaXRpZXMu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJCYXNlL0xvYWRMb2NhbGl6ZWRTdHJpbmdz LmpzIj48L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanMKaW5kZXggZjc5 ZmE5MGQ3ZDA5MTNmNWZhMGNkYjIyN2U3YjdmNjNhN2NhYzQ0ZC4uZmJjNjJlYjliYzNjOWZiYzZk NTk2ZTk1OTkwNDhmMzBkMzQ4ZTY4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3Iu anMKQEAgLTEyNDgsMjAgKzEyNDgsMTYgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRp dG9yLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLl9wb3BvdmVyLmRpc21pc3MoKTsKIAot ICAgICAgICBpZiAodGhpcy5fcG9wb3ZlckV2ZW50SGFuZGxlcikKLSAgICAgICAgICAgIHRoaXMu X3BvcG92ZXJFdmVudEhhbmRsZXIuc3RvcFRyYWNraW5nRXZlbnRzKCk7CisgICAgICAgIGlmICh0 aGlzLl9wb3BvdmVyRXZlbnRMaXN0ZW5lcnMpCisgICAgICAgICAgICB0aGlzLl9wb3BvdmVyRXZl bnRMaXN0ZW5lcnMudW5yZWdpc3RlcigpOwogICAgIH0sCiAKICAgICBfdHJhY2tQb3BvdmVyRXZl bnRzOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuX3BvcG92ZXJFdmVudEhh bmRsZXIpIHsKLSAgICAgICAgICAgIHRoaXMuX3BvcG92ZXJFdmVudEhhbmRsZXIgPSBuZXcgV2Vi SW5zcGVjdG9yLkV2ZW50SGFuZGxlcih0aGlzLCB7Ci0gICAgICAgICAgICAgICAgIm1vdXNlb3Zl ciI6IHRoaXMuX3BvcG92ZXJNb3VzZW92ZXIsCi0gICAgICAgICAgICAgICAgIm1vdXNlb3V0Ijog dGhpcy5fcG9wb3Zlck1vdXNlb3V0LAotICAgICAgICAgICAgfSk7Ci0gICAgICAgIH0KLQotICAg ICAgICB0aGlzLl9wb3BvdmVyRXZlbnRIYW5kbGVyLnRyYWNrRXZlbnRzKHRoaXMuX3BvcG92ZXIu ZWxlbWVudCk7CisgICAgICAgIGlmICghdGhpcy5fcG9wb3ZlckV2ZW50TGlzdGVuZXJzKSAKKyAg ICAgICAgICAgIHRoaXMuX3BvcG92ZXJFdmVudExpc3RlbmVycyA9IG5ldyBXZWJJbnNwZWN0b3Iu RXZlbnRMaXN0ZW5lclNldCh0aGlzLCAiUG9wb3ZlciBsaXN0ZW5lcnMiKTsKKyAgICAgICAgdGhp cy5fcG9wb3ZlckV2ZW50TGlzdGVuZXJzLnJlZ2lzdGVyKHRoaXMuX3BvcG92ZXIuZWxlbWVudCwg Im1vdXNlb3ZlciIsIHRoaXMuX3BvcG92ZXJNb3VzZW92ZXIpOworICAgICAgICB0aGlzLl9wb3Bv dmVyRXZlbnRMaXN0ZW5lcnMucmVnaXN0ZXIodGhpcy5fcG9wb3Zlci5lbGVtZW50LCAibW91c2Vv dXQiLCB0aGlzLl9wb3BvdmVyTW91c2VvdXQpOwogICAgIH0sCiAKICAgICBfcG9wb3Zlck1vdXNl b3ZlcjogZnVuY3Rpb24oZXZlbnQpCg==