123231 2013-10-23 16:20:54 -0700 Web Inspector: Breakpoints in sourceURL named scripts do not work 2013-10-24 11:20:41 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 942888 0 joepeck 2013-10-23 16:20:54 -0700 SUMMARY: Breakpoints in "//# sourceURL=foo" named scripts do not work. TEST CASE: <button id="button">Click to Run foo()</button> <script> eval("function foo() {\n debugger;\n var a = 1;\n var b = 2;\n var c = a+b;\n alert(c);\n}\n//# sourceURL=test.js") document.getElementById('button').addEventListener("click", function() { foo(); }); </script> STEPS TO REPRODUCE: 1. Inspect test page. 2. Click button on inspected page. (Debugger pauses on debugger statement. 3. Set a breakpoint before the alert() statement 4. Click continue in the debugger => expected to hit the breakpoint, instead the alert happened 942889 1 webkit-bug-importer 2013-10-23 16:21:01 -0700 <rdar://problem/15304492> 942925 2 joepeck 2013-10-23 17:21:55 -0700 So InspectorDebuggerAgent::didParseSource keep track of all loaded Scripts. Unfortunately when setting breakpoints by URL, we check Script.url, and the "sourceURL" is lost at this point. We should save the sourceURL somewhere; on the script would be great! 942941 3 joepeck 2013-10-23 18:19:33 -0700 I have a fix, I just need to write up a test for it. 943208 4 215081 joepeck 2013-10-24 10:42:52 -0700 Created attachment 215081 [PATCH] Proposed Fix 943209 5 215081 timothy 2013-10-24 10:51:19 -0700 Comment on attachment 215081 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=215081&action=review > Source/WebCore/inspector/InspectorDebuggerAgent.cpp:714 > + String scriptURL = hasSourceURL ? script.sourceURL : script.url; I wonder if we should just have one property — script.url — for the URL. Are both useful? Are other places that need to do something similar? 943210 6 joepeck 2013-10-24 10:55:35 -0700 (In reply to comment #5) > (From update of attachment 215081 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=215081&action=review > > > Source/WebCore/inspector/InspectorDebuggerAgent.cpp:714 > > + String scriptURL = hasSourceURL ? script.sourceURL : script.url; > > I wonder if we should just have one property — script.url — for the URL. Are both useful? Are other places that need to do something similar? I like the idea of having both around. I think ideally both the original URL and sourceURL could be sent to the frontend. 943217 7 215081 commit-queue 2013-10-24 11:20:39 -0700 Comment on attachment 215081 [PATCH] Proposed Fix Clearing flags on attachment: 215081 Committed r157939: <http://trac.webkit.org/changeset/157939> 943218 8 commit-queue 2013-10-24 11:20:41 -0700 All reviewed patches have been landed. Closing bug. 215081 2013-10-24 10:42:52 -0700 2013-10-24 11:20:39 -0700 [PATCH] Proposed Fix sourceURL-breakpoint.patch text/plain 9041 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmM2YxZDUwLi5iNDNiYjgyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMTAt MjQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBCcmVha3BvaW50cyBpbiBzb3VyY2VVUkwgbmFtZWQgc2NyaXB0cyBkbyBub3Qg d29yaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIz MjMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBp bnNwZWN0b3ItcHJvdG9jb2wvZGVidWdnZXIvc2V0QnJlYWtwb2ludEJ5VXJsLXNvdXJjZVVSTC1l eHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci1wcm90b2NvbC9kZWJ1Z2dl ci9zZXRCcmVha3BvaW50QnlVcmwtc291cmNlVVJMLmh0bWw6IEFkZGVkLgorCiAyMDEzLTEwLTIx ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFtDU1MgU2hh cGVzXVtDU1MgUmVnaW9uc10gRG9uJ3QgYXBwbHkgc2hhcGUtaW5zaWRlIHdoZW4gd2UgaGF2ZSBt dWx0aXBsZSBhdXRvLWhlaWdodCByZWdpb25zIGFuZCB0aGUgaGVpZ2h0IGlzIG5vdCByZXNvbHZl ZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yLXByb3RvY29sL2RlYnVnZ2VyL3Nl dEJyZWFrcG9pbnRCeVVybC1zb3VyY2VVUkwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yLXByb3RvY29sL2RlYnVnZ2VyL3NldEJyZWFrcG9pbnRCeVVybC1zb3VyY2VVUkwtZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmM1MGRkNzIKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3ItcHJvdG9jb2wvZGVidWdnZXIv c2V0QnJlYWtwb2ludEJ5VXJsLXNvdXJjZVVSTC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw5IEBA CitEZWJ1Z2dlci5zZXRCcmVha3BvaW50QnlVcmwgaW4gU2NyaXB0IG5hbWVkIHZpYSBzb3VyY2VV UkwKKworQnJlYWtwb2ludHMgRW5hYmxlZAorRm91bmQgc291cmNlVVJMLXRlc3QuanMKK1J1bm5p bmcgc291cmNlVVJMRnVuY3Rpb24KK0hpdCBCcmVha3BvaW50IQorRXZhbHV0ZWQgdmFsdWUgb2Yg YGFgIChleHBlY3RpbmcgbnVtYmVyIDEpIHdhczogeyJ0eXBlIjoibnVtYmVyIiwidmFsdWUiOjEs ImRlc2NyaXB0aW9uIjoiMSJ9CitFdmFsdXRlZCB2YWx1ZSBvZiBgY2AgKGV4cGVjdGluZyB1bmRl ZmluZWQpIHdhczogeyJ0eXBlIjoidW5kZWZpbmVkIn0KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yLXByb3RvY29sL2RlYnVnZ2VyL3NldEJyZWFrcG9pbnRCeVVybC1zb3VyY2VV UkwuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9kZWJ1Z2dlci9zZXRCcmVh a3BvaW50QnlVcmwtc291cmNlVVJMLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uMjdlNTYxYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci1w cm90b2NvbC9kZWJ1Z2dlci9zZXRCcmVha3BvaW50QnlVcmwtc291cmNlVVJMLmh0bWwKQEAgLTAs MCArMSw0NyBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3Rz L2luc3BlY3Rvci1wcm90b2NvbC9yZXNvdXJjZXMvcHJvdG9jb2wtdGVzdC5qcyI+PC9zY3JpcHQ+ Cis8c2NyaXB0IHNyYz0icmVzb3VyY2VzL2JyZWFrcG9pbnQuanMiPjwvc2NyaXB0PgorPHNjcmlw dD4KKy8vIHNvdXJjZVVSTC10ZXN0LmpzOgorZXZhbCgiZnVuY3Rpb24gc291cmNlVVJMRnVuY3Rp b24oKSB7XG4gICAgdmFyIGEgPSAxO1xuICAgIHZhciBiID0gMjtcbiAgICB2YXIgYyA9IGErYjtc biAgICBhbGVydChjKTtcbn1cbi8vIyBzb3VyY2VVUkw9c291cmNlVVJMLXRlc3QuanMiKQorCitm dW5jdGlvbiB0ZXN0KCkKK3sKKyAgICBJbnNwZWN0b3JUZXN0LnNlbmRDb21tYW5kKCJEZWJ1Z2dl ci5lbmFibGUiLCB7fSk7CisgICAgSW5zcGVjdG9yVGVzdC5zZW5kQ29tbWFuZCgiRGVidWdnZXIu c2V0QnJlYWtwb2ludHNBY3RpdmUiLCB7YWN0aXZlOiB0cnVlfSwgZnVuY3Rpb24oKSB7CisgICAg ICAgIEluc3BlY3RvclRlc3QubG9nKCJCcmVha3BvaW50cyBFbmFibGVkIik7CisgICAgfSk7CisK KyAgICBJbnNwZWN0b3JUZXN0LmV2ZW50SGFuZGxlclsiRGVidWdnZXIuc2NyaXB0UGFyc2VkIl0g PSBmdW5jdGlvbihtZXNzYWdlT2JqZWN0KQorICAgIHsKKyAgICAgICAgaWYgKC9zb3VyY2VVUkwt dGVzdFwuanMkLy50ZXN0KG1lc3NhZ2VPYmplY3QucGFyYW1zLnVybCkpIHsKKyAgICAgICAgICAg IEluc3BlY3RvclRlc3QubG9nKCJGb3VuZCBzb3VyY2VVUkwtdGVzdC5qcyIpOworICAgICAgICAg ICAgdmFyIHBhcmFtcyA9IHt1cmw6IG1lc3NhZ2VPYmplY3QucGFyYW1zLnVybCwgbGluZU51bWJl cjogMywgY29sdW1uTnVtYmVyOiAwfTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Quc2VuZENv bW1hbmQoIkRlYnVnZ2VyLnNldEJyZWFrcG9pbnRCeVVybCIsIHBhcmFtcywgZnVuY3Rpb24ocmVz cG9uc2VPYmplY3QpIHsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNoZWNrRm9yRXJy b3IocmVzcG9uc2VPYmplY3QpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJS dW5uaW5nIHNvdXJjZVVSTEZ1bmN0aW9uIik7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5zZW5kQ29tbWFuZCgiUnVudGltZS5ldmFsdWF0ZSIsIHtleHByZXNzaW9uOiAic291cmNlVVJM RnVuY3Rpb24oKSJ9KTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CisgICAgfQorCisgICAg SW5zcGVjdG9yVGVzdC5ldmVudEhhbmRsZXJbIkRlYnVnZ2VyLnBhdXNlZCJdID0gZnVuY3Rpb24o bWVzc2FnZU9iamVjdCkKKyAgICB7CisgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJIaXQgQnJl YWtwb2ludCEiKTsKKyAgICAgICAgdmFyIGNhbGxGcmFtZUlkZW50aWZpZXIgPSBtZXNzYWdlT2Jq ZWN0LnBhcmFtcy5jYWxsRnJhbWVzWzBdLmNhbGxGcmFtZUlkOworICAgICAgICBJbnNwZWN0b3JU ZXN0LnNlbmRDb21tYW5kKCJEZWJ1Z2dlci5ldmFsdWF0ZU9uQ2FsbEZyYW1lIiwge2NhbGxGcmFt ZUlkOiBjYWxsRnJhbWVJZGVudGlmaWVyLCBleHByZXNzaW9uOiAiYSJ9LCBmdW5jdGlvbihtZXNz YWdlT2JqZWN0KSB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiRXZhbHV0ZWQgdmFs dWUgb2YgYGFgIChleHBlY3RpbmcgbnVtYmVyIDEpIHdhczogIiArIEpTT04uc3RyaW5naWZ5KG1l c3NhZ2VPYmplY3QucmVzdWx0LnJlc3VsdCkpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5z ZW5kQ29tbWFuZCgiRGVidWdnZXIuZXZhbHVhdGVPbkNhbGxGcmFtZSIsIHtjYWxsRnJhbWVJZDog Y2FsbEZyYW1lSWRlbnRpZmllciwgZXhwcmVzc2lvbjogImMifSwgZnVuY3Rpb24obWVzc2FnZU9i amVjdCkgeworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJFdmFsdXRlZCB2YWx1 ZSBvZiBgY2AgKGV4cGVjdGluZyB1bmRlZmluZWQpIHdhczogIiArIEpTT04uc3RyaW5naWZ5KG1l c3NhZ2VPYmplY3QucmVzdWx0LnJlc3VsdCkpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRl c3QuY29tcGxldGVUZXN0KCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfSk7CisgICAgfQor fQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8cD5EZWJ1 Z2dlci5zZXRCcmVha3BvaW50QnlVcmwgaW4gU2NyaXB0IG5hbWVkIHZpYSBzb3VyY2VVUkw8L3A+ Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjBlMTAxNi4uNGIzYzgxYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTEwLTI0ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNv cmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQnJlYWtwb2ludHMgaW4g c291cmNlVVJMIG5hbWVkIHNjcmlwdHMgZG8gbm90IHdvcmsKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzIzMQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbWVtYmVyIGEgU2NyaXB0J3Mgc291cmNlVVJM IGFuZCBzb3VyY2VNYXBwaW5nVVJMLiBXaGVuIHNldHRpbmcgYQorICAgICAgICBicmVha3BvaW50 IGJ5IFVSTCwgY2hlY2sgaXQgYWdhaW5zdCB0aGUgc291cmNlVVJMIG9yIG9yaWdpbmFsIFVSTC4K KyAgICAgICAgSWYgYSBzY3JpcHQgaGFkIGEgc291cmNlVVJMIHRoYXQgd291bGQgaGF2ZSBiZWVu IHRoZSBvbmx5IFVSTCBzZW50CisgICAgICAgIHRvIHRoZSBmcm9udGVuZCwgc28gdGhhdCByZWNl aXZlcyBwcmlvcml0eS4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3ItcHJvdG9jb2wvZGVidWdn ZXIvc2V0QnJlYWtwb2ludEJ5VXJsLXNvdXJjZVVSTC5odG1sCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JEZWJ1Z2dlckFnZW50OjpzZXRCcmVha3BvaW50QnlVcmwpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZGlkUGFyc2VTb3VyY2UpOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL1Njcmlw dERlYnVnTGlzdGVuZXIuaDoKKwogMjAxMy0xMC0yMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jh cm9AYXBwbGUuY29tPgogCiAgICAgICAgIFVwc3RyZWFtIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9S KSBhbmQgZW5hYmxlIG9uIGlPUyBhbmQgTWFjCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKaW5kZXggMjM0OWE4OC4uYzcxZjhkZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdl bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFn ZW50LmNwcApAQCAtMzIwLDggKzMyMCwxMCBAQCB2b2lkIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQ6 OnNldEJyZWFrcG9pbnRCeVVybChFcnJvclN0cmluZyogZXJyb3JTdHJpbmcsIGludCBsaQogCiAg ICAgU2NyaXB0QnJlYWtwb2ludCBicmVha3BvaW50KGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlciwg Y29uZGl0aW9uLCBicmVha3BvaW50QWN0aW9ucywgYXV0b0NvbnRpbnVlKTsKICAgICBmb3IgKFNj cmlwdHNNYXA6Oml0ZXJhdG9yIGl0ID0gbV9zY3JpcHRzLmJlZ2luKCk7IGl0ICE9IG1fc2NyaXB0 cy5lbmQoKTsgKytpdCkgewotICAgICAgICBpZiAoIW1hdGNoZXMoaXQtPnZhbHVlLnVybCwgdXJs LCBpc1JlZ2V4KSkKKyAgICAgICAgU3RyaW5nIHNjcmlwdFVSTCA9ICFpdC0+dmFsdWUuc291cmNl VVJMLmlzRW1wdHkoKSA/IGl0LT52YWx1ZS5zb3VyY2VVUkwgOiBpdC0+dmFsdWUudXJsOworICAg ICAgICBpZiAoIW1hdGNoZXMoc2NyaXB0VVJMLCB1cmwsIGlzUmVnZXgpKQogICAgICAgICAgICAg Y29udGludWU7CisKICAgICAgICAgUmVmUHRyPFR5cGVCdWlsZGVyOjpEZWJ1Z2dlcjo6TG9jYXRp b24+IGxvY2F0aW9uID0gcmVzb2x2ZUJyZWFrcG9pbnQoYnJlYWtwb2ludElkLCBpdC0+a2V5LCBi cmVha3BvaW50KTsKICAgICAgICAgaWYgKGxvY2F0aW9uKQogICAgICAgICAgICAgbG9jYXRpb25z LT5hZGRJdGVtKGxvY2F0aW9uKTsKQEAgLTcwMSwxOCArNzAzLDE4IEBAIFN0cmluZyBJbnNwZWN0 b3JEZWJ1Z2dlckFnZW50Ojpzb3VyY2VNYXBVUkxGb3JTY3JpcHQoY29uc3QgU2NyaXB0JiBzY3Jp cHQpCiAKIC8vIEphdmFTY3JpcHREZWJ1Z0xpc3RlbmVyIGZ1bmN0aW9ucwogCi12b2lkIEluc3Bl Y3RvckRlYnVnZ2VyQWdlbnQ6OmRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc2NyaXB0SWQs IGNvbnN0IFNjcmlwdCYgc2NyaXB0KQordm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpkaWRQ YXJzZVNvdXJjZShjb25zdCBTdHJpbmcmIHNjcmlwdElkLCBjb25zdCBTY3JpcHQmIGluU2NyaXB0 KQogewotICAgIC8vIERvbid0IHNlbmQgc2NyaXB0IGNvbnRlbnQgdG8gdGhlIGZyb250IGVuZCB1 bnRpbCBpdCdzIHJlYWxseSBuZWVkZWQuCi0gICAgY29uc3QgYm9vbCogaXNDb250ZW50U2NyaXB0 ID0gc2NyaXB0LmlzQ29udGVudFNjcmlwdCA/ICZzY3JpcHQuaXNDb250ZW50U2NyaXB0IDogMDsK LSAgICBTdHJpbmcgc291cmNlTWFwVVJMID0gc291cmNlTWFwVVJMRm9yU2NyaXB0KHNjcmlwdCk7 Ci0gICAgU3RyaW5nKiBzb3VyY2VNYXBVUkxQYXJhbSA9IHNvdXJjZU1hcFVSTC5pc051bGwoKSA/ IDAgOiAmc291cmNlTWFwVVJMOwotICAgIFN0cmluZyBzb3VyY2VVUkw7CisgICAgU2NyaXB0IHNj cmlwdCA9IGluU2NyaXB0OwogICAgIGlmICghc2NyaXB0LnN0YXJ0TGluZSAmJiAhc2NyaXB0LnN0 YXJ0Q29sdW1uKQotICAgICAgICBzb3VyY2VVUkwgPSBDb250ZW50U2VhcmNoVXRpbHM6OmZpbmRT Y3JpcHRTb3VyY2VVUkwoc2NyaXB0LnNvdXJjZSk7Ci0gICAgYm9vbCBoYXNTb3VyY2VVUkwgPSAh c291cmNlVVJMLmlzRW1wdHkoKTsKLSAgICBTdHJpbmcgc2NyaXB0VVJMID0gaGFzU291cmNlVVJM ID8gc291cmNlVVJMIDogc2NyaXB0LnVybDsKKyAgICAgICAgc2NyaXB0LnNvdXJjZVVSTCA9IENv bnRlbnRTZWFyY2hVdGlsczo6ZmluZFNjcmlwdFNvdXJjZVVSTChzY3JpcHQuc291cmNlKTsKKyAg ICBzY3JpcHQuc291cmNlTWFwcGluZ1VSTCA9IHNvdXJjZU1hcFVSTEZvclNjcmlwdChzY3JpcHQp OworCisgICAgYm9vbCBoYXNTb3VyY2VVUkwgPSAhc2NyaXB0LnNvdXJjZVVSTC5pc0VtcHR5KCk7 CisgICAgU3RyaW5nIHNjcmlwdFVSTCA9IGhhc1NvdXJjZVVSTCA/IHNjcmlwdC5zb3VyY2VVUkwg OiBzY3JpcHQudXJsOwogICAgIGJvb2wqIGhhc1NvdXJjZVVSTFBhcmFtID0gaGFzU291cmNlVVJM ID8gJmhhc1NvdXJjZVVSTCA6IDA7CisgICAgU3RyaW5nKiBzb3VyY2VNYXBVUkxQYXJhbSA9IHNj cmlwdC5zb3VyY2VNYXBwaW5nVVJMLmlzTnVsbCgpID8gMCA6ICZzY3JpcHQuc291cmNlTWFwcGlu Z1VSTDsKKyAgICBjb25zdCBib29sKiBpc0NvbnRlbnRTY3JpcHQgPSBzY3JpcHQuaXNDb250ZW50 U2NyaXB0ID8gJnNjcmlwdC5pc0NvbnRlbnRTY3JpcHQgOiAwOwogICAgIG1fZnJvbnRlbmQtPnNj cmlwdFBhcnNlZChzY3JpcHRJZCwgc2NyaXB0VVJMLCBzY3JpcHQuc3RhcnRMaW5lLCBzY3JpcHQu c3RhcnRDb2x1bW4sIHNjcmlwdC5lbmRMaW5lLCBzY3JpcHQuZW5kQ29sdW1uLCBpc0NvbnRlbnRT Y3JpcHQsIHNvdXJjZU1hcFVSTFBhcmFtLCBoYXNTb3VyY2VVUkxQYXJhbSk7CiAKICAgICBtX3Nj cmlwdHMuc2V0KHNjcmlwdElkLCBzY3JpcHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgKaW5kZXggYjE2MTllMS4uY2QwNjVkOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5o CkBAIC0xNTEsOCArMTUxLDggQEAgcHJpdmF0ZToKIAogICAgIFBhc3NSZWZQdHI8VHlwZUJ1aWxk ZXI6OkFycmF5PFR5cGVCdWlsZGVyOjpEZWJ1Z2dlcjo6Q2FsbEZyYW1lPj4gY3VycmVudENhbGxG cmFtZXMoKTsKIAotICAgIHZpcnR1YWwgdm9pZCBkaWRQYXJzZVNvdXJjZShjb25zdCBTdHJpbmcm IHNjcmlwdElkLCBjb25zdCBTY3JpcHQmKTsKLSAgICB2aXJ0dWFsIHZvaWQgZmFpbGVkVG9QYXJz ZVNvdXJjZShjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBkYXRhLCBpbnQgZmlyc3RM aW5lLCBpbnQgZXJyb3JMaW5lLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSk7CisgICAgdmly dHVhbCB2b2lkIGRpZFBhcnNlU291cmNlKGNvbnN0IFN0cmluZyYgc2NyaXB0SWQsIGNvbnN0IFNj cmlwdCYpIE9WRVJSSURFIEZJTkFMOworICAgIHZpcnR1YWwgdm9pZCBmYWlsZWRUb1BhcnNlU291 cmNlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGRhdGEsIGludCBmaXJzdExpbmUs IGludCBlcnJvckxpbmUsIGNvbnN0IFN0cmluZyYgZXJyb3JNZXNzYWdlKSBPVkVSUklERSBGSU5B TDsKIAogICAgIHZvaWQgc2V0UGF1c2VPbkV4Y2VwdGlvbnNJbXBsKEVycm9yU3RyaW5nKiwgaW50 KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1NjcmlwdERlYnVnTGlz dGVuZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9TY3JpcHREZWJ1Z0xpc3RlbmVyLmgK aW5kZXggYjQ2NDUzYi4uNjRlMjk0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL1NjcmlwdERlYnVnTGlzdGVuZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv U2NyaXB0RGVidWdMaXN0ZW5lci5oCkBAIC01NCw2ICs1NCw3IEBAIHB1YmxpYzoKIAogICAgICAg ICBTdHJpbmcgdXJsOwogICAgICAgICBTdHJpbmcgc291cmNlOworICAgICAgICBTdHJpbmcgc291 cmNlVVJMOwogICAgICAgICBTdHJpbmcgc291cmNlTWFwcGluZ1VSTDsKICAgICAgICAgaW50IHN0 YXJ0TGluZTsKICAgICAgICAgaW50IHN0YXJ0Q29sdW1uOwo=