65411 2011-07-30 06:49:59 -0700 Web Inspector: merge FormattedSourceFile into SourceFile. 2011-08-02 09:00:19 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 444281 0 podivilov 2011-07-30 06:49:59 -0700 Web Inspector: merge FormattedSourceFile into SourceFile. Prepare for splitting SourceFile into RawSourceCode and UISourceCode: * merge FormattedSourceFile into SourceFile * rename SourceFile to RawSourceCode * hide formatter worker lazy creation in ScriptFormatter 444283 1 102435 podivilov 2011-07-30 06:51:46 -0700 Created attachment 102435 Patch 444732 2 102435 pfeldman 2011-08-01 09:55:45 -0700 Comment on attachment 102435 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102435&action=review > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:33 > + this._formatter = new WebInspector.ScriptFormatter(); Please add fixme suggesting that formatter is applied from outside as a generic mapping. 445303 3 podivilov 2011-08-02 09:00:19 -0700 Committed r92196: <http://trac.webkit.org/changeset/92196> 102435 2011-07-30 06:51:46 -0700 2011-08-01 09:55:45 -0700 Patch bug-65411-20110730175144.patch text/plain 13433 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTIwNTEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmN2NiZmQxYTBiYTYxY2E2ZTRkYzQw ZjZhNjVhZjQ1OGFmZjg4NzgyLi5lZGVkZTFiM2EzZGQxNTBhYmU4MWNiMDYwZGQzZDJjYzBiN2I0 ODY5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMzAgIFBhdmVsIFBvZGl2aWxvdiAg PHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogbWVyZ2Ug Rm9ybWF0dGVkU291cmNlRmlsZSBpbnRvIFNvdXJjZUZpbGUuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTQxMQorCisgICAgICAgIFByZXBhcmUgZm9y IHNwbGl0dGluZyBTb3VyY2VGaWxlIGludG8gUmF3U291cmNlQ29kZSBhbmQgVUlTb3VyY2VDb2Rl OgorICAgICAgICAgKiBtZXJnZSBGb3JtYXR0ZWRTb3VyY2VGaWxlIGludG8gU291cmNlRmlsZQor ICAgICAgICAgKiByZW5hbWUgU291cmNlRmlsZSB0byBSYXdTb3VyY2VDb2RlCisgICAgICAgICAq IGhpZGUgZm9ybWF0dGVyIHdvcmtlciBsYXp5IGNyZWF0aW9uIGluIFNjcmlwdEZvcm1hdHRlcgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVj dG9yL2RlYnVnZ2VyL3NvdXJjZS1maWxlLmh0bWw6CisKIDIwMTEtMDctMjYgIFBhdmVsIFBvZGl2 aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog bW92ZSBsb2NhdGlvbiBjb252ZXJzaW9uIGZ1bmN0aW9ucyB0byBTb3VyY2VGaWxlLgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NvdXJjZS1maWxlLmh0bWwgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc291cmNlLWZpbGUuaHRtbAppbmRleCA2OWEy MDZjZWY2ZjJmOGMzYzg2NDMwNmFjNzM4ZDcyZWU0OTViNzRlLi44NDJhOWYzODFlNTEzODA1Nzhj NGM3NjMwNWY5YTJkNGY2YjNjYTExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv ZGVidWdnZXIvc291cmNlLWZpbGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVi dWdnZXIvc291cmNlLWZpbGUuaHRtbApAQCAtNTQsNyArNTQsNyBAQCBmdW5jdGlvbiB0ZXN0KCkK ICAgICAgICAgZnVuY3Rpb24gdGVzdFBsYWluQ29udmVydExvY2F0aW9uKG5leHQpCiAgICAgICAg IHsKICAgICAgICAgICAgIHZhciBzY3JpcHQgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdCgiMSIs ICJmb28uanMiLCAwLCAwLCAyMCwgODAsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCBmYWxzZSk7Ci0g ICAgICAgICAgICB2YXIgc291cmNlRmlsZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRmlsZSgi aWQiLCBzY3JpcHQpOworICAgICAgICAgICAgdmFyIHNvdXJjZUZpbGUgPSBuZXcgV2ViSW5zcGVj dG9yLlJhd1NvdXJjZUNvZGUoImlkIiwgc2NyaXB0KTsKIAogICAgICAgICAgICAgY2hlY2tVSUxv Y2F0aW9uKHNvdXJjZUZpbGUsIDEwLCAyMCwgc291cmNlRmlsZS5yYXdMb2NhdGlvblRvVUlMb2Nh dGlvbihybCgxMCwgMjApKSk7CiAgICAgICAgICAgICBjaGVja1Jhd0xvY2F0aW9uKHNjcmlwdCwg MzAsIDQwLCBzb3VyY2VGaWxlLnVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uKDMwLCA0MCkpOwpAQCAt NjYsNyArNjYsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgewogICAgICAgICAgICAgdmFy IHNjcmlwdDEgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdCgiMSIsICJmb28uanMiLCAxMCwgMjAs IDMwLCA0MCwgdW5kZWZpbmVkLCB1bmRlZmluZWQsIGZhbHNlKTsKICAgICAgICAgICAgIHZhciBz Y3JpcHQyID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHQoIjIiLCAiZm9vLmpzIiwgNTAsIDYwLCA3 MCwgODAsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCBmYWxzZSk7Ci0gICAgICAgICAgICB2YXIgc291 cmNlRmlsZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRmlsZSgiaWQiLCBzY3JpcHQxKTsKKyAg ICAgICAgICAgIHZhciBzb3VyY2VGaWxlID0gbmV3IFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2Rl KCJpZCIsIHNjcmlwdDEpOwogICAgICAgICAgICAgc291cmNlRmlsZS5hZGRTY3JpcHQoc2NyaXB0 Mik7CiAKICAgICAgICAgICAgIGNoZWNrVUlMb2NhdGlvbihzb3VyY2VGaWxlLCAyMCwgMCwgc291 cmNlRmlsZS5yYXdMb2NhdGlvblRvVUlMb2NhdGlvbihybCgyMCwgMCkpKTsKQEAgLTgxLDcgKzgx LDggQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIGZ1bmN0aW9uIHRlc3RGb3JtYXR0ZWRDb252 ZXJ0TG9jYXRpb24obmV4dCkKICAgICAgICAgewogICAgICAgICAgICAgdmFyIHNjcmlwdCA9IG5l dyBXZWJJbnNwZWN0b3IuU2NyaXB0KCIxIiwgImZvby5qcyIsIDAsIDAsIDIwLCA4MCwgdW5kZWZp bmVkLCB1bmRlZmluZWQsIGZhbHNlKTsKLSAgICAgICAgICAgIHZhciBzb3VyY2VGaWxlID0gbmV3 IFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRTb3VyY2VGaWxlKCJpZCIsIHNjcmlwdCwgbnVsbCwgbW9j a1NjcmlwdEZvcm1hdHRlcik7CisgICAgICAgICAgICB2YXIgc291cmNlRmlsZSA9IG5ldyBXZWJJ bnNwZWN0b3IuUmF3U291cmNlQ29kZSgiaWQiLCBzY3JpcHQsIG1vY2tTY3JpcHRGb3JtYXR0ZXIp OworICAgICAgICAgICAgc291cmNlRmlsZS5zZXRGb3JtYXR0ZWQodHJ1ZSk7CiAKICAgICAgICAg ICAgIGZ1bmN0aW9uIGRpZENyZWF0ZVNvdXJjZU1hcHBpbmcoKQogICAgICAgICAgICAgewpAQCAt OTYsNyArOTcsOCBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgewogICAgICAgICAgICAgdmFy IHNjcmlwdDEgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdCgiMSIsICJmb28uanMiLCAxMCwgMjAs IDMwLCA0MCwgdW5kZWZpbmVkLCB1bmRlZmluZWQsIGZhbHNlKTsKICAgICAgICAgICAgIHZhciBz Y3JpcHQyID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHQoIjIiLCAiZm9vLmpzIiwgNTAsIDYwLCA3 MCwgODAsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCBmYWxzZSk7Ci0gICAgICAgICAgICB2YXIgc291 cmNlRmlsZSA9IG5ldyBXZWJJbnNwZWN0b3IuRm9ybWF0dGVkU291cmNlRmlsZSgiaWQiLCBzY3Jp cHQxLCBudWxsLCBtb2NrU2NyaXB0Rm9ybWF0dGVyKTsKKyAgICAgICAgICAgIHZhciBzb3VyY2VG aWxlID0gbmV3IFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlKCJpZCIsIHNjcmlwdDEsIG1vY2tT Y3JpcHRGb3JtYXR0ZXIpOworICAgICAgICAgICAgc291cmNlRmlsZS5zZXRGb3JtYXR0ZWQodHJ1 ZSk7CiAgICAgICAgICAgICBzb3VyY2VGaWxlLmFkZFNjcmlwdChzY3JpcHQyKTsKIAogICAgICAg ICAgICAgZnVuY3Rpb24gZGlkQ3JlYXRlU291cmNlTWFwcGluZygpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTJl NDI4NTEyZGQ5YThiMzUzYmUzYWRlOWUwOWI2ZWZlNjExYTNiYi4uODIwMGE2MDg1YzE2NTM3ZDI0 YTliODc0YzMxMzZhNmM0ZWU1OWQxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEx LTA3LTMwICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IG1lcmdlIEZvcm1hdHRlZFNvdXJjZUZpbGUgaW50byBTb3VyY2VG aWxlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU0 MTEKKworICAgICAgICBQcmVwYXJlIGZvciBzcGxpdHRpbmcgU291cmNlRmlsZSBpbnRvIFJhd1Nv dXJjZUNvZGUgYW5kIFVJU291cmNlQ29kZToKKyAgICAgICAgICogbWVyZ2UgRm9ybWF0dGVkU291 cmNlRmlsZSBpbnRvIFNvdXJjZUZpbGUKKyAgICAgICAgICogcmVuYW1lIFNvdXJjZUZpbGUgdG8g UmF3U291cmNlQ29kZQorICAgICAgICAgKiBoaWRlIGZvcm1hdHRlciB3b3JrZXIgbGF6eSBjcmVh dGlvbiBpbiBTY3JpcHRGb3JtYXR0ZXIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRp b25Nb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnBy b3RvdHlwZS5fc2NyaXB0TG9jYXRpb25Ub1VJTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLl91aUxvY2F0aW9uVG9TY3Jp cHRMb2NhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5wcm90b3R5cGUuX2FkZFNjcmlwdCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRGb3JtYXR0ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0Rm9ybWF0 dGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRGb3JtYXR0ZXIucHJvdG90eXBlLl9k aWRGb3JtYXRDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRGb3JtYXR0ZXIu cHJvdG90eXBlLmdldCBfd29ya2VyKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Nv dXJjZUZpbGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5cGUuc2V0Rm9ybWF0dGVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZS5jcmVhdGVTb3Vy Y2VNYXBwaW5nSWZOZWVkZWQuZGlkUmVxdWVzdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJhd1NvdXJjZUNvZGUucHJvdG90eXBlLmNyZWF0ZVNvdXJjZU1hcHBpbmdJZk5lZWRlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5cGUuX2RpZFJlcXVl c3RDb250ZW50LmRpZEZvcm1hdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJhd1Nv dXJjZUNvZGUucHJvdG90eXBlLl9kaWRSZXF1ZXN0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5cGUuX2ludm9rZVJlcXVlc3RDb250ZW50Q2FsbGJh Y2tzKToKKwogMjAxMS0wNy0yNiAgUGF2ZWwgUG9kaXZpbG92ICA8cG9kaXZpbG92QGNocm9taXVt Lm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBtb3ZlIGxvY2F0aW9uIGNvbnZlcnNpb24g ZnVuY3Rpb25zIHRvIFNvdXJjZUZpbGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKaW5k ZXggOTU2ZjNlNmViNzdkY2I5NGFiNTg1ZDk5ZTU1YzI0NGE4ZjhkYWNiNy4uMWMxZGNmZTI0ZTRm YjFkZjhmMDc4MmY3YWM3YmMzYmFkMTNjZmY1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2Rl bC5qcwpAQCAtMzAsNiArMzAsNyBAQAogCiBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRp b25Nb2RlbCA9IGZ1bmN0aW9uKCkKIHsKKyAgICB0aGlzLl9mb3JtYXR0ZXIgPSBuZXcgV2ViSW5z cGVjdG9yLlNjcmlwdEZvcm1hdHRlcigpOwogICAgIHRoaXMuX3NvdXJjZUZpbGVzID0ge307CiAg ICAgdGhpcy5fbWVzc2FnZXMgPSBbXTsKICAgICB0aGlzLl9hbmNob3JzID0gW107CkBAIC05NCw3 ICs5NSw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIGNhbGxiYWNrKHVpTG9jYXRpb24uc291cmNlRmlsZS5pZCwgdWlM b2NhdGlvbi5saW5lTnVtYmVyKTsKICAgICAgICAgfQogICAgICAgICAvLyBGSVhNRTogZm9yY2Ug c291cmNlIGZvcm1hdHRpbmcgaWYgbmVlZGVkLiBUaGlzIHdpbGwgZ28gYXdheSBvbmNlIGZvcm1h dHRpbmcKLSAgICAgICAgLy8gaXMgZnVsbHkgZW5jYXBzdWxhdGVkIGluIFNvdXJjZUZpbGUuCisg ICAgICAgIC8vIGlzIGZ1bGx5IGVuY2Fwc3VsYXRlZCBpbiBSYXdTb3VyY2VDb2RlIGNsYXNzLgog ICAgICAgICBzb3VyY2VGaWxlLmNyZWF0ZVNvdXJjZU1hcHBpbmdJZk5lZWRlZChkaWRDcmVhdGVT b3VyY2VNYXBwaW5nKTsKICAgICB9LAogCkBAIC0xMDgsNyArMTA5LDcgQEAgV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2Fs bGJhY2socmF3TG9jYXRpb24pOwogICAgICAgICB9CiAgICAgICAgIC8vIEZJWE1FOiBmb3JjZSBz b3VyY2UgZm9ybWF0dGluZyBpZiBuZWVkZWQuIFRoaXMgd2lsbCBnbyBhd2F5IG9uY2UgZm9ybWF0 dGluZwotICAgICAgICAvLyBpcyBmdWxseSBlbmNhcHN1bGF0ZWQgaW4gU291cmNlRmlsZS4KKyAg ICAgICAgLy8gaXMgZnVsbHkgZW5jYXBzdWxhdGVkIGluIFJhd1NvdXJjZUNvZGUgY2xhc3MuCiAg ICAgICAgIHNvdXJjZUZpbGUuY3JlYXRlU291cmNlTWFwcGluZ0lmTmVlZGVkKGRpZENyZWF0ZVNv dXJjZU1hcHBpbmcpOwogICAgIH0sCiAKQEAgLTE1NywxMCArMTU4LDggQEAgV2ViSW5zcGVjdG9y LkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYg KHRoaXMuX3NvdXJjZUZpbGVzW3NvdXJjZUZpbGVJZF0gPT09IHNvdXJjZUZpbGUpCiAgICAgICAg ICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLlNvdXJjZUZpbGVDaGFuZ2VkLCB0aGlzLl9zb3Vy Y2VGaWxlc1tzb3VyY2VGaWxlSWRdKTsKICAgICAgICAgfQotICAgICAgICBpZiAoIXRoaXMuX2Zv cm1hdFNvdXJjZUZpbGVzKQotICAgICAgICAgICAgc291cmNlRmlsZSA9IG5ldyBXZWJJbnNwZWN0 b3IuU291cmNlRmlsZShzb3VyY2VGaWxlSWQsIHNjcmlwdCwgY29udGVudENoYW5nZWQuYmluZCh0 aGlzKSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHNvdXJjZUZpbGUgPSBuZXcgV2ViSW5z cGVjdG9yLkZvcm1hdHRlZFNvdXJjZUZpbGUoc291cmNlRmlsZUlkLCBzY3JpcHQsIGNvbnRlbnRD aGFuZ2VkLmJpbmQodGhpcyksIHRoaXMuX2Zvcm1hdHRlcigpKTsKKyAgICAgICAgc291cmNlRmls ZSA9IG5ldyBXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZShzb3VyY2VGaWxlSWQsIHNjcmlwdCwg dGhpcy5fZm9ybWF0dGVyLCBjb250ZW50Q2hhbmdlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgc291 cmNlRmlsZS5zZXRGb3JtYXR0ZWQodGhpcy5fZm9ybWF0U291cmNlRmlsZXMpOwogICAgICAgICB0 aGlzLl9zb3VyY2VGaWxlc1tzb3VyY2VGaWxlSWRdID0gc291cmNlRmlsZTsKIAogICAgICAgICB0 aGlzLl9yZXN0b3JlQnJlYWtwb2ludHMoc291cmNlRmlsZSk7CkBAIC0yODgsMTMgKzI4Nyw2IEBA IFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIHRoaXMuX2RlYnVnZ2VyUGF1c2VkKCk7CiAgICAgfSwKIAotICAgIF9mb3JtYXR0 ZXI6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fc2NyaXB0Rm9ybWF0dGVy KQotICAgICAgICAgICAgdGhpcy5fc2NyaXB0Rm9ybWF0dGVyID0gbmV3IFdlYkluc3BlY3Rvci5T Y3JpcHRGb3JtYXR0ZXIoKTsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3NjcmlwdEZvcm1hdHRlcjsK LSAgICB9LAotCiAgICAgX2NvbnNvbGVNZXNzYWdlQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAg IHsKICAgICAgICAgdmFyIG1lc3NhZ2UgPSBldmVudC5kYXRhOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRGb3JtYXR0ZXIuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdEZvcm1hdHRlci5qcwppbmRleCAzYzE0 NGE0ZGU1N2NhZTNlM2M1Njg5YzQ5NjJlMGI0ODAzZTJiY2MxLi43MTZjMzBkOTkwNzlmMmRiZTdi MjU1MTlkNDliMTY3Y2ViZTczZGU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdEZvcm1hdHRlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdEZvcm1hdHRlci5qcwpAQCAtMzAsOCArMzAsNiBAQAogCiBX ZWJJbnNwZWN0b3IuU2NyaXB0Rm9ybWF0dGVyID0gZnVuY3Rpb24oKQogewotICAgIHRoaXMuX3dv cmtlciA9IG5ldyBXb3JrZXIoIlNjcmlwdEZvcm1hdHRlcldvcmtlci5qcyIpOwotICAgIHRoaXMu X3dvcmtlci5vbm1lc3NhZ2UgPSB0aGlzLl9kaWRGb3JtYXRDb250ZW50LmJpbmQodGhpcyk7CiAg ICAgdGhpcy5fdGFza3MgPSBbXTsKIH0KIApAQCAtNjgsNiArNjYsMTUgQEAgV2ViSW5zcGVjdG9y LlNjcmlwdEZvcm1hdHRlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBmb3JtYXR0ZWRDb250 ZW50ID0gZXZlbnQuZGF0YS5jb250ZW50OwogICAgICAgICB2YXIgc291cmNlTWFwcGluZyA9IG5l dyBXZWJJbnNwZWN0b3IuRm9ybWF0dGVkU291cmNlTWFwcGluZyhvcmlnaW5hbENvbnRlbnQubGlu ZUVuZGluZ3MoKSwgZm9ybWF0dGVkQ29udGVudC5saW5lRW5kaW5ncygpLCBldmVudC5kYXRhLm1h cHBpbmcpOwogICAgICAgICB0YXNrLmNhbGxiYWNrKGZvcm1hdHRlZENvbnRlbnQsIHNvdXJjZU1h cHBpbmcpOworICAgIH0sCisKKyAgICBnZXQgX3dvcmtlcigpCisgICAgeworICAgICAgICBpZiAo IXRoaXMuX2NhY2hlZFdvcmtlcikgeworICAgICAgICAgICAgdGhpcy5fY2FjaGVkV29ya2VyID0g bmV3IFdvcmtlcigiU2NyaXB0Rm9ybWF0dGVyV29ya2VyLmpzIik7CisgICAgICAgICAgICB0aGlz Ll9jYWNoZWRXb3JrZXIub25tZXNzYWdlID0gdGhpcy5fZGlkRm9ybWF0Q29udGVudC5iaW5kKHRo aXMpOworICAgICAgICB9CisgICAgICAgIHJldHVybiB0aGlzLl9jYWNoZWRXb3JrZXI7CiAgICAg fQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nv dXJjZUZpbGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZp bGUuanMKaW5kZXggYzVlYTllYzljZmRkNGQ1MmVkMzExMWUxMzgwYTM0YzE3OWM0Mjk2MC4uMTlm OWE0Mzg0MjA1MzM3YWUxNmQ1MDY4MTg2Zjc0ZWJkMDc4NzhhZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGaWxlLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmlsZS5qcwpAQCAtMjgsOSArMjgsMTMg QEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLlNvdXJjZUZpbGUgPSBmdW5j dGlvbihpZCwgc2NyaXB0LCBjb250ZW50Q2hhbmdlZERlbGVnYXRlKQorLy8gUmF3U291cmNlQ29k ZSByZXByZXNlbnRzIEphdmFTY3JpcHQgcmVzb3VyY2Ugb3IgSFRNTCByZXNvdXJjZSB3aXRoIGlu bGluZWQgc2NyaXB0cworLy8gYXMgaXQgY2FtZSBmcm9tIG5ldHdvcmsuCitXZWJJbnNwZWN0b3Iu UmF3U291cmNlQ29kZSA9IGZ1bmN0aW9uKGlkLCBzY3JpcHQsIGZvcm1hdHRlciwgY29udGVudENo YW5nZWREZWxlZ2F0ZSkKIHsKICAgICB0aGlzLl9zY3JpcHRzID0gW3NjcmlwdF07CisgICAgdGhp cy5fZm9ybWF0dGVyID0gZm9ybWF0dGVyOworICAgIHRoaXMuX2Zvcm1hdHRlZCA9IGZhbHNlOwog ICAgIHRoaXMuX2NvbnRlbnRDaGFuZ2VkRGVsZWdhdGUgPSBjb250ZW50Q2hhbmdlZERlbGVnYXRl OwogICAgIGlmIChzY3JpcHQuc291cmNlVVJMKQogICAgICAgICB0aGlzLl9yZXNvdXJjZSA9IFdl Ykluc3BlY3Rvci5uZXR3b3JrTWFuYWdlci5pbmZsaWdodFJlc291cmNlRm9yVVJMKHNjcmlwdC5z b3VyY2VVUkwpIHx8IFdlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVSTChzY3JpcHQuc291cmNlVVJM KTsKQEAgLTQ2LDcgKzUwLDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZpbGUgPSBmdW5jdGlvbihp ZCwgc2NyaXB0LCBjb250ZW50Q2hhbmdlZERlbGVnYXRlKQogICAgICAgICB0aGlzLl9yZXNvdXJj ZS5hZGRFdmVudExpc3RlbmVyKCJmaW5pc2hlZCIsIHRoaXMucmVsb2FkLmJpbmQodGhpcykpOwog fQogCi1XZWJJbnNwZWN0b3IuU291cmNlRmlsZS5wcm90b3R5cGUgPSB7CitXZWJJbnNwZWN0b3Iu UmF3U291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgYWRkU2NyaXB0OiBmdW5jdGlvbihzY3Jp cHQpCiAgICAgewogICAgICAgICB0aGlzLl9zY3JpcHRzLnB1c2goc2NyaXB0KTsKQEAgLTgyLDYg Kzg2LDEyIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGaWxlLnByb3RvdHlwZSA9IHsKICAgICAgICAg cmV0dXJuIGNsb3Nlc3RTY3JpcHQ7CiAgICAgfSwKIAorICAgIHNldEZvcm1hdHRlZDogZnVuY3Rp b24oZm9ybWF0dGVkKQorICAgIHsKKyAgICAgICAgLy8gRklYTUU6IHRoaXMgc2hvdWxkIGluaXRp YXRlIGZvcm1hdHRpbmcgYW5kIHRyaWdnZXIgZXZlbnRzIHRvIHVwZGF0ZSB1aS4KKyAgICAgICAg dGhpcy5fZm9ybWF0dGVkID0gZm9ybWF0dGVkOworICAgIH0sCisKICAgICByZXF1ZXN0Q29udGVu dDogZnVuY3Rpb24oY2FsbGJhY2spCiAgICAgewogICAgICAgICBpZiAodGhpcy5fY29udGVudExv YWRlZCkgewpAQCAtMTA2LDggKzExNiwxNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRmlsZS5wcm90 b3R5cGUgPSB7CiAKICAgICBjcmVhdGVTb3VyY2VNYXBwaW5nSWZOZWVkZWQ6IGZ1bmN0aW9uKGNh bGxiYWNrKQogICAgIHsKLSAgICAgICAgLy8gUGxhaW4gc291cmNlIHdpdGhvdXQgbWFwcGluZy4K LSAgICAgICAgY2FsbGJhY2soKTsKKyAgICAgICAgaWYgKCF0aGlzLl9mb3JtYXR0ZWQpIHsKKyAg ICAgICAgICAgIGNhbGxiYWNrKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKwor ICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0Q29udGVudCgpCisgICAgICAgIHsKKyAgICAgICAg ICAgIGNhbGxiYWNrKCk7CisgICAgICAgIH0KKyAgICAgICAgLy8gRm9yY2UgY29udGVudCBmb3Jt YXR0aW5nIHRvIG9idGFpbiB0aGUgbWFwcGluZy4KKyAgICAgICAgdGhpcy5yZXF1ZXN0Q29udGVu dChkaWRSZXF1ZXN0Q29udGVudC5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAgZm9yY2VMb2Fk Q29udGVudDogZnVuY3Rpb24oc2NyaXB0KQpAQCAtMjM5LDYgKzI1OCwyMSBAQCBXZWJJbnNwZWN0 b3IuU291cmNlRmlsZS5wcm90b3R5cGUgPSB7CiAKICAgICBfZGlkUmVxdWVzdENvbnRlbnQ6IGZ1 bmN0aW9uKG1pbWVUeXBlLCBjb250ZW50KQogICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9mb3Jt YXR0ZWQpIHsKKyAgICAgICAgICAgIHRoaXMuX2ludm9rZVJlcXVlc3RDb250ZW50Q2FsbGJhY2tz KG1pbWVUeXBlLCBjb250ZW50KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisg ICAgICAgIGZ1bmN0aW9uIGRpZEZvcm1hdENvbnRlbnQoZm9ybWF0dGVkQ29udGVudCwgbWFwcGlu ZykKKyAgICAgICAgeworICAgICAgICAgICAgdGhpcy5fbWFwcGluZyA9IG1hcHBpbmc7CisgICAg ICAgICAgICB0aGlzLl9pbnZva2VSZXF1ZXN0Q29udGVudENhbGxiYWNrcyhtaW1lVHlwZSwgZm9y bWF0dGVkQ29udGVudCk7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5fZm9ybWF0dGVyLmZvcm1h dENvbnRlbnQobWltZVR5cGUsIGNvbnRlbnQsIGRpZEZvcm1hdENvbnRlbnQuYmluZCh0aGlzKSk7 CisgICAgfSwKKworICAgIF9pbnZva2VSZXF1ZXN0Q29udGVudENhbGxiYWNrczogZnVuY3Rpb24o bWltZVR5cGUsIGNvbnRlbnQpCisgICAgewogICAgICAgICB0aGlzLl9jb250ZW50TG9hZGVkID0g dHJ1ZTsKICAgICAgICAgdGhpcy5fY29udGVudFJlcXVlc3RlZCA9IGZhbHNlOwogICAgICAgICB0 aGlzLl9taW1lVHlwZSA9IG1pbWVUeXBlOwpAQCAtMjU3LDMzICsyOTEsMyBAQCBXZWJJbnNwZWN0 b3IuU291cmNlRmlsZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9yZXNvdXJj ZSAmJiAhdGhpcy5fcmVzb3VyY2UuZmluaXNoZWQ7CiAgICAgfQogfQotCi1XZWJJbnNwZWN0b3Iu Rm9ybWF0dGVkU291cmNlRmlsZSA9IGZ1bmN0aW9uKHNvdXJjZUZpbGVJZCwgc2NyaXB0LCBjb250 ZW50Q2hhbmdlZERlbGVnYXRlLCBmb3JtYXR0ZXIpCi17Ci0gICAgV2ViSW5zcGVjdG9yLlNvdXJj ZUZpbGUuY2FsbCh0aGlzLCBzb3VyY2VGaWxlSWQsIHNjcmlwdCwgY29udGVudENoYW5nZWREZWxl Z2F0ZSk7Ci0gICAgdGhpcy5fZm9ybWF0dGVyID0gZm9ybWF0dGVyOwotfQotCi1XZWJJbnNwZWN0 b3IuRm9ybWF0dGVkU291cmNlRmlsZS5wcm90b3R5cGUgPSB7Ci0gICAgY3JlYXRlU291cmNlTWFw cGluZ0lmTmVlZGVkOiBmdW5jdGlvbihjYWxsYmFjaykKLSAgICB7Ci0gICAgICAgIGZ1bmN0aW9u IGRpZFJlcXVlc3RDb250ZW50KCkKLSAgICAgICAgewotICAgICAgICAgICAgY2FsbGJhY2soKTsK LSAgICAgICAgfQotICAgICAgICAvLyBGb3JjZSBjb250ZW50IGZvcm1hdHRpbmcgdG8gb2J0YWlu IHRoZSBtYXBwaW5nLgotICAgICAgICB0aGlzLnJlcXVlc3RDb250ZW50KGRpZFJlcXVlc3RDb250 ZW50LmJpbmQodGhpcykpOwotICAgIH0sCi0KLSAgICBfZGlkUmVxdWVzdENvbnRlbnQ6IGZ1bmN0 aW9uKG1pbWVUeXBlLCB0ZXh0KQotICAgIHsKLSAgICAgICAgZnVuY3Rpb24gZGlkRm9ybWF0Q29u dGVudChmb3JtYXR0ZWRUZXh0LCBtYXBwaW5nKQotICAgICAgICB7Ci0gICAgICAgICAgICB0aGlz Ll9tYXBwaW5nID0gbWFwcGluZzsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5Tb3VyY2VGaWxl LnByb3RvdHlwZS5fZGlkUmVxdWVzdENvbnRlbnQuY2FsbCh0aGlzLCBtaW1lVHlwZSwgZm9ybWF0 dGVkVGV4dCk7Ci0gICAgICAgIH0KLSAgICAgICAgdGhpcy5fZm9ybWF0dGVyLmZvcm1hdENvbnRl bnQobWltZVR5cGUsIHRleHQsIGRpZEZvcm1hdENvbnRlbnQuYmluZCh0aGlzKSk7Ci0gICAgfQot fQotCi1XZWJJbnNwZWN0b3IuRm9ybWF0dGVkU291cmNlRmlsZS5wcm90b3R5cGUuX19wcm90b19f ID0gV2ViSW5zcGVjdG9yLlNvdXJjZUZpbGUucHJvdG90eXBlOwo=