70899 2011-10-26 02:58:19 -0700 Web Inspector: Refactor ScriptsPanel so that ConsoleView does not depend on it. 2011-10-27 04:36:49 -0700 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 podivilov rik timothy yurys oldest_to_newest 490712 0 vsevik 2011-10-26 02:58:19 -0700 Refactor ScriptsPanel so that ConsoleView does not depend on it. 490719 1 112478 vsevik 2011-10-26 03:36:59 -0700 Created attachment 112478 Patch 491457 2 vsevik 2011-10-27 04:36:49 -0700 Committed r98546: <http://trac.webkit.org/changeset/98546> 112478 2011-10-26 03:36:59 -0700 2011-10-26 08:31:56 -0700 Patch bug-70899-20111026143657.patch text/plain 13536 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTg0NTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0Yzc1YTk0MWY3YmZiYWI2 ZWMyNmRlZWVjZDBmYTU5NWYwZjYzOGYxLi45ZjY4ZDhiYzQxYjg2ZWE3YjIwMzgwNzVmOTYxZTlm ZTkxNDg4ZWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzEgQEAKIDIwMTEtMTAtMjYgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVmYWN0b3IgU2NyaXB0c1BhbmVsIHNvIHRoYXQgQ29uc29sZVZpZXcgZG9lcyBub3QgZGVw ZW5kIG9uIGl0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzA4OTkKKworICAgICAgICBNb3ZlZCBtZXRob2RzIHVzZWQgaW4gY29uc29sZSB2aWV3IHRv IERlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuCisgICAgICAgIENoYW5nZWQgZGVidWdnZXJQYXVz ZWQgaGFuZGxlciBsb2dpYyBzbyB0aGF0IHNlbGVjdGVkQ2FsbEZyYW1lIGlzIG5ldmVyIG51bGwg d2hlbiBkZWJ1Z2dlciBpcyBwYXVzZWQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3Rv dHlwZS5fZGVidWdnZXJQYXVzZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJl c2VudGF0aW9uTW9kZWwucHJvdG90eXBlLnNldCBzZWxlY3RlZENhbGxGcmFtZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuZXZhbHVh dGVJblNlbGVjdGVkQ2FsbEZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclBy ZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5nZXRTZWxlY3RlZENhbGxGcmFtZVZhcmlhYmxlcy5w cm9wZXJ0aWVzQ29sbGVjdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsLnByb3RvdHlwZS5nZXRTZWxlY3RlZENhbGxGcmFtZVZhcmlhYmxlcyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUu X2Rpc3BhdGNoRXhlY3V0aW9uTGluZUNoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLmdldCBleGVjdXRpb25MaW5lTG9jYXRp b24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2NvbnNvbGVDb21tYW5k RXZhbHVhdGVkSW5TZWxlY3RlZENhbGxGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLnByb3RvdHlwZS5fZXhlY3V0aW9uTGluZUNoYW5nZWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX3VwZGF0ZUV4ZWN1dGlvbkxpbmUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX2NhbGxGcmFtZVNl bGVjdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl91 cGRhdGVDYWxsRnJhbWUpOgorCisyMDExLTEwLTI2ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtA Y2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IERlYnVnZ2VyIGZhaWxzIHdo ZW4gdGhlcmUgaXMgYW4gaW52YWxpZCB3YXRjaCBleHByZXNzaW9uLgogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA3MTgKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKaW5kZXggZjRmODQzMmNh OTgxYTg5NWQwZmE0NTU5NmQ2MmI1NzFlNDA5ODgyYS4uYzkzZmZmMWMzMDFkOGU1NGZiMzEyZmE5 Yzc1NjBmOGNjMTNjMTQ3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0NvbnNvbGVWaWV3LmpzCkBAIC0zNjAsOSArMzYwLDkgQEAgV2ViSW5zcGVjdG9yLkNv bnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGNvbXBsZXRpb25zUmVhZHlDYWxs YmFjayhbXSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLQotICAgICAgICBpZiAo IWV4cHJlc3Npb25TdHJpbmcgJiYgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLnBhdXNlZCkK LSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5nZXRTZWxlY3RlZENhbGxG cmFtZVZhcmlhYmxlcyhyZWNlaXZlZFByb3BlcnR5TmFtZXMuYmluZCh0aGlzKSk7CisgICAgICAg IAorICAgICAgICBpZiAoIWV4cHJlc3Npb25TdHJpbmcgJiYgV2ViSW5zcGVjdG9yLmRlYnVnZ2Vy UHJlc2VudGF0aW9uTW9kZWwucGF1c2VkKQorICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwuZ2V0U2VsZWN0ZWRDYWxsRnJhbWVWYXJpYWJsZXMocmVjZWl2 ZWRQcm9wZXJ0eU5hbWVzLmJpbmQodGhpcykpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB0 aGlzLmV2YWxJbkluc3BlY3RlZFdpbmRvdyhleHByZXNzaW9uU3RyaW5nLCAiY29tcGxldGlvbiIs IHRydWUsIHRydWUsIGZhbHNlLCBldmFsdWF0ZWQuYmluZCh0aGlzKSk7CiAKQEAgLTU3Myw4ICs1 NzMsOCBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogICAgICAqLwog ICAgIGV2YWxJbkluc3BlY3RlZFdpbmRvdzogZnVuY3Rpb24oZXhwcmVzc2lvbiwgb2JqZWN0R3Jv dXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgZG9Ob3RQYXVzZU9uRXhjZXB0aW9ucywgcmV0dXJu QnlWYWx1ZSwgY2FsbGJhY2spCiAgICAgewotICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnBhbmVs cy5zY3JpcHRzLnBhdXNlZCkgewotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3Jp cHRzLmV2YWx1YXRlSW5TZWxlY3RlZENhbGxGcmFtZShleHByZXNzaW9uLCBvYmplY3RHcm91cCwg aW5jbHVkZUNvbW1hbmRMaW5lQVBJLCByZXR1cm5CeVZhbHVlLCBjYWxsYmFjayk7CisgICAgICAg IGlmIChXZWJJbnNwZWN0b3IuZGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wYXVzZWQpIHsKKyAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmV2YWx1YXRl SW5TZWxlY3RlZENhbGxGcmFtZShleHByZXNzaW9uLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1h bmRMaW5lQVBJLCByZXR1cm5CeVZhbHVlLCBjYWxsYmFjayk7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IGIzNTc1MjFm MTc0NTc4MGFlYTYyYjBiZGE4MGRhNzM3OGE4YWU5OTUuLjFiYTUzNWFmMGM4YWI1MTk5OGNlZWVm MmY3NGY3N2I1MjcwYmM4MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTY0 LDYgKzY0LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRz ID0gewogICAgIERlYnVnZ2VyUGF1c2VkOiAiZGVidWdnZXItcGF1c2VkIiwKICAgICBEZWJ1Z2dl clJlc3VtZWQ6ICJkZWJ1Z2dlci1yZXN1bWVkIiwKICAgICBDYWxsRnJhbWVTZWxlY3RlZDogImNh bGwtZnJhbWUtc2VsZWN0ZWQiLAorICAgIENvbnNvbGVDb21tYW5kRXZhbHVhdGVkSW5TZWxlY3Rl ZENhbGxGcmFtZTogImNvbnNvbGUtY29tbWFuZC1ldmFsdWF0ZWQtaW4tc2VsZWN0ZWQtY2FsbC1m cmFtZSIsCiAgICAgRXhlY3V0aW9uTGluZUNoYW5nZWQ6ICJleGVjdXRpb24tbGluZS1jaGFuZ2Vk IgogfQogCkBAIC00ODIsOSArNDgzLDggQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fcHJlc2VudGF0aW9uQ2Fs bEZyYW1lcy5wdXNoKG5ldyBXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQ2FsbEZyYW1lKGNhbGxG cmFtZSwgaSwgdGhpcywgcmF3U291cmNlQ29kZSkpOwogICAgICAgICB9CiAgICAgICAgIHZhciBk ZXRhaWxzID0gV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuZGVidWdnZXJQYXVzZWREZXRhaWxz OwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuRGVidWdnZXJQYXVzZWQsIHsgY2FsbEZyYW1l czogdGhpcy5fcHJlc2VudGF0aW9uQ2FsbEZyYW1lcywgZGV0YWlsczogZGV0YWlscyB9KTsKLQog ICAgICAgICB0aGlzLnNlbGVjdGVkQ2FsbEZyYW1lID0gdGhpcy5fcHJlc2VudGF0aW9uQ2FsbEZy YW1lc1swXTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkRlYnVnZ2VyUGF1c2VkLCB7IGNh bGxGcmFtZXM6IHRoaXMuX3ByZXNlbnRhdGlvbkNhbGxGcmFtZXMsIGRldGFpbHM6IGRldGFpbHMg fSk7CiAgICAgfSwKIAogICAgIF9kZWJ1Z2dlclJlc3VtZWQ6IGZ1bmN0aW9uKCkKQEAgLTUxMCw4 ICs1MTAsNiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHRoaXMuX3NlbGVjdGVkQ2FsbEZyYW1lLnJhd1NvdXJjZUNvZGUuZm9y Y2VVcGRhdGVTb3VyY2VNYXBwaW5nKCk7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5DYWxs RnJhbWVTZWxlY3RlZCwgY2FsbEZyYW1lKTsKIAotICAgICAgICBpZiAodGhpcy5fc2VsZWN0ZWRD YWxsRnJhbWUucmF3U291cmNlQ29kZS5zb3VyY2VNYXBwaW5nKQotICAgICAgICAgICAgdGhpcy5f ZGlzcGF0Y2hFeGVjdXRpb25MaW5lQ2hhbmdlZChudWxsKTsKICAgICAgICAgdGhpcy5fc2VsZWN0 ZWRDYWxsRnJhbWUucmF3U291cmNlQ29kZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5S YXdTb3VyY2VDb2RlLkV2ZW50cy5Tb3VyY2VNYXBwaW5nVXBkYXRlZCwgdGhpcy5fZGlzcGF0Y2hF eGVjdXRpb25MaW5lQ2hhbmdlZCwgdGhpcyk7CiAgICAgfSwKIApAQCAtNTIxLDEzICs1MTksNzYg QEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewog ICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9XZWJJbnNwZWN0b3Iu UmVtb3RlT2JqZWN0LCBib29sZWFuLCBSdW50aW1lQWdlbnQuUmVtb3RlT2JqZWN0PSl9IGNhbGxi YWNrCisgICAgICovCisgICAgZXZhbHVhdGVJblNlbGVjdGVkQ2FsbEZyYW1lOiBmdW5jdGlvbihj b2RlLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCByZXR1cm5CeVZhbHVlLCBj YWxsYmFjaykKKyAgICB7CisgICAgICAgIC8qKgorICAgICAgICAgKiBAcGFyYW0gez9SdW50aW1l QWdlbnQuUmVtb3RlT2JqZWN0fSByZXN1bHQKKyAgICAgICAgICogQHBhcmFtIHtib29sZWFufSB3 YXNUaHJvd24KKyAgICAgICAgICovCisgICAgICAgIGZ1bmN0aW9uIGRpZEV2YWx1YXRlKHJlc3Vs dCwgd2FzVGhyb3duKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAocmV0dXJuQnlWYWx1ZSkK KyAgICAgICAgICAgICAgICBjYWxsYmFjayhudWxsLCB3YXNUaHJvd24sIHdhc1Rocm93biA/IG51 bGwgOiByZXN1bHQpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGNhbGxiYWNr KFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVBheWxvYWQocmVzdWx0KSwgd2FzVGhyb3du KTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgaWYgKG9iamVjdEdyb3VwID09PSAiY29uc29s ZSIpCisgICAgICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5z cGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkNvbnNvbGVDb21tYW5kRXZh bHVhdGVkSW5TZWxlY3RlZENhbGxGcmFtZSk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAg IHRoaXMuc2VsZWN0ZWRDYWxsRnJhbWUuZXZhbHVhdGUoY29kZSwgb2JqZWN0R3JvdXAsIGluY2x1 ZGVDb21tYW5kTGluZUFQSSwgcmV0dXJuQnlWYWx1ZSwgZGlkRXZhbHVhdGUuYmluZCh0aGlzKSk7 CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oT2JqZWN0KX0gY2Fs bGJhY2sKKyAgICAgKi8KKyAgICBnZXRTZWxlY3RlZENhbGxGcmFtZVZhcmlhYmxlczogZnVuY3Rp b24oY2FsbGJhY2spCisgICAgeworICAgICAgICB2YXIgcmVzdWx0ID0geyB0aGlzOiB0cnVlIH07 CisKKyAgICAgICAgdmFyIHNlbGVjdGVkQ2FsbEZyYW1lID0gdGhpcy5zZWxlY3RlZENhbGxGcmFt ZTsKKyAgICAgICAgaWYgKCFzZWxlY3RlZENhbGxGcmFtZSkKKyAgICAgICAgICAgIGNhbGxiYWNr KHJlc3VsdCk7CisKKyAgICAgICAgdmFyIHBlbmRpbmdSZXF1ZXN0cyA9IDA7CisKKyAgICAgICAg ZnVuY3Rpb24gcHJvcGVydGllc0NvbGxlY3RlZChwcm9wZXJ0aWVzKQorICAgICAgICB7CisgICAg ICAgICAgICBmb3IgKHZhciBpID0gMDsgcHJvcGVydGllcyAmJiBpIDwgcHJvcGVydGllcy5sZW5n dGg7ICsraSkKKyAgICAgICAgICAgICAgICByZXN1bHRbcHJvcGVydGllc1tpXS5uYW1lXSA9IHRy dWU7CisgICAgICAgICAgICBpZiAoLS1wZW5kaW5nUmVxdWVzdHMgPT0gMCkKKyAgICAgICAgICAg ICAgICBjYWxsYmFjayhyZXN1bHQpOworICAgICAgICB9CisKKyAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCBzZWxlY3RlZENhbGxGcmFtZS5zY29wZUNoYWluLmxlbmd0aDsgKytpKSB7CisgICAg ICAgICAgICB2YXIgc2NvcGUgPSBzZWxlY3RlZENhbGxGcmFtZS5zY29wZUNoYWluW2ldOworICAg ICAgICAgICAgdmFyIG9iamVjdCA9IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVBheWxv YWQoc2NvcGUub2JqZWN0KTsKKyAgICAgICAgICAgIHBlbmRpbmdSZXF1ZXN0cysrOworICAgICAg ICAgICAgb2JqZWN0LmdldEFsbFByb3BlcnRpZXMocHJvcGVydGllc0NvbGxlY3RlZCk7CisgICAg ICAgIH0KKyAgICB9LAorCisgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZl bnR9IGV2ZW50CiAgICAgICovCiAgICAgX2Rpc3BhdGNoRXhlY3V0aW9uTGluZUNoYW5nZWQ6IGZ1 bmN0aW9uKGV2ZW50KQogICAgIHsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5l cnMoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkV4ZWN1dGlv bkxpbmVDaGFuZ2VkLCB0aGlzLmV4ZWN1dGlvbkxpbmVMb2NhdGlvbik7CisgICAgfSwKKworICAg IC8qKgorICAgICAqIEB0eXBlIHtXZWJJbnNwZWN0b3IuVUlMb2NhdGlvbn0KKyAgICAgKi8KKyAg ICBnZXQgZXhlY3V0aW9uTGluZUxvY2F0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5f c2VsZWN0ZWRDYWxsRnJhbWUucmF3U291cmNlQ29kZS5zb3VyY2VNYXBwaW5nKQorICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICAKICAgICAgICAgdmFyIHJhd0xvY2F0aW9uID0gdGhpcy5fc2Vs ZWN0ZWRDYWxsRnJhbWUuX2NhbGxGcmFtZS5sb2NhdGlvbjsKICAgICAgICAgdmFyIHVpTG9jYXRp b24gPSB0aGlzLl9zZWxlY3RlZENhbGxGcmFtZS5yYXdTb3VyY2VDb2RlLnNvdXJjZU1hcHBpbmcu cmF3TG9jYXRpb25Ub1VJTG9jYXRpb24ocmF3TG9jYXRpb24pOwotICAgICAgICB0aGlzLmRpc3Bh dGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2Rl bC5FdmVudHMuRXhlY3V0aW9uTGluZUNoYW5nZWQsIHVpTG9jYXRpb24pOworICAgICAgICByZXR1 cm4gdWlMb2NhdGlvbjsKICAgICB9LAogCiAgICAgLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDRmZTU0NGMxNDAxM2Q5 MmMxM2Q0OTVjNTRjYjE4NGIyYmZiMDI2YWMuLjVhOGNjMTRiZmQ5MDgwMTUyNmIxNmE1MWI5NTBh YTllMDNmZWRjMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xNzksOCArMTc5LDkgQEAgV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbCA9IGZ1bmN0aW9uKHByZXNlbnRhdGlvbk1vZGVsKQogICAgIHRoaXMuX3ByZXNlbnRh dGlvbk1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWwuRXZlbnRzLkRlYnVnZ2VyUGF1c2VkLCB0aGlzLl9kZWJ1Z2dlclBhdXNlZCwgdGhp cyk7CiAgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuRGVidWdnZXJSZXN1bWVkLCB0 aGlzLl9kZWJ1Z2dlclJlc3VtZWQsIHRoaXMpOwogICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVs LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwu RXZlbnRzLkNhbGxGcmFtZVNlbGVjdGVkLCB0aGlzLl9jYWxsRnJhbWVTZWxlY3RlZCwgdGhpcyk7 CisgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuQ29uc29sZUNvbW1hbmRFdmFsdWF0 ZWRJblNlbGVjdGVkQ2FsbEZyYW1lLCB0aGlzLl9jb25zb2xlQ29tbWFuZEV2YWx1YXRlZEluU2Vs ZWN0ZWRDYWxsRnJhbWUsIHRoaXMpOwogICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRz LkV4ZWN1dGlvbkxpbmVDaGFuZ2VkLCB0aGlzLl9leGVjdXRpb25MaW5lQ2hhbmdlZCwgdGhpcyk7 Ci0KKyAgICAKICAgICB2YXIgZW5hYmxlRGVidWdnZXIgPSBQcmVmZXJlbmNlcy5kZWJ1Z2dlckFs d2F5c0VuYWJsZWQgfHwgV2ViSW5zcGVjdG9yLnNldHRpbmdzLmRlYnVnZ2VyRW5hYmxlZC5nZXQo KTsKICAgICBpZiAoZW5hYmxlRGVidWdnZXIpCiAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dl ck1vZGVsLmVuYWJsZURlYnVnZ2VyKCk7CkBAIC00NDgsNTMgKzQ0OSw5IEBAIFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5q c0JyZWFrcG9pbnRzLnJlbW92ZUJyZWFrcG9pbnQoYnJlYWtwb2ludC51aVNvdXJjZUNvZGUsIGJy ZWFrcG9pbnQubGluZU51bWJlcik7CiAgICAgfSwKIAotICAgIC8qKgotICAgICAqIEBwYXJhbSB7 ZnVuY3Rpb24oP1dlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QsIGJvb2xlYW4sIFJ1bnRpbWVBZ2Vu dC5SZW1vdGVPYmplY3Q9KX0gY2FsbGJhY2sKLSAgICAgKi8KLSAgICBldmFsdWF0ZUluU2VsZWN0 ZWRDYWxsRnJhbWU6IGZ1bmN0aW9uKGNvZGUsIG9iamVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExp bmVBUEksIHJldHVybkJ5VmFsdWUsIGNhbGxiYWNrKQotICAgIHsKLSAgICAgICAgLyoqCi0gICAg ICAgICAqIEBwYXJhbSB7P1J1bnRpbWVBZ2VudC5SZW1vdGVPYmplY3R9IHJlc3VsdAotICAgICAg ICAgKiBAcGFyYW0ge2Jvb2xlYW59IHdhc1Rocm93bgotICAgICAgICAgKi8KLSAgICAgICAgZnVu Y3Rpb24gZGlkRXZhbHVhdGUocmVzdWx0LCB3YXNUaHJvd24pCi0gICAgICAgIHsKLSAgICAgICAg ICAgIGlmIChvYmplY3RHcm91cCA9PT0gImNvbnNvbGUiKQotICAgICAgICAgICAgICAgIHRoaXMu c2lkZWJhclBhbmVzLnNjb3BlY2hhaW4udXBkYXRlKHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNl bGVjdGVkQ2FsbEZyYW1lKTsKLSAgICAgICAgICAgIGlmIChyZXR1cm5CeVZhbHVlKQotICAgICAg ICAgICAgICAgIGNhbGxiYWNrKG51bGwsIHdhc1Rocm93biwgd2FzVGhyb3duID8gbnVsbCA6IHJl c3VsdCk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgY2FsbGJhY2soV2ViSW5z cGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChyZXN1bHQpLCB3YXNUaHJvd24pOwotICAg ICAgICB9Ci0gICAgICAgIHZhciBzZWxlY3RlZENhbGxGcmFtZSA9IHRoaXMuX3ByZXNlbnRhdGlv bk1vZGVsLnNlbGVjdGVkQ2FsbEZyYW1lOwotICAgICAgICBpZiAoc2VsZWN0ZWRDYWxsRnJhbWUp Ci0gICAgICAgICAgICBzZWxlY3RlZENhbGxGcmFtZS5ldmFsdWF0ZShjb2RlLCBvYmplY3RHcm91 cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCByZXR1cm5CeVZhbHVlLCBkaWRFdmFsdWF0ZS5iaW5k KHRoaXMpKTsKLSAgICB9LAotCi0gICAgZ2V0U2VsZWN0ZWRDYWxsRnJhbWVWYXJpYWJsZXM6IGZ1 bmN0aW9uKGNhbGxiYWNrKQorICAgIF9jb25zb2xlQ29tbWFuZEV2YWx1YXRlZEluU2VsZWN0ZWRD YWxsRnJhbWU6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIHJlc3VsdCA9IHsg dGhpczogdHJ1ZSB9OwotCi0gICAgICAgIHZhciBzZWxlY3RlZENhbGxGcmFtZSA9IHRoaXMuX3By ZXNlbnRhdGlvbk1vZGVsLnNlbGVjdGVkQ2FsbEZyYW1lOwotICAgICAgICBpZiAoIXNlbGVjdGVk Q2FsbEZyYW1lKQotICAgICAgICAgICAgY2FsbGJhY2socmVzdWx0KTsKLQotICAgICAgICB2YXIg cGVuZGluZ1JlcXVlc3RzID0gMDsKLQotICAgICAgICBmdW5jdGlvbiBwcm9wZXJ0aWVzQ29sbGVj dGVkKHByb3BlcnRpZXMpCi0gICAgICAgIHsKLSAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBw cm9wZXJ0aWVzICYmIGkgPCBwcm9wZXJ0aWVzLmxlbmd0aDsgKytpKQotICAgICAgICAgICAgICAg IHJlc3VsdFtwcm9wZXJ0aWVzW2ldLm5hbWVdID0gdHJ1ZTsKLSAgICAgICAgICAgIGlmICgtLXBl bmRpbmdSZXF1ZXN0cyA9PSAwKQotICAgICAgICAgICAgICAgIGNhbGxiYWNrKHJlc3VsdCk7Ci0g ICAgICAgIH0KLQotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHNlbGVjdGVkQ2FsbEZyYW1l LnNjb3BlQ2hhaW4ubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciBzY29wZSA9IHNlbGVj dGVkQ2FsbEZyYW1lLnNjb3BlQ2hhaW5baV07Ci0gICAgICAgICAgICB2YXIgb2JqZWN0ID0gV2Vi SW5zcGVjdG9yLlJlbW90ZU9iamVjdC5mcm9tUGF5bG9hZChzY29wZS5vYmplY3QpOwotICAgICAg ICAgICAgcGVuZGluZ1JlcXVlc3RzKys7Ci0gICAgICAgICAgICBvYmplY3QuZ2V0QWxsUHJvcGVy dGllcyhwcm9wZXJ0aWVzQ29sbGVjdGVkKTsKLSAgICAgICAgfQorICAgICAgICB0aGlzLnNpZGVi YXJQYW5lcy5zY29wZWNoYWluLnVwZGF0ZSh0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zZWxlY3Rl ZENhbGxGcmFtZSk7CiAgICAgfSwKIAogICAgIF9kZWJ1Z2dlclBhdXNlZDogZnVuY3Rpb24oZXZl bnQpCkBAIC01MTEsNyArNDY4LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5zZXRDdXJyZW50UGFuZWwodGhpcyk7CiAKICAg ICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnVwZGF0ZShjYWxsRnJhbWVzKTsKLSAg ICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnNlbGVjdGVkQ2FsbEZyYW1lID0gdGhp cy5fcHJlc2VudGF0aW9uTW9kZWwuc2VsZWN0ZWRDYWxsRnJhbWU7CisgICAgICAgIHRoaXMuX3Vw ZGF0ZUNhbGxGcmFtZSh0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zZWxlY3RlZENhbGxGcmFtZSk7 CiAKICAgICAgICAgaWYgKGRldGFpbHMucmVhc29uID09PSBXZWJJbnNwZWN0b3IuRGVidWdnZXJN b2RlbC5CcmVha1JlYXNvbi5ET00pIHsKICAgICAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmRv bUJyZWFrcG9pbnRzLmhpZ2hsaWdodEJyZWFrcG9pbnQoZGV0YWlscy5hdXhEYXRhKTsKQEAgLTc2 MCw2ICs3MTcsMTEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgewogICAgICAgICB2YXIgdWlMb2NhdGlvbiA9IGV2ZW50LmRhdGE7CiAKKyAgICAgICAgdGhp cy5fdXBkYXRlRXhlY3V0aW9uTGluZSh1aUxvY2F0aW9uKTsKKyAgICB9LAorCisgICAgX3VwZGF0 ZUV4ZWN1dGlvbkxpbmU6IGZ1bmN0aW9uKHVpTG9jYXRpb24pCisgICAgewogICAgICAgICB0aGlz Ll9jbGVhckN1cnJlbnRFeGVjdXRpb25MaW5lKCk7CiAgICAgICAgIGlmICghdWlMb2NhdGlvbikK ICAgICAgICAgICAgIHJldHVybjsKQEAgLTc4MCw5ICs3NDIsMTUgQEAgV2ViSW5zcGVjdG9yLlNj cmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghY2FsbEZyYW1lKQogICAgICAg ICAgICAgcmV0dXJuOwogCisgICAgICAgIHRoaXMuX3VwZGF0ZUNhbGxGcmFtZShjYWxsRnJhbWUp OworICAgIH0sCisKKyAgICBfdXBkYXRlQ2FsbEZyYW1lOiBmdW5jdGlvbihjYWxsRnJhbWUpCisg ICAgewogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5zY29wZWNoYWluLnVwZGF0ZShjYWxsRnJh bWUpOwogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy53YXRjaEV4cHJlc3Npb25zLnJlZnJlc2hF eHByZXNzaW9ucygpOwotICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5jYWxsc3RhY2suc2VsZWN0 ZWRDYWxsRnJhbWUgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zZWxlY3RlZENhbGxGcmFtZTsK KyAgICAgICAgdGhpcy5zaWRlYmFyUGFuZXMuY2FsbHN0YWNrLnNlbGVjdGVkQ2FsbEZyYW1lID0g Y2FsbEZyYW1lOworICAgICAgICB0aGlzLl91cGRhdGVFeGVjdXRpb25MaW5lKHRoaXMuX3ByZXNl bnRhdGlvbk1vZGVsLmV4ZWN1dGlvbkxpbmVMb2NhdGlvbik7CiAgICAgfSwKIAogICAgIF9maWxl c1NlbGVjdENoYW5nZWQ6IGZ1bmN0aW9uKCkK