77126 2012-01-26 11:53:15 -0800 Web Inspector: Scripts panel: fix event dispatching between FileSelector and EditorContainer. 2012-01-27 05:46:30 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 543342 0 vsevik 2012-01-26 11:53:15 -0800 Scripts panel: fix event dispatching between FileSelector and EditorContainer. 543369 1 124161 vsevik 2012-01-26 12:17:27 -0800 Created attachment 124161 Patch 543379 2 124161 apavlov 2012-01-26 12:25:01 -0800 Comment on attachment 124161 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124161&action=review > Source/WebCore/inspector/front-end/ScriptsPanel.js:259 > + Odd leading spaces added. > Source/WebCore/inspector/front-end/ScriptsPanel.js:498 > + ditto > Source/WebCore/inspector/front-end/ScriptsPanel.js:650 > + // ScriptsNavigator does not need update on EditorClosed. ...need to update...? 543997 3 vsevik 2012-01-27 05:46:30 -0800 Committed r106112: <http://trac.webkit.org/changeset/106112> 124161 2012-01-26 12:17:27 -0800 2012-01-27 01:07:35 -0800 Patch bug-77126-20120127001725.patch text/plain 14111 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmI3MmNjZDU3ZDkzNzg4 ZWNkZmJlYzJmZDFjZWFhNzVhODMxMWY0MS4uYWE3YmUwOTExYTBiMjhjYTNmOTk5ZjE5NGNiNTFm NTA1YTBmOGU1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDEyLTAxLTI2ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFNjcmlwdHMgcGFuZWw6IGZpeCBldmVudCBkaXNwYXRjaGluZyBiZXR3ZWVuIEZpbGVTZWxl Y3RvciBhbmQgRWRpdG9yQ29udGFpbmVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzcxMjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3VpU291cmNlQ29k ZUFkZGVkLmdldCBpZik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3Rv dHlwZS5fcmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUuX3Nob3dTb3VyY2VMaW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu cHJvdG90eXBlLl91cGRhdGVFeGVjdXRpb25MaW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwucHJvdG90eXBlLl9lZGl0b3JDbG9zZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2VkaXRvclNlbGVjdGVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9yLnByb3RvdHlwZS5yZXZlYWxVSVNv dXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5Db21ib0JveEZp bGVTZWxlY3Rvci5wcm90b3R5cGUucmV2ZWFsVUlTb3VyY2VDb2RlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwuQ29tYm9Cb3hGaWxlU2VsZWN0b3IucHJvdG90eXBlLl9pbm5l clJldmVhbFVJU291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LkNvbWJvQm94RmlsZVNlbGVjdG9yLnByb3RvdHlwZS5fYWRkT3B0aW9uVG9GaWxlc1NlbGVjdC5p bnNlcnRPcmRlcmVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuQ29tYm9C b3hGaWxlU2VsZWN0b3IucHJvdG90eXBlLl9hZGRPcHRpb25Ub0ZpbGVzU2VsZWN0KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuQ29tYm9Cb3hGaWxlU2VsZWN0b3IucHJvdG90 eXBlLl9nb0JhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5Db21ib0Jv eEZpbGVTZWxlY3Rvci5wcm90b3R5cGUuX2dvRm9yd2FyZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLkNvbWJvQm94RmlsZVNlbGVjdG9yLnByb3RvdHlwZS5fZmlsZXNTZWxl Y3RDaGFuZ2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNv bnRhaW5lci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lci5wcm90b3R5cGUu X3RhYkNsb3NlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVy LnByb3RvdHlwZS5fdGFiU2VsZWN0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZEVk aXRvckNvbnRhaW5lci5wcm90b3R5cGUucmVzZXQpOgorCisyMDEyLTAxLTI2ICBWc2V2b2xvZCBW bGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNj cmlwdHMgcGFuZWwgZWRpdG9yIGNvbnRhaW5lciBzaG91bGQgYmUgYmFzZWQgb24gVUlTb3VyY2VD b2RlIG9iamVjdHMsIG5vdCBTb3VyY2VGcmFtZXMuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzA5OAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IGNhZGMyZTkwYzljYzkwOTJi NmQ1N2Q4ODMzMDQ3MWQ2YTg2NTA2ODEuLmVhNmJhMDJiYzI2MDU5ZDA1ZjY4MDViY2IxMjJlZDI3 Mzc0OWY3NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c1BhbmVsLmpzCkBAIC05Miw2ICs5Miw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKICAgICB0aGlzLl9maWxlU2VsZWN0b3Iu YWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZpbGVTZWxlY3Rvci5F dmVudHMuRmlsZVNlbGVjdGVkLCB0aGlzLl9maWxlU2VsZWN0ZWQsIHRoaXMpOwogICAgIHRoaXMu X2ZpbGVTZWxlY3Rvci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu RmlsZVNlbGVjdG9yLkV2ZW50cy5SZWxlYXNlZEZvY3VzQWZ0ZXJTZWxlY3Rpb24sIHRoaXMuX2Zp bGVTZWxlY3RvclJlbGVhc2VkRm9jdXMsIHRoaXMpOwogICAgIHRoaXMuX2VkaXRvckNvbnRhaW5l ci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5FZGl0b3JDb250YWluZXIuRXZlbnRzLkVk aXRvclNlbGVjdGVkLCB0aGlzLl9lZGl0b3JTZWxlY3RlZCwgdGhpcyk7CisgICAgdGhpcy5fZWRp dG9yQ29udGFpbmVyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkVkaXRvckNvbnRhaW5l ci5FdmVudHMuRWRpdG9yQ2xvc2VkLCB0aGlzLl9lZGl0b3JDbG9zZWQsIHRoaXMpOwogCiAgICAg dGhpcy5zcGxpdFZpZXcubWFpbkVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5kZWJ1Z1NpZGViYXJS ZXNpemVXaWRnZXRFbGVtZW50KTsKIApAQCAtMjU0LDIwICsyNTUsMTkgQEAgV2ViSW5zcGVjdG9y LlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAvLyBBbm9ueW1vdXMgc291 cmNlcyBhcmUgc2hvd24gb25seSB3aGVuIHN0ZXBwaW5nLgogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9Ci0gICAgICAgIAogICAgICAgICB0aGlzLl9maWxlU2VsZWN0b3IuYWRkVUlTb3Vy Y2VDb2RlKHVpU291cmNlQ29kZSk7Ci0KKyAgICAgICAgCiAgICAgICAgIHZhciBsYXN0Vmlld2Vk VVJMID0gV2ViSW5zcGVjdG9yLnNldHRpbmdzLmxhc3RWaWV3ZWRTY3JpcHRGaWxlLmdldCgpOwog ICAgICAgICBpZiAoIXRoaXMuX2luaXRpYWxWaWV3U2VsZWN0aW9uUHJvY2Vzc2VkKSB7CiAgICAg ICAgICAgICB0aGlzLl9pbml0aWFsVmlld1NlbGVjdGlvblByb2Nlc3NlZCA9IHRydWU7CiAgICAg ICAgICAgICAvLyBPcHRpb24gd2UganVzdCBhZGRlZCBpcyB0aGUgb25seSBvcHRpb24gaW4gZmls ZXMgc2VsZWN0LgogICAgICAgICAgICAgLy8gV2UgaGF2ZSB0byBzaG93IGNvcnJlc3BvbmRpbmcg c291cmNlIGZyYW1lIGltbWVkaWF0ZWx5LgotICAgICAgICAgICAgdGhpcy5fc2hvd0FuZFJldmVh bEluRmlsZVNlbGVjdG9yKHVpU291cmNlQ29kZSk7CisgICAgICAgICAgICB0aGlzLl9zaG93Rmls ZSh1aVNvdXJjZUNvZGUpOwogICAgICAgICAgICAgLy8gUmVzdG9yZSBvcmlnaW5hbCB2YWx1ZSBv ZiBsYXN0Vmlld2VkU2NyaXB0RmlsZSBiZWNhdXNlCiAgICAgICAgICAgICAvLyBzb3VyY2UgZnJh bWUgd2FzIHNob3duIGFzIGEgcmVzdWx0IG9mIGluaXRpYWwgbG9hZC4KICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5zZXR0aW5ncy5sYXN0Vmlld2VkU2NyaXB0RmlsZS5zZXQobGFzdFZpZXdlZFVS TCk7CiAgICAgICAgIH0gZWxzZSBpZiAodWlTb3VyY2VDb2RlLnVybCA9PT0gbGFzdFZpZXdlZFVS TCkKLSAgICAgICAgICAgIHRoaXMuX3Nob3dBbmRSZXZlYWxJbkZpbGVTZWxlY3Rvcih1aVNvdXJj ZUNvZGUpOworICAgICAgICAgICAgdGhpcy5fc2hvd0ZpbGUodWlTb3VyY2VDb2RlKTsKICAgICB9 LAogCiAgICAgX3VpU291cmNlQ29kZVJlbW92ZWQ6IGZ1bmN0aW9uKGV2ZW50KQpAQCAtNDE2LDcg KzQxNiw4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl9kZWJ1Z2dlclJlc3VtZWQoKTsKIAogICAgICAgICBkZWxldGUgdGhpcy5faW5pdGlh bFZpZXdTZWxlY3Rpb25Qcm9jZXNzZWQ7Ci0KKyAgICAgICAgZGVsZXRlIHRoaXMuX2N1cmVudFVJ U291cmNlQ29kZTsKKyAgICAgICAgCiAgICAgICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lci5yZXNl dCgpOwogICAgICAgICB0aGlzLl91cGRhdGVTY3JpcHRWaWV3U3RhdHVzQmFySXRlbXMoKTsKIApA QCAtNDcxLDcgKzQ3Miw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0g ewogICAgICAqLwogICAgIF9zaG93U291cmNlTGluZTogZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBs aW5lTnVtYmVyKQogICAgIHsKLSAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc2hvd0Fu ZFJldmVhbEluRmlsZVNlbGVjdG9yKHVpU291cmNlQ29kZSk7CisgICAgICAgIHZhciBzb3VyY2VG cmFtZSA9IHRoaXMuX3Nob3dGaWxlKHVpU291cmNlQ29kZSk7CiAgICAgICAgIGlmICh0eXBlb2Yg bGluZU51bWJlciA9PT0gIm51bWJlciIpCiAgICAgICAgICAgICBzb3VyY2VGcmFtZS5oaWdobGln aHRMaW5lKGxpbmVOdW1iZXIpOwogICAgICAgICBzb3VyY2VGcmFtZS5mb2N1cygpOwpAQCAtNDgz LDMwICs0ODQsMjQgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgICovCiAgICAgX3Nob3dGaWxlOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAgeworICAg ICAgICBpZiAoIXRoaXMuX2ZpbGVTZWxlY3Rvci5pc1NjcmlwdFNvdXJjZUFkZGVkKHVpU291cmNl Q29kZSkpCisgICAgICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAgCiAgICAgICAgIHZhciBz b3VyY2VGcmFtZSA9IHRoaXMuX2dldE9yQ3JlYXRlU291cmNlRnJhbWUodWlTb3VyY2VDb2RlKTsK KyAgICAgICAgaWYgKHRoaXMuX2N1cmVudFVJU291cmNlQ29kZSA9PT0gdWlTb3VyY2VDb2RlKQor ICAgICAgICAgICAgcmV0dXJuIHNvdXJjZUZyYW1lOworICAgICAgICB0aGlzLl9jdXJlbnRVSVNv dXJjZUNvZGUgPSB1aVNvdXJjZUNvZGU7CiAKKyAgICAgICAgdGhpcy5fZmlsZVNlbGVjdG9yLnJl dmVhbFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUpOwogICAgICAgICB0aGlzLl9lZGl0b3JDb250 YWluZXIuc2hvd0ZpbGUodWlTb3VyY2VDb2RlKTsKICAgICAgICAgdGhpcy5fdXBkYXRlU2NyaXB0 Vmlld1N0YXR1c0Jhckl0ZW1zKCk7Ci0KKyAgICAgICAgCiAgICAgICAgIGlmICh1aVNvdXJjZUNv ZGUudXJsKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLmxhc3RWaWV3ZWRTY3Jp cHRGaWxlLnNldCh1aVNvdXJjZUNvZGUudXJsKTsKIAogICAgICAgICByZXR1cm4gc291cmNlRnJh bWU7CiAgICAgfSwKIAotICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291 cmNlQ29kZX0gdWlTb3VyY2VDb2RlCi0gICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lfQotICAgICAqLwotICAgIF9zaG93QW5kUmV2ZWFsSW5GaWxlU2VsZWN0b3I6IGZ1bmN0 aW9uKHVpU291cmNlQ29kZSkKLSAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fZmlsZVNlbGVjdG9y LmlzU2NyaXB0U291cmNlQWRkZWQodWlTb3VyY2VDb2RlKSkKLSAgICAgICAgICAgIHJldHVybiBu dWxsOwotICAgICAgICAKLSAgICAgICAgdGhpcy5fZmlsZVNlbGVjdG9yLnJldmVhbFVJU291cmNl Q29kZSh1aVNvdXJjZUNvZGUpOwotICAgICAgICByZXR1cm4gdGhpcy5fc2hvd0ZpbGUodWlTb3Vy Y2VDb2RlKTsKLSAgICB9LAotCiAgICAgcmVxdWVzdFZpc2libGVTY3JpcHRPdXRsaW5lOiBmdW5j dGlvbigpCiAgICAgewogICAgICAgICBmdW5jdGlvbiBjb250ZW50Q2FsbGJhY2sobWltZVR5cGUs IGNvbnRlbnQpCkBAIC01MzYsNyArNTMxLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3NvdXJjZUZyYW1lc0J5VUlTb3VyY2VDb2RlLnB1 dCh1aVNvdXJjZUNvZGUsIHNvdXJjZUZyYW1lKTsKICAgICAgICAgcmV0dXJuIHNvdXJjZUZyYW1l OwogICAgIH0sCi0gICAgCisKICAgICAvKioKICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQogICAgICAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5T b3VyY2VGcmFtZX0KQEAgLTU0NSw3ICs1NDAsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VGcmFtZXNC eVVJU291cmNlQ29kZS5nZXQodWlTb3VyY2VDb2RlKSB8fCB0aGlzLl9jcmVhdGVTb3VyY2VGcmFt ZSh1aVNvdXJjZUNvZGUpOwogICAgIH0sCi0gICAgCisKICAgICAvKioKICAgICAgKiBAcGFyYW0g e1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQogICAgICAqIEByZXR1cm4g e1dlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZX0KQEAgLTYyMyw3ICs2MTgsNyBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8gQW5vbnltb3VzIHNjcmlw dHMgYXJlIG5vdCBhZGRlZCB0byBmaWxlcyBzZWxlY3QgYnkgZGVmYXVsdC4KICAgICAgICAgdGhp cy5fZmlsZVNlbGVjdG9yLmFkZFVJU291cmNlQ29kZSh1aUxvY2F0aW9uLnVpU291cmNlQ29kZSk7 CiAgICAgICAgIAotICAgICAgICB2YXIgc291cmNlRnJhbWUgPSB0aGlzLl9zaG93QW5kUmV2ZWFs SW5GaWxlU2VsZWN0b3IodWlMb2NhdGlvbi51aVNvdXJjZUNvZGUpOworICAgICAgICB2YXIgc291 cmNlRnJhbWUgPSB0aGlzLl9zaG93RmlsZSh1aUxvY2F0aW9uLnVpU291cmNlQ29kZSk7CiAgICAg ICAgIHNvdXJjZUZyYW1lLnNldEV4ZWN1dGlvbkxpbmUodWlMb2NhdGlvbi5saW5lTnVtYmVyKTsK ICAgICAgICAgdGhpcy5fZXhlY3V0aW9uU291cmNlRnJhbWUgPSBzb3VyY2VGcmFtZTsKICAgICB9 LApAQCAtNjQ2LDEwICs2NDEsMjEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHRoaXMuX3VwZGF0ZUV4ZWN1dGlvbkxpbmUodGhpcy5fcHJlc2VudGF0 aW9uTW9kZWwuZXhlY3V0aW9uTGluZUxvY2F0aW9uKTsKICAgICB9LAogCisgICAgX2VkaXRvckNs b3NlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0g LyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSAqLyBldmVudC5kYXRhOworCisg ICAgICAgIC8vIFdlIGRvbid0IG5lZWQgdG8gdXBkYXRlIGZpbGUgc2VsZWN0b3IgaGVyZSByZWdh cmRsZXNzIG9mIHdoZXRoZXIgdXNlU2NyaXB0c05hdmlnYXRvciBpcyBzZXQgb3Igbm90OgorICAg ICAgICAvLyBTaW5nbGVGaWxlRWRpdG9yQ29udGFpbmVyIG5ldmVyIGRpc3BhdGNoZXMgRWRpdG9y Q2xvc2VkLCBzbyBubyBuZWVkIHRvIHVwZGF0ZSBDb21ib0JveEZpbGVTZWxlY3RvcjsgCisgICAg ICAgIC8vIFNjcmlwdHNOYXZpZ2F0b3IgZG9lcyBub3QgbmVlZCB1cGRhdGUgb24gRWRpdG9yQ2xv c2VkLgorCisgICAgICAgIHRoaXMuX3VwZGF0ZVNjcmlwdFZpZXdTdGF0dXNCYXJJdGVtcygpOwor ICAgIH0sCisKICAgICBfZWRpdG9yU2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAg ICAgICAgdmFyIHVpU291cmNlQ29kZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlVJU291cmNl Q29kZX0gKi8gZXZlbnQuZGF0YTsKLSAgICAgICAgdGhpcy5fZmlsZVNlbGVjdG9yLnJldmVhbFVJ U291cmNlQ29kZSh1aVNvdXJjZUNvZGUpOworICAgICAgICB0aGlzLl9zaG93RmlsZSh1aVNvdXJj ZUNvZGUpOwogICAgIH0sCiAKICAgICBfZmlsZVNlbGVjdGVkOiBmdW5jdGlvbihldmVudCkKQEAg LTEwNTgsNyArMTA2NCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9y LnByb3RvdHlwZSA9IHsKICAgICAvKioKICAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGV9IHVpU291cmNlQ29kZQogICAgICAqLwotICAgIHJldmVhbFVJU291cmNlQ29kZTog ZnVuY3Rpb24odWlTb3VyY2VDb2RlKSB7IHJldHVybiBmYWxzZTsgfSwKKyAgICByZXZlYWxVSVNv dXJjZUNvZGU6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkgeyB9LAogCiAgICAgLyoqCiAgICAgICog QHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKQEAgLTEwNzks NyArMTA4NSw4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9yLnByb3Rv dHlwZSA9IHsKIFdlYkluc3BlY3Rvci5FZGl0b3JDb250YWluZXIgPSBmdW5jdGlvbigpIHsgfQog CiBXZWJJbnNwZWN0b3IuRWRpdG9yQ29udGFpbmVyLkV2ZW50cyA9IHsKLSAgICBFZGl0b3JTZWxl Y3RlZDogIkVkaXRvclNlbGVjdGVkIgorICAgIEVkaXRvclNlbGVjdGVkOiAiRWRpdG9yU2VsZWN0 ZWQiLAorICAgIEVkaXRvckNsb3NlZDogIkVkaXRvckNsb3NlZCIKIH0KIAogV2ViSW5zcGVjdG9y LkVkaXRvckNvbnRhaW5lci5wcm90b3R5cGUgPSB7CkBAIC0xMTgzLDYgKzExOTAsOCBAQCBXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLkNvbWJvQm94RmlsZVNlbGVjdG9yLnByb3RvdHlwZSA9IHsK ICAgICAgKi8KICAgICByZXZlYWxVSVNvdXJjZUNvZGU6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkK ICAgICB7CisgICAgICAgIGlmICh0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnQuc2VsZWN0ZWRJbmRl eCA9PT0gdWlTb3VyY2VDb2RlLl9vcHRpb24uaW5kZXgpCisgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIHRoaXMuX2lubmVyUmV2ZWFsVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSwgdHJ1ZSk7 CiAgICAgfSwKICAgICAKQEAgLTEyMDAsOCArMTIwOSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwuQ29tYm9Cb3hGaWxlU2VsZWN0b3IucHJvdG90eXBlID0gewogICAgICAgICAKICAgICAg ICAgdGhpcy5fdXBkYXRlQmFja0FuZEZvcndhcmRCdXR0b25zKCk7CiAgICAgICAgIHRoaXMuX2Zp bGVzU2VsZWN0RWxlbWVudC5zZWxlY3RlZEluZGV4ID0gdWlTb3VyY2VDb2RlLl9vcHRpb24uaW5k ZXg7Ci0gICAgICAgIAotICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9yLkV2ZW50 cy5GaWxlU2VsZWN0ZWQsIHVpU291cmNlQ29kZSk7CiAgICAgfSwKICAgICAKICAgICAvKioKQEAg LTEzOTAsNyArMTM5OCwxMCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkNvbWJvQm94Rmls ZVNlbGVjdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICByZXR1cm4gYS5uYW1lRm9y U29ydGluZy5sb2NhbGVDb21wYXJlKGIubmFtZUZvclNvcnRpbmcpOwogICAgICAgICAgICAgfQog ICAgICAgICAgICAgdmFyIGluc2VydGlvbkluZGV4ID0gaW5zZXJ0aW9uSW5kZXhGb3JPYmplY3RJ bkxpc3RTb3J0ZWRCeUZ1bmN0aW9uKG9wdGlvbiwgc2VsZWN0LmNoaWxkTm9kZXMsIG9wdGlvbkNv bXBhcmUpOworICAgICAgICAgICAgdmFyIHNob3dzTm90aGluZyA9IHNlbGVjdC5zZWxlY3RlZElu ZGV4ID09PSAtMTsKICAgICAgICAgICAgIHNlbGVjdC5pbnNlcnRCZWZvcmUob3B0aW9uLCBpbnNl cnRpb25JbmRleCA8IDAgPyBudWxsIDogc2VsZWN0LmNoaWxkTm9kZXMuaXRlbShpbnNlcnRpb25J bmRleCkpOworICAgICAgICAgICAgaWYgKHNob3dzTm90aGluZykKKyAgICAgICAgICAgICAgICBz ZWxlY3Quc2VsZWN0ZWRJbmRleCA9IC0xOwogICAgICAgICB9CiAKICAgICAgICAgaW5zZXJ0T3Jk ZXJlZChvcHRpb24pOwpAQCAtMTQ0OSw3ICsxNDYwLDYgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5Db21ib0JveEZpbGVTZWxlY3Rvci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIHVp U291cmNlQ29kZSA9IHRoaXMuX2JhY2tGb3J3YXJkTGlzdFstLXRoaXMuX2N1cnJlbnRCYWNrRm9y d2FyZEluZGV4XTsKICAgICAgICAgdGhpcy5faW5uZXJSZXZlYWxVSVNvdXJjZUNvZGUodWlTb3Vy Y2VDb2RlLCBmYWxzZSk7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9yLkV2ZW50cy5GaWxlU2VsZWN0ZWQs IHVpU291cmNlQ29kZSk7CiAgICAgfSwKIAogICAgIF9nb0ZvcndhcmQ6IGZ1bmN0aW9uKCkKQEAg LTE0NjEsNyArMTQ3MSw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuQ29tYm9Cb3hGaWxl U2VsZWN0b3IucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSB0aGlz Ll9iYWNrRm9yd2FyZExpc3RbKyt0aGlzLl9jdXJyZW50QmFja0ZvcndhcmRJbmRleF07CiAgICAg ICAgIHRoaXMuX2lubmVyUmV2ZWFsVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSwgZmFsc2UpOwot ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsLkZpbGVTZWxlY3Rvci5FdmVudHMuRmlsZVNlbGVjdGVkLCB1aVNvdXJjZUNvZGUpOwog ICAgIH0sCiAKICAgICAvKioKQEAgLTE0NzQsNyArMTQ4Myw2IEBAIFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwuQ29tYm9Cb3hGaWxlU2VsZWN0b3IucHJvdG90eXBlID0gewogCiAgICAgICAgIHZh ciB1aVNvdXJjZUNvZGUgPSB0aGlzLl9maWxlc1NlbGVjdEVsZW1lbnRbdGhpcy5fZmlsZXNTZWxl Y3RFbGVtZW50LnNlbGVjdGVkSW5kZXhdLl91aVNvdXJjZUNvZGU7CiAgICAgICAgIHRoaXMuX2lu bmVyUmV2ZWFsVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSwgdHJ1ZSk7Ci0gICAgICAgIHRoaXMu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNl bGVjdG9yLkV2ZW50cy5GaWxlU2VsZWN0ZWQsIHVpU291cmNlQ29kZSk7CiAgICAgICAgIGlmIChm b2N1c1NvdXJjZSkKICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9yLkV2ZW50cy5SZWxlYXNlZEZvY3Vz QWZ0ZXJTZWxlY3Rpb24sIHVpU291cmNlQ29kZSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0b3JDb250YWluZXIuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5q cwppbmRleCBmMWY3M2QxNDQ4NWMxZmYzODQ1ZWQ3N2UzZTY3ZGUyYmE3MTNjZWI4Li45MjRhOWFl ZWFkNjZhY2I2MWQ0OWFlZGEzZjc1YWZiZWUzZmM0ZmZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5q cwpAQCAtNDQsNyArNDQsNyBAQCBXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyID0g ZnVuY3Rpb24oZGVsZWdhdGUpCiAgICAgdGhpcy5fdGFiYmVkUGFuZS5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLkV2ZW50VHlwZXMuVGFiU2VsZWN0ZWQsIHRoaXMuX3Rh YlNlbGVjdGVkLCB0aGlzKTsKIAogICAgIHRoaXMuX3RhYklkcyA9IG5ldyBNYXAoKTsgIAotICAg IHRoaXMuX2ZpbGVzID0ge307ICAKKyAgICB0aGlzLl9maWxlcyA9IHt9OwogfQogCiBXZWJJbnNw ZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLl90YWJJZCA9IDA7CkBAIC03MSw2ICs3MSwxMCBA QCBXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZSA9IHsKICAgICAg Ki8KICAgICBzaG93RmlsZTogZnVuY3Rpb24odWlTb3VyY2VDb2RlKQogICAgIHsKKyAgICAgICAg aWYgKHRoaXMuX2N1cnJlbnRGaWxlID09PSB1aVNvdXJjZUNvZGUpCisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIAorICAgICAgICB0aGlzLl9jdXJyZW50RmlsZSA9IHVpU291cmNlQ29kZTsK ICAgICAgICAgdmFyIHRhYklkID0gdGhpcy5fdGFiSWRzLmdldCh1aVNvdXJjZUNvZGUpIHx8IHRo aXMuX2FwcGVuZEZpbGVUYWIodWlTb3VyY2VDb2RlKTsKICAgICAgICAgdGhpcy5fdGFiYmVkUGFu ZS5zZWxlY3RUYWIodGFiSWQpOwogICAgIH0sCkBAIC0xMjcsOCArMTMxLDEyIEBAIFdlYkluc3Bl Y3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIucHJvdG90eXBlID0gewogICAgIF90YWJDbG9zZWQ6 IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIHRhYklkID0gLyoqIEB0eXBlIHtz dHJpbmd9ICovIGV2ZW50LmRhdGEudGFiSWQ7Ci0gICAgICAgIHRoaXMuX3RhYklkcy5yZW1vdmUo dGhpcy5fZmlsZXNbdGFiSWRdKTsKKworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gdGhpcy5f ZmlsZXNbdGFiSWRdOworICAgICAgICB0aGlzLl90YWJJZHMucmVtb3ZlKHVpU291cmNlQ29kZSk7 CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9maWxlc1t0YWJJZF07CisKKyAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5FZGl0b3JDb250 YWluZXIuRXZlbnRzLkVkaXRvckNsb3NlZCwgdWlTb3VyY2VDb2RlKTsKICAgICB9LAogCiAgICAg LyoqCkBAIC0xMzcsNyArMTQ1LDExIEBAIFdlYkluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWlu ZXIucHJvdG90eXBlID0gewogICAgIF90YWJTZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAg ewogICAgICAgICB2YXIgdGFiSWQgPSAvKiogQHR5cGUge3N0cmluZ30gKi8gZXZlbnQuZGF0YS50 YWJJZDsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LkVkaXRvckNvbnRhaW5lci5FdmVudHMuRWRpdG9yU2VsZWN0ZWQsIHRoaXMuX2ZpbGVzW3RhYklk XSk7CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSB0aGlzLl9maWxlc1t0YWJJZF07CisgICAg ICAgIAorICAgICAgICBpZiAodGhpcy5fY3VycmVudEZpbGUgPT09IHVpU291cmNlQ29kZSkKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLkVkaXRvckNvbnRhaW5lci5FdmVudHMuRWRpdG9yU2VsZWN0ZWQsIHVpU291 cmNlQ29kZSk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMjA0LDcgKzIxNiw3IEBAIFdlYkluc3Bl Y3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl90 YWJiZWRQYW5lLmNsb3NlQWxsVGFicygpOwogICAgICAgICB0aGlzLl90YWJJZHMgPSBuZXcgTWFw KCk7CiAgICAgICAgIHRoaXMuX2ZpbGVzID0ge307Ci0KKyAgICAgICAgZGVsZXRlIHRoaXMuX2N1 cnJlbnRGaWxlOwogICAgIH0sCiAKICAgICAvKioKQEAgLTIxNiw0ICsyMjgsNCBAQCBXZWJJbnNw ZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZSA9IHsKICAgICB9CiB9CiAKLVdl Ykluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdl Ykluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlOwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK K1dlYkluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9 IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlOwo=