150753 2015-10-30 20:08:09 -0700 Web Inspector: Test Debugger.scriptParsed events received after opening inspector frontend 2015-11-02 11:35:11 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg benjamin commit-queue ggaren graouts joepeck mattbaker nvasilyev saam timothy webkit-bug-importer ysuzuki oldest_to_newest 1138106 0 joepeck 2015-10-30 20:08:09 -0700 * SUMMARY Test Debugger.sourceParsed events received after opening inspector frontend. Previously we were seeing built-in scripts which caused a flurry of unexpected scriptParsed messages being sent to the frontend. Write a script to test: (1) what scriptParsed messages get sent to the frontend as we expect this to be small (2) ensure different kinds of scripts (external, inline, attributes, eval, etc) get sent to the frontend as we would expect This caught an issue with the recent sourceURL/sourceMappingURL directive handling. 1138107 1 webkit-bug-importer 2015-10-30 20:08:58 -0700 <rdar://problem/23343418> 1138108 2 264463 joepeck 2015-10-30 20:13:46 -0700 Created attachment 264463 [PATCH] Proposed Fix 1138117 3 264463 commit-queue 2015-10-30 21:59:18 -0700 Comment on attachment 264463 [PATCH] Proposed Fix Clearing flags on attachment: 264463 Committed r191839: <http://trac.webkit.org/changeset/191839> 1138118 4 commit-queue 2015-10-30 21:59:23 -0700 All reviewed patches have been landed. Closing bug. 1138156 5 264463 bburg 2015-10-31 08:55:47 -0700 Comment on attachment 264463 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=264463&action=review This is a nice test. Does it cover the JSC change as well? > LayoutTests/inspector/debugger/scriptParsed.html:86 > + foundInjectedScriptSourceScript = true; I suppose this could be foundXXX = foundXXX || isXXX(), but it doesn't read any better. I would have done foundXXX |= isXXX() since it isn't that expensive to recheck. Alternatively, you could run Array.some() with a lambda for each check. 1138632 6 joepeck 2015-11-02 11:35:11 -0800 (In reply to comment #5) > Comment on attachment 264463 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=264463&action=review > > This is a nice test. Does it cover the JSC change as well? Yes. It was required to get the sourceURL for the InjectedScript and CommandLineAPI injected script. See the ChangeLog for more details. > > LayoutTests/inspector/debugger/scriptParsed.html:86 > > + foundInjectedScriptSourceScript = true; > > I suppose this could be foundXXX = foundXXX || isXXX(), but it doesn't read > any better. I would have done foundXXX |= isXXX() since it isn't that > expensive to recheck. Alternatively, you could run Array.some() with a > lambda for each check. I want this test to ensure we don't see duplicates of the same script. The `foundXXX |= isXXX()` approach wouldn't account for that. I'm sure there are stylistically a bunch of possible solutions, this just seemed the most straight forward. 264463 2015-10-30 20:13:46 -0700 2015-10-30 21:59:18 -0700 [PATCH] Proposed Fix sourceParsed.patch text/plain 9751 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzYTYzMDY1Li40MWUxNDk1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTUtMTAt MzAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBUZXN0IERlYnVnZ2VyLnNjcmlwdFBhcnNlZCBldmVudHMgcmVjZWl2ZWQgYWZ0 ZXIgb3BlbmluZyBpbnNwZWN0b3IgZnJvbnRlbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDc1MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEV4cGxpY2l0IHRlc3QgZm9yIHRoZSBzY3JpcHRQYXJzZWQg ZXZlbnRzIHdlIGV4cGVjdCB0byBzZWUKKyAgICAgICAgd2hlbiBmaXJzdCBvcGVuaW5nIHRoZSBp bnNwZWN0b3Igb24gYW4gYWxyZWFkeSBvcGVuIHBhZ2UuCisgICAgICAgIFdlIGRvIG5vdCBleHBl Y3QgdG8gc2VlIHNvbWUgc2NyaXB0cyAoYnVpbHQtaW5zKSBidXQgZG8gZXhwZWN0CisgICAgICAg IHRvIHNlZSBhbGwgdXNlciBzY3JpcHRzIGV2YWx1YXRlZCBvbiB0aGUgcGFnZS4KKworICAgICAg ICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRQYXJzZWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4K KyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0UGFyc2VkLmh0bWw6IEFkZGVkLgor CiAyMDE1LTEwLTI5ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgogCiAgICAg ICAgIENyYXNoIG1ha2luZyBhIHRhaWwgY2FsbCBmcm9tIGEgZ2V0dGVyIHRvIGEgaG9zdCBmdW5j dGlvbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdFBh cnNlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0 UGFyc2VkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41 ZGVlOTVlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy L3NjcmlwdFBhcnNlZC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNSBAQAorVGVzdHMgZm9yIHRo ZSBEZWJ1Z2dlci5zY3JpcHRQYXJzZWQgbWVzc2FnZXMgdGhlIGZyb250ZW5kIHJlY2VpdmVzIHdo ZW4gZW5hYmxpbmcgdGhlIERlYnVnZ2VyIGRvbWFpbi4KKworCis9PSBSdW5uaW5nIHRlc3Qgc3Vp dGU6IERlYnVnZ2VyLnNjcmlwdFBhcnNlZC5lbmFibGUKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBF bmFibGVEZWJ1Z2dlckRvbWFpbkFuZENoZWNrSW5pdGlhbFNjcmlwdHMKK0RlYnVnZ2VyIEVuYWJs ZWQgLSBJbml0aWFsIFNjcmlwdHMgUmVjZWl2ZWQKK1BBU1M6IFNob3VsZCBoYXZlIHJlY2VpdmVk IHNvbWUgc2NyaXB0UGFyc2VkIG1lc3NhZ2VzLgorUEFTUzogU2hvdWxkIGZpbmQgRXh0ZXJuYWwg U2NyaXB0LgorUEFTUzogU2hvdWxkIGZpbmQgSW5saW5lIFNjcmlwdCBUYWcgU2NyaXB0LgorUEFT UzogU2hvdWxkIGZpbmQgSW5saW5lIEF0dHJpYnV0ZSBFdmVudCBMaXN0ZW5lciBTY3JpcHQuCitQ QVNTOiBTaG91bGQgZmluZCBFdmFsIFNjcmlwdC4KK1BBU1M6IFNob3VsZCBmaW5kIEluc3BlY3Rv ciBJbmplY3RlZFNjcmlwdFNvdXJjZSBTY3JpcHQuCitQQVNTOiBTaG91bGQgZmluZCBJbnNwZWN0 b3IgQ29tbWFuZExpbmVBUElTb3VyY2UgU2NyaXB0LgorUEFTUzogU2hvdWxkIG5vdCByZWNlaXZl IGFueSB1bmV4cGVjdGVkIHNjcmlwdHMuCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9zY3JpcHRQYXJzZWQuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci9zY3JpcHRQYXJzZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi41N2ViYmNhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL3NjcmlwdFBhcnNlZC5odG1sCkBAIC0wLDAgKzEsMTIzIEBACis8IURPQ1RZUEUgaHRt bD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0 b3IvcmVzb3VyY2VzL3Byb3RvY29sLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKy8vIENy ZWF0ZSBhIG5hbWVkIGV2YWwuCitldmFsKCIvLyMgc291cmNlVVJMPWV2YWwuanNcbmZ1bmN0aW9u IGZvbygpIHsgfSIpOworCitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAgICBsZXQgc3VpdGUgPSBQcm90 b2NvbFRlc3QuY3JlYXRlQXN5bmNTdWl0ZSgiRGVidWdnZXIuc2NyaXB0UGFyc2VkLmVuYWJsZSIp OworCisgICAgUHJvdG9jb2xUZXN0LmR1bXBBY3Rpdml0eVRvU3lzdGVtQ29uc29sZSA9IHRydWU7 CisgICAgUHJvdG9jb2xUZXN0LmR1bXBJbnNwZWN0b3JQcm90b2NvbE1lc3NhZ2VzID0gdHJ1ZTsK KworICAgIC8vIEJlY2F1c2UgSW5zcGVjdG9yVGVzdCBvdXRwdXQgY2F1c2VzIHNjcmlwdHMgdG8g YmUgcGFyc2VkCisgICAgLy8gdGhpcyB0ZXN0IG9ubHkgY2hlY2tzIHRoZSBzY3JpcHRzIHRoZSBm cm9udGVuZCBpcyBub3RpZmllZAorICAgIC8vIG9mIHdoZW4gZW5hYmxpbmcgdGhlIERlYnVnZ2Vy IGRvbWFpbi4KKyAgICAvLworICAgIC8vIFNjcmlwdHMgd2UgZXhwZWN0IHRvIHNlZSAoaW4gYW4g dW5kZWZpbmVkIG9yZGVyKQorICAgIC8vICAgLSBleHRlcm5hbCA8c2NyaXB0PiBwcm90b2NvbC10 ZXN0LmpzCisgICAgLy8gICAtIGlubGluZSA8c2NyaXB0PiAodGhpcykgc3RhcnRpbmcgb24gbGlu ZSA1CisgICAgLy8gICAtIGlubGluZSBib2R5IG9ubG9hZCBldmVudCBsaXN0ZW5lciBhdHRyaWJ1 dGUgb24gPGJvZHk+IGxpbmUgYmVsb3cKKyAgICAvLyAgIC0gZXZhbCBzb3VyY2UgYWJvdmUgb24g bGluZSA3CisgICAgLy8gICAtIGluc3BlY3RvciBpbnRlcm5hbCBzY3JpcHRzIEluamVjdGVkU2Ny aXB0U291cmNlLmpzIENvbW1hbmRMaW5lQVBJTW9kdWxlU291cmNlLmpzCisKKyAgICBsZXQgZm91 bmRFeHRlcm5hbFNjcmlwdCA9IGZhbHNlOworICAgIGxldCBmb3VuZElubGluZVNjcmlwdFRhZ1Nj cmlwdCA9IGZhbHNlOworICAgIGxldCBmb3VuZElubGluZUF0dHJpYnV0ZUV2ZW50TGlzdGVuZXJT Y3JpcHQgPSBmYWxzZTsKKyAgICBsZXQgZm91bmRFdmFsU2NyaXB0ID0gZmFsc2U7CisgICAgbGV0 IGZvdW5kSW5qZWN0ZWRTY3JpcHRTb3VyY2VTY3JpcHQgPSBmYWxzZTsKKyAgICBsZXQgZm91bmRD b21tYW5kTGluZUFQSVNvdXJjZVNjcmlwdCA9IGZhbHNlOworICAgIGxldCBmb3VuZFVuZXhwZWN0 ZWRTY3JpcHQgPSBmYWxzZTsKKworICAgIGZ1bmN0aW9uIGlzRXh0ZXJuYWxTY3JpcHQocGFyYW1z KSB7CisgICAgICAgIHJldHVybiAvaW5zcGVjdG9yXC9yZXNvdXJjZXNcL3Byb3RvY29sLXRlc3Rc LmpzLy50ZXN0KHBhcmFtcy51cmwpOworICAgIH0KKworICAgIGZ1bmN0aW9uIGlzSW5saW5lU2Ny aXB0KHBhcmFtcykgeworICAgICAgICByZXR1cm4gL2luc3BlY3RvclwvZGVidWdnZXJcL3Njcmlw dFBhcnNlZFwuaHRtbCQvLnRlc3QocGFyYW1zLnVybCk7CisgICAgfQorCisgICAgZnVuY3Rpb24g aXNJbmxpbmVTY3JpcHRUYWdTY3JpcHQocGFyYW1zKSB7CisgICAgICAgIHJldHVybiBpc0lubGlu ZVNjcmlwdChwYXJhbXMpICYmIHBhcmFtcy5zdGFydExpbmUgPT09IDQ7CisgICAgfQorCisgICAg ZnVuY3Rpb24gaXNJbmxpbmVBdHRyaWJ1dGVFdmVudExpc3RlbmVyU2NyaXB0KHBhcmFtcykgewor ICAgICAgICByZXR1cm4gaXNJbmxpbmVTY3JpcHQocGFyYW1zKSAmJiBwYXJhbXMuc3RhcnRMaW5l ID49IDEwMDsgLy8gRXN0aW1hdGUgb2YgPGJvZHk+IGJlbG93LgorICAgIH0KKworICAgIGZ1bmN0 aW9uIGlzRXZhbFNjcmlwdChwYXJhbXMpIHsKKyAgICAgICAgcmV0dXJuIHBhcmFtcy5oYXNTb3Vy Y2VVUkwgJiYgcGFyYW1zLnVybCA9PT0gImV2YWwuanMiOworICAgIH0KKworICAgIGZ1bmN0aW9u IGlzSW5qZWN0ZWRTY3JpcHRTb3VyY2VTY3JpcHQocGFyYW1zKSB7CisgICAgICAgIHJldHVybiBw YXJhbXMuaGFzU291cmNlVVJMICYmIHBhcmFtcy51cmwgPT09ICJfX1dlYkluc3BlY3RvckluamVj dGVkU2NyaXB0X18iOworICAgIH0KKworICAgIGZ1bmN0aW9uIGlzQ29tbWFuZExpbmVBUElTb3Vy Y2VTY3JpcHQocGFyYW1zKSB7CisgICAgICAgIHJldHVybiBwYXJhbXMuaGFzU291cmNlVVJMICYm IHBhcmFtcy51cmwgPT09ICJfX1dlYkluc3BlY3RvckNvbW1hbmRMaW5lQVBJTW9kdWxlU291cmNl X18iOworICAgIH0KKworICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTogIkVu YWJsZURlYnVnZ2VyRG9tYWluQW5kQ2hlY2tJbml0aWFsU2NyaXB0cyIsCisgICAgICAgIHRlc3Q6 IChyZXNvbHZlLCByZWplY3QpID0+IHsKKworICAgICAgICAgICAgbGV0IGluaXRpYWxTY3JpcHRQ YXJzZWRNZXNzYWdlcyA9IFtdOworICAgICAgICAgICAgbGV0IHJlY2VpdmluZ0luaXRpYWxTY3Jp cHRzID0gdHJ1ZTsKKyAgICAgICAgICAgIEluc3BlY3RvclByb3RvY29sLnNlbmRDb21tYW5kKCJE ZWJ1Z2dlci5lbmFibGUiLCB7fSwgZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgcmVjZWl2 aW5nSW5pdGlhbFNjcmlwdHMgPSBmYWxzZTsKKworICAgICAgICAgICAgICAgIFByb3RvY29sVGVz dC5sb2coIkRlYnVnZ2VyIEVuYWJsZWQgLSBJbml0aWFsIFNjcmlwdHMgUmVjZWl2ZWQiKTsKKyAg ICAgICAgICAgICAgICBQcm90b2NvbFRlc3QuZXhwZWN0VGhhdChpbml0aWFsU2NyaXB0UGFyc2Vk TWVzc2FnZXMubGVuZ3RoID4gMCwgIlNob3VsZCBoYXZlIHJlY2VpdmVkIHNvbWUgc2NyaXB0UGFy c2VkIG1lc3NhZ2VzLiIpOworCisgICAgICAgICAgICAgICAgZm9yIChsZXQgbWVzc2FnZU9iamVj dCBvZiBpbml0aWFsU2NyaXB0UGFyc2VkTWVzc2FnZXMpIHsKKyAgICAgICAgICAgICAgICAgICAg bGV0IHBhcmFtcyA9IG1lc3NhZ2VPYmplY3QucGFyYW1zOworICAgICAgICAgICAgICAgICAgICBp ZiAoIWZvdW5kRXh0ZXJuYWxTY3JpcHQgJiYgaXNFeHRlcm5hbFNjcmlwdChwYXJhbXMpKQorICAg ICAgICAgICAgICAgICAgICAgICAgZm91bmRFeHRlcm5hbFNjcmlwdCA9IHRydWU7CisgICAgICAg ICAgICAgICAgICAgIGVsc2UgaWYgKCFmb3VuZElubGluZVNjcmlwdFRhZ1NjcmlwdCAmJiBpc0lu bGluZVNjcmlwdFRhZ1NjcmlwdChwYXJhbXMpKQorICAgICAgICAgICAgICAgICAgICAgICAgZm91 bmRJbmxpbmVTY3JpcHRUYWdTY3JpcHQgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICBlbHNl IGlmICghZm91bmRJbmxpbmVBdHRyaWJ1dGVFdmVudExpc3RlbmVyU2NyaXB0ICYmIGlzSW5saW5l QXR0cmlidXRlRXZlbnRMaXN0ZW5lclNjcmlwdChwYXJhbXMpKQorICAgICAgICAgICAgICAgICAg ICAgICAgZm91bmRJbmxpbmVBdHRyaWJ1dGVFdmVudExpc3RlbmVyU2NyaXB0ID0gdHJ1ZTsKKyAg ICAgICAgICAgICAgICAgICAgZWxzZSBpZiAoIWZvdW5kRXZhbFNjcmlwdCAmJiBpc0V2YWxTY3Jp cHQocGFyYW1zKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGZvdW5kRXZhbFNjcmlwdCA9IHRy dWU7CisgICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKCFmb3VuZEluamVjdGVkU2NyaXB0U291 cmNlU2NyaXB0ICYmIGlzSW5qZWN0ZWRTY3JpcHRTb3VyY2VTY3JpcHQocGFyYW1zKSkKKyAgICAg ICAgICAgICAgICAgICAgICAgIGZvdW5kSW5qZWN0ZWRTY3JpcHRTb3VyY2VTY3JpcHQgPSB0cnVl OworICAgICAgICAgICAgICAgICAgICBlbHNlIGlmICghZm91bmRDb21tYW5kTGluZUFQSVNvdXJj ZVNjcmlwdCAmJiBpc0NvbW1hbmRMaW5lQVBJU291cmNlU2NyaXB0KHBhcmFtcykpCisgICAgICAg ICAgICAgICAgICAgICAgICBmb3VuZENvbW1hbmRMaW5lQVBJU291cmNlU2NyaXB0ID0gdHJ1ZTsK KyAgICAgICAgICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgICAgICAgICBQcm90 b2NvbFRlc3QubG9nKCJVTkVYUEVDVEVEIFNDUklQVDogIiArIEpTT04uc3RyaW5naWZ5KG1lc3Nh Z2VPYmplY3QpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGZvdW5kVW5leHBlY3RlZFNjcmlw dCA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9CisKKyAg ICAgICAgICAgICAgICBQcm90b2NvbFRlc3QuZXhwZWN0VGhhdChmb3VuZEV4dGVybmFsU2NyaXB0 LCAiU2hvdWxkIGZpbmQgRXh0ZXJuYWwgU2NyaXB0LiIpOworICAgICAgICAgICAgICAgIFByb3Rv Y29sVGVzdC5leHBlY3RUaGF0KGZvdW5kSW5saW5lU2NyaXB0VGFnU2NyaXB0LCAiU2hvdWxkIGZp bmQgSW5saW5lIFNjcmlwdCBUYWcgU2NyaXB0LiIpOworICAgICAgICAgICAgICAgIFByb3RvY29s VGVzdC5leHBlY3RUaGF0KGZvdW5kSW5saW5lQXR0cmlidXRlRXZlbnRMaXN0ZW5lclNjcmlwdCwg IlNob3VsZCBmaW5kIElubGluZSBBdHRyaWJ1dGUgRXZlbnQgTGlzdGVuZXIgU2NyaXB0LiIpOwor ICAgICAgICAgICAgICAgIFByb3RvY29sVGVzdC5leHBlY3RUaGF0KGZvdW5kRXZhbFNjcmlwdCwg IlNob3VsZCBmaW5kIEV2YWwgU2NyaXB0LiIpOworICAgICAgICAgICAgICAgIFByb3RvY29sVGVz dC5leHBlY3RUaGF0KGZvdW5kSW5qZWN0ZWRTY3JpcHRTb3VyY2VTY3JpcHQsICJTaG91bGQgZmlu ZCBJbnNwZWN0b3IgSW5qZWN0ZWRTY3JpcHRTb3VyY2UgU2NyaXB0LiIpOworICAgICAgICAgICAg ICAgIFByb3RvY29sVGVzdC5leHBlY3RUaGF0KGZvdW5kQ29tbWFuZExpbmVBUElTb3VyY2VTY3Jp cHQsICJTaG91bGQgZmluZCBJbnNwZWN0b3IgQ29tbWFuZExpbmVBUElTb3VyY2UgU2NyaXB0LiIp OworICAgICAgICAgICAgICAgIFByb3RvY29sVGVzdC5leHBlY3RUaGF0KCFmb3VuZFVuZXhwZWN0 ZWRTY3JpcHQsICJTaG91bGQgbm90IHJlY2VpdmUgYW55IHVuZXhwZWN0ZWQgc2NyaXB0cy4iKTsK KworICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKKyAgICAgICAgICAgIH0pOworCisgICAgICAg ICAgICBJbnNwZWN0b3JQcm90b2NvbC5ldmVudEhhbmRsZXJbIkRlYnVnZ2VyLnNjcmlwdFBhcnNl ZCJdID0gZnVuY3Rpb24obWVzc2FnZU9iamVjdCkgeworICAgICAgICAgICAgICAgIC8vIElnbm9y ZSBub24taW5pdGlhbCBsb2FkIHNjcmlwdHMuCisgICAgICAgICAgICAgICAgaWYgKCFyZWNlaXZp bmdJbml0aWFsU2NyaXB0cykKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAg ICAgICAgICAgaW5pdGlhbFNjcmlwdFBhcnNlZE1lc3NhZ2VzLnB1c2gobWVzc2FnZU9iamVjdCk7 CisgICAgICAgICAgICB9OworICAgICAgICB9CisgICAgfSk7CisKKyAgICBzdWl0ZS5ydW5UZXN0 Q2FzZXNBbmRGaW5pc2goKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJy dW5UZXN0KCkiPiA8IS0tIFRoaXMgbGluZSBudW1iZXIgaXMgaW1wb3J0YW50IC0tPgorPHA+VGVz dHMgZm9yIHRoZSBEZWJ1Z2dlci5zY3JpcHRQYXJzZWQgbWVzc2FnZXMgdGhlIGZyb250ZW5kIHJl Y2VpdmVzIHdoZW4gZW5hYmxpbmcgdGhlIERlYnVnZ2VyIGRvbWFpbi48L3A+Cis8L2JvZHk+Cis8 L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1OWRmZTkzLi44ZmU5NzUyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNS0xMC0zMCAgSm9zZXBo IFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFRlc3QgRGVidWdnZXIuc2NyaXB0UGFyc2VkIGV2ZW50cyByZWNlaXZlZCBhZnRlciBvcGVuaW5n IGluc3BlY3RvciBmcm9udGVuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTUwNzUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBwYXJzZXIvUGFyc2VyLmg6CisgICAgICAgIChKU0M6OlBhcnNlcjxMZXhl clR5cGU+OjpwYXJzZSk6CisgICAgICAgIE9ubHkgc2V0IHRoZSBkaXJlY3RpdmVzIG9uIHRoZSBT b3VyY2VQcm92aWRlciBpZiB3ZSB3ZXJlIHBhcnNpbmcgdGhlCisgICAgICAgIGVudGlyZSBmaWxl IChQcm9ncmFtIG9yIE1vZHVsZSksIG5vdCBpZiB3ZSBhcmUgaW4gZnVuY3Rpb24gcGFyc2luZyBt b2RlLgorICAgICAgICBUaGlzIHdhcyBpbmFkdmVydGVudGx5IGNsZWFyaW5nIHRoZSBkaXJlY3Rp dmVzIHN0b3JlZCBvbiB0aGUKKyAgICAgICAgU291cmNlUHJvdmlkZXIgd2hlbiB0aGUgZnVuY3Rp b24gcGFyc2UgZGlkbid0IHNlZSBkaXJlY3RpdmVzIGFuZCByZXNldAorICAgICAgICB0aGUgdmFs dWVzIG9uIHRoZSBzb3VyY2UgcHJvdmlkZXIuCisKIDIwMTUtMTAtMjkgIEpvc2VwaCBQZWNvcmFy byAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEbyBub3Qg c2hvdyBKYXZhU2NyaXB0Q29yZSBidWlsdGlucyBpbiBpbnNwZWN0b3IKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcGFyc2VyL1BhcnNlci5oCmluZGV4IDUyMzFjMmEuLmI5MDg5YmMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmgKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3BhcnNlci9QYXJzZXIuaApAQCAtMTMzMCw4ICsxMzMwLDEwIEBAIHN0ZDo6dW5pcXVl X3B0cjxQYXJzZWROb2RlPiBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2UoUGFyc2VyRXJyb3ImIGVy cm9yLCBjb25zdCBJCiAgICAgICAgIHJlc3VsdC0+c2V0TG9jKG1fc291cmNlLT5maXJzdExpbmUo KSwgbV9sZXhlci0+bGluZU51bWJlcigpLCBtX2xleGVyLT5jdXJyZW50T2Zmc2V0KCksIG1fbGV4 ZXItPmN1cnJlbnRMaW5lU3RhcnRPZmZzZXQoKSk7CiAgICAgICAgIHJlc3VsdC0+c2V0RW5kT2Zm c2V0KG1fbGV4ZXItPmN1cnJlbnRPZmZzZXQoKSk7CiAKLSAgICAgICAgbV9zb3VyY2UtPnByb3Zp ZGVyKCktPnNldFNvdXJjZVVSTERpcmVjdGl2ZShtX2xleGVyLT5zb3VyY2VVUkwoKSk7Ci0gICAg ICAgIG1fc291cmNlLT5wcm92aWRlcigpLT5zZXRTb3VyY2VNYXBwaW5nVVJMRGlyZWN0aXZlKG1f bGV4ZXItPnNvdXJjZU1hcHBpbmdVUkwoKSk7CisgICAgICAgIGlmICghaXNGdW5jdGlvblBhcnNl TW9kZShwYXJzZU1vZGUpKSB7CisgICAgICAgICAgICBtX3NvdXJjZS0+cHJvdmlkZXIoKS0+c2V0 U291cmNlVVJMRGlyZWN0aXZlKG1fbGV4ZXItPnNvdXJjZVVSTCgpKTsKKyAgICAgICAgICAgIG1f c291cmNlLT5wcm92aWRlcigpLT5zZXRTb3VyY2VNYXBwaW5nVVJMRGlyZWN0aXZlKG1fbGV4ZXIt PnNvdXJjZU1hcHBpbmdVUkwoKSk7CisgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICAv LyBXZSBjYW4gbmV2ZXIgc2VlIGEgc3ludGF4IGVycm9yIHdoZW4gcmVwYXJzaW5nIGEgZnVuY3Rp b24sIHNpbmNlIHdlIHNob3VsZCBoYXZlCiAgICAgICAgIC8vIHJlcG9ydGVkIHRoZSBlcnJvciB3 aGVuIHBhcnNpbmcgdGhlIGNvbnRhaW5pbmcgcHJvZ3JhbSBvciBldmFsIGNvZGUuIFNvIGlmIHdl J3JlCg==