148480 2015-08-26 09:49:20 -0700 Web Inspector: REGRESSION(r188965): BackendDispatcher loses request ids when called re-entrantly 2015-08-26 11:53:56 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 146466 1 bburg bburg bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1120965 0 bburg 2015-08-26 09:49:20 -0700 I added an assertion that m_currentRequestId is Nullopt when dispatch() is called, but this should not hold if dispatching a backend command while debugger is paused. I will remove the assertion and add proper scoping for all dispatch() branches. This caused inspector/dom-debugger/node-removed.html to crash reliably, rather than flakily due to some other JSC bug. 1120966 1 webkit-bug-importer 2015-08-26 09:51:27 -0700 <rdar://problem/22438652> 1120967 2 259960 bburg 2015-08-26 09:55:17 -0700 Created attachment 259960 Proposed Fix 1120982 3 259960 joepeck 2015-08-26 11:03:23 -0700 Comment on attachment 259960 Proposed Fix r=me 1121006 4 259960 commit-queue 2015-08-26 11:53:52 -0700 Comment on attachment 259960 Proposed Fix Clearing flags on attachment: 259960 Committed r188976: <http://trac.webkit.org/changeset/188976> 1121007 5 commit-queue 2015-08-26 11:53:56 -0700 All reviewed patches have been landed. Closing bug. 259960 2015-08-26 09:55:17 -0700 2015-08-26 11:53:52 -0700 Proposed Fix bug-148480-20150826095505.patch text/plain 7357 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4OTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh NGNlZDdiZTlhN2E0N2NlMDYyNGU2OTBmZjk3NDk3MjIzMWFkNThhLi45MGI1NDQ3NjQxNDkyOTg1 YTJjNmNjYWU0NjhiOGQzZDdiYWFjZTUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxNS0wOC0yNiAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNTSU9OKHIxODg5NjUpOiBCYWNrZW5kRGlzcGF0 Y2hlciBsb3NlcyByZXF1ZXN0IGlkcyB3aGVuIGNhbGxlZCByZS1lbnRyYW50bHkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODQ4MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEkgYWRkZWQgYW4gYXNzZXJ0 aW9uIHRoYXQgbV9jdXJyZW50UmVxdWVzdElkIGlzIE51bGxvcHQgd2hlbiBkaXNwYXRjaCgpIGlz IGNhbGxlZCwgYnV0IHRoaXMgc2hvdWxkCisgICAgICAgIG5vdCBob2xkIGlmIGRpc3BhdGNoaW5n IGEgYmFja2VuZCBjb21tYW5kIHdoaWxlIGRlYnVnZ2VyIGlzIHBhdXNlZC4gSSB3aWxsIHJlbW92 ZSB0aGUgYXNzZXJ0aW9uCisgICAgICAgIGFuZCBhZGQgcHJvcGVyIHNjb3BpbmcgZm9yIGFsbCBk aXNwYXRjaCgpIGJyYW5jaGVzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGhpcyB3cm9uZyBh c3NlcnQgY2F1c2VkIGluc3BlY3Rvci9kb20tZGVidWdnZXIvbm9kZS1yZW1vdmVkLmh0bWwgdG8g Y3Jhc2ggcmVsaWFibHkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZERp c3BhdGNoZXIuY3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpCYWNrZW5kRGlzcGF0Y2hlcjo6ZGlz cGF0Y2gpOiBDb3ZlciBlYWNoIGV4aXQgd2l0aCBhbiBhcHByb3ByaWF0ZSBUZW1wb3JhcnlDaGFu Z2Ugc2NvcGUuCisKIDIwMTUtMDgtMjUgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3Rvcjogbm8gbmVlZCB0byBhbGxvY2F0ZSBwcm90b2NvbEVycm9y cyBhcnJheSBmb3IgZXZlcnkgZGlzcGF0Y2hlZCBiYWNrZW5kIGNvbW1hbmQKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZERpc3BhdGNo ZXIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5k RGlzcGF0Y2hlci5jcHAKaW5kZXggMzcxYzBhOTQ4ZmM1NjkzMzUzNWFhZTJiYTE5M2UyOGY4ZjUy MWE0MS4uNGQ0NWRhOTllMWJmNjY0NzUzN2Q4NGMxNDEzNTIyOTM5YjA5ODA4OSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kRGlzcGF0 Y2hlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JC YWNrZW5kRGlzcGF0Y2hlci5jcHAKQEAgLTg2LDcyICs4Niw4MSBAQCB2b2lkIEJhY2tlbmREaXNw YXRjaGVyOjpkaXNwYXRjaChjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCiAKICAgICBBU1NFUlQoIW1f cHJvdG9jb2xFcnJvcnMuc2l6ZSgpKTsKIAotICAgIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gcGFy c2VkTWVzc2FnZTsKLSAgICBpZiAoIUluc3BlY3RvclZhbHVlOjpwYXJzZUpTT04obWVzc2FnZSwg cGFyc2VkTWVzc2FnZSkpIHsKLSAgICAgICAgcmVwb3J0UHJvdG9jb2xFcnJvcihQYXJzZUVycm9y LCBBU0NJSUxpdGVyYWwoIk1lc3NhZ2UgbXVzdCBiZSBpbiBKU09OIGZvcm1hdCIpKTsKLSAgICAg ICAgc2VuZFBlbmRpbmdFcnJvcnMoKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIFJl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+IG1lc3NhZ2VPYmplY3Q7Ci0gICAgaWYgKCFwYXJzZWRNZXNz YWdlLT5hc09iamVjdChtZXNzYWdlT2JqZWN0KSkgewotICAgICAgICByZXBvcnRQcm90b2NvbEVy cm9yKEludmFsaWRSZXF1ZXN0LCBBU0NJSUxpdGVyYWwoIk1lc3NhZ2UgbXVzdCBiZSBhIEpTT05p ZmllZCBvYmplY3QiKSk7Ci0gICAgICAgIHNlbmRQZW5kaW5nRXJyb3JzKCk7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9Ci0KLSAgICBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IHJlcXVlc3RJZFZhbHVl OwotICAgIGlmICghbWVzc2FnZU9iamVjdC0+Z2V0VmFsdWUoQVNDSUlMaXRlcmFsKCJpZCIpLCBy ZXF1ZXN0SWRWYWx1ZSkpIHsKLSAgICAgICAgcmVwb3J0UHJvdG9jb2xFcnJvcihJbnZhbGlkUmVx dWVzdCwgQVNDSUlMaXRlcmFsKCInaWQnIHByb3BlcnR5IHdhcyBub3QgZm91bmQiKSk7Ci0gICAg ICAgIHNlbmRQZW5kaW5nRXJyb3JzKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBs b25nIHJlcXVlc3RJZCA9IDA7Ci0gICAgaWYgKCFyZXF1ZXN0SWRWYWx1ZS0+YXNJbnRlZ2VyKHJl cXVlc3RJZCkpIHsKLSAgICAgICAgcmVwb3J0UHJvdG9jb2xFcnJvcihJbnZhbGlkUmVxdWVzdCwg QVNDSUlMaXRlcmFsKCJUaGUgdHlwZSBvZiAnaWQnIHByb3BlcnR5IG11c3QgYmUgaW50ZWdlciIp KTsKLSAgICAgICAgc2VuZFBlbmRpbmdFcnJvcnMoKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0K LQotICAgIEFTU0VSVCghbV9jdXJyZW50UmVxdWVzdElkKTsKLSAgICBUZW1wb3JhcnlDaGFuZ2U8 T3B0aW9uYWw8bG9uZz4+IHNjb3BlZFJlcXVlc3RJZChtX2N1cnJlbnRSZXF1ZXN0SWQsIHJlcXVl c3RJZCk7Ci0KLSAgICBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IG1ldGhvZFZhbHVlOwotICAgIGlm ICghbWVzc2FnZU9iamVjdC0+Z2V0VmFsdWUoQVNDSUlMaXRlcmFsKCJtZXRob2QiKSwgbWV0aG9k VmFsdWUpKSB7Ci0gICAgICAgIHJlcG9ydFByb3RvY29sRXJyb3IoSW52YWxpZFJlcXVlc3QsIEFT Q0lJTGl0ZXJhbCgiJ21ldGhvZCcgcHJvcGVydHkgd2Fzbid0IGZvdW5kIikpOwotICAgICAgICBz ZW5kUGVuZGluZ0Vycm9ycygpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgU3RyaW5n IG1ldGhvZFN0cmluZzsKLSAgICBpZiAoIW1ldGhvZFZhbHVlLT5hc1N0cmluZyhtZXRob2RTdHJp bmcpKSB7Ci0gICAgICAgIHJlcG9ydFByb3RvY29sRXJyb3IoSW52YWxpZFJlcXVlc3QsIEFTQ0lJ TGl0ZXJhbCgiVGhlIHR5cGUgb2YgJ21ldGhvZCcgcHJvcGVydHkgbXVzdCBiZSBzdHJpbmciKSk7 Ci0gICAgICAgIHNlbmRQZW5kaW5nRXJyb3JzKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Cisg ICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gbWVzc2FnZU9iamVjdDsKIAotICAgIFZlY3RvcjxT dHJpbmc+IGRvbWFpbkFuZE1ldGhvZDsKLSAgICBtZXRob2RTdHJpbmcuc3BsaXQoJy4nLCB0cnVl LCBkb21haW5BbmRNZXRob2QpOwotICAgIGlmIChkb21haW5BbmRNZXRob2Quc2l6ZSgpICE9IDIg fHwgIWRvbWFpbkFuZE1ldGhvZFswXS5sZW5ndGgoKSB8fCAhZG9tYWluQW5kTWV0aG9kWzFdLmxl bmd0aCgpKSB7Ci0gICAgICAgIHJlcG9ydFByb3RvY29sRXJyb3IoSW52YWxpZFJlcXVlc3QsIEFT Q0lJTGl0ZXJhbCgiVGhlICdtZXRob2QnIHByb3BlcnR5IHdhcyBmb3JtYXR0ZWQgaW5jb3JyZWN0 bHkuIEl0IHNob3VsZCBiZSAnRG9tYWluLm1ldGhvZCciKSk7Ci0gICAgICAgIHNlbmRQZW5kaW5n RXJyb3JzKCk7Ci0gICAgICAgIHJldHVybjsKKyAgICB7CisgICAgICAgIC8vIEluIGNhc2UgdGhp cyBpcyBhIHJlLWVudHJhbnQgY2FsbCBmcm9tIGEgbmVzdGVkIHJ1biBsb29wLCB3ZSBkb24ndCB3 YW50IHRvIGxvc2UKKyAgICAgICAgLy8gdGhlIG91dGVyIHJlcXVlc3QncyBpZCBqdXN0IGJlY2F1 c2UgdGhlIGlubmVyIHJlcXVlc3QgaXMgYm9ndXMuCisgICAgICAgIFRlbXBvcmFyeUNoYW5nZTxP cHRpb25hbDxsb25nPj4gc2NvcGVkUmVxdWVzdElkKG1fY3VycmVudFJlcXVlc3RJZCwgTnVsbG9w dCk7CisKKyAgICAgICAgUmVmUHRyPEluc3BlY3RvclZhbHVlPiBwYXJzZWRNZXNzYWdlOworICAg ICAgICBpZiAoIUluc3BlY3RvclZhbHVlOjpwYXJzZUpTT04obWVzc2FnZSwgcGFyc2VkTWVzc2Fn ZSkpIHsKKyAgICAgICAgICAgIHJlcG9ydFByb3RvY29sRXJyb3IoUGFyc2VFcnJvciwgQVNDSUlM aXRlcmFsKCJNZXNzYWdlIG11c3QgYmUgaW4gSlNPTiBmb3JtYXQiKSk7CisgICAgICAgICAgICBz ZW5kUGVuZGluZ0Vycm9ycygpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAg ICAgICAgaWYgKCFwYXJzZWRNZXNzYWdlLT5hc09iamVjdChtZXNzYWdlT2JqZWN0KSkgeworICAg ICAgICAgICAgcmVwb3J0UHJvdG9jb2xFcnJvcihJbnZhbGlkUmVxdWVzdCwgQVNDSUlMaXRlcmFs KCJNZXNzYWdlIG11c3QgYmUgYSBKU09OaWZpZWQgb2JqZWN0IikpOworICAgICAgICAgICAgc2Vu ZFBlbmRpbmdFcnJvcnMoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAg ICAgIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gcmVxdWVzdElkVmFsdWU7CisgICAgICAgIGlmICgh bWVzc2FnZU9iamVjdC0+Z2V0VmFsdWUoQVNDSUlMaXRlcmFsKCJpZCIpLCByZXF1ZXN0SWRWYWx1 ZSkpIHsKKyAgICAgICAgICAgIHJlcG9ydFByb3RvY29sRXJyb3IoSW52YWxpZFJlcXVlc3QsIEFT Q0lJTGl0ZXJhbCgiJ2lkJyBwcm9wZXJ0eSB3YXMgbm90IGZvdW5kIikpOworICAgICAgICAgICAg c2VuZFBlbmRpbmdFcnJvcnMoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisg ICAgICAgIGlmICghcmVxdWVzdElkVmFsdWUtPmFzSW50ZWdlcihyZXF1ZXN0SWQpKSB7CisgICAg ICAgICAgICByZXBvcnRQcm90b2NvbEVycm9yKEludmFsaWRSZXF1ZXN0LCBBU0NJSUxpdGVyYWwo IlRoZSB0eXBlIG9mICdpZCcgcHJvcGVydHkgbXVzdCBiZSBpbnRlZ2VyIikpOworICAgICAgICAg ICAgc2VuZFBlbmRpbmdFcnJvcnMoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQog ICAgIH0KIAotICAgIFN0cmluZyBkb21haW4gPSBkb21haW5BbmRNZXRob2RbMF07Ci0gICAgU3Vw cGxlbWVudGFsQmFja2VuZERpc3BhdGNoZXIqIGRvbWFpbkRpc3BhdGNoZXIgPSBtX2Rpc3BhdGNo ZXJzLmdldChkb21haW4pOwotICAgIGlmICghZG9tYWluRGlzcGF0Y2hlcikgewotICAgICAgICBy ZXBvcnRQcm90b2NvbEVycm9yKE1ldGhvZE5vdEZvdW5kLCAiJyIgKyBkb21haW4gKyAiJyBkb21h aW4gd2FzIG5vdCBmb3VuZCIpOwotICAgICAgICBzZW5kUGVuZGluZ0Vycm9ycygpOwotICAgICAg ICByZXR1cm47CisgICAgeworICAgICAgICAvLyBXZSBjb3VsZCBiZSBjYWxsZWQgcmUtZW50cmFu dGx5IGZyb20gYSBuZXN0ZWQgcnVuIGxvb3AsIHNvIHJlc3RvcmUgdGhlIHByZXZpb3VzIGlkLgor ICAgICAgICBUZW1wb3JhcnlDaGFuZ2U8T3B0aW9uYWw8bG9uZz4+IHNjb3BlZFJlcXVlc3RJZCht X2N1cnJlbnRSZXF1ZXN0SWQsIHJlcXVlc3RJZCk7CisKKyAgICAgICAgUmVmUHRyPEluc3BlY3Rv clZhbHVlPiBtZXRob2RWYWx1ZTsKKyAgICAgICAgaWYgKCFtZXNzYWdlT2JqZWN0LT5nZXRWYWx1 ZShBU0NJSUxpdGVyYWwoIm1ldGhvZCIpLCBtZXRob2RWYWx1ZSkpIHsKKyAgICAgICAgICAgIHJl cG9ydFByb3RvY29sRXJyb3IoSW52YWxpZFJlcXVlc3QsIEFTQ0lJTGl0ZXJhbCgiJ21ldGhvZCcg cHJvcGVydHkgd2Fzbid0IGZvdW5kIikpOworICAgICAgICAgICAgc2VuZFBlbmRpbmdFcnJvcnMo KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIFN0cmluZyBtZXRo b2RTdHJpbmc7CisgICAgICAgIGlmICghbWV0aG9kVmFsdWUtPmFzU3RyaW5nKG1ldGhvZFN0cmlu ZykpIHsKKyAgICAgICAgICAgIHJlcG9ydFByb3RvY29sRXJyb3IoSW52YWxpZFJlcXVlc3QsIEFT Q0lJTGl0ZXJhbCgiVGhlIHR5cGUgb2YgJ21ldGhvZCcgcHJvcGVydHkgbXVzdCBiZSBzdHJpbmci KSk7CisgICAgICAgICAgICBzZW5kUGVuZGluZ0Vycm9ycygpOworICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB9CisKKyAgICAgICAgVmVjdG9yPFN0cmluZz4gZG9tYWluQW5kTWV0aG9kOwor ICAgICAgICBtZXRob2RTdHJpbmcuc3BsaXQoJy4nLCB0cnVlLCBkb21haW5BbmRNZXRob2QpOwor ICAgICAgICBpZiAoZG9tYWluQW5kTWV0aG9kLnNpemUoKSAhPSAyIHx8ICFkb21haW5BbmRNZXRo b2RbMF0ubGVuZ3RoKCkgfHwgIWRvbWFpbkFuZE1ldGhvZFsxXS5sZW5ndGgoKSkgeworICAgICAg ICAgICAgcmVwb3J0UHJvdG9jb2xFcnJvcihJbnZhbGlkUmVxdWVzdCwgQVNDSUlMaXRlcmFsKCJU aGUgJ21ldGhvZCcgcHJvcGVydHkgd2FzIGZvcm1hdHRlZCBpbmNvcnJlY3RseS4gSXQgc2hvdWxk IGJlICdEb21haW4ubWV0aG9kJyIpKTsKKyAgICAgICAgICAgIHNlbmRQZW5kaW5nRXJyb3JzKCk7 CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBTdHJpbmcgZG9tYWlu ID0gZG9tYWluQW5kTWV0aG9kWzBdOworICAgICAgICBTdXBwbGVtZW50YWxCYWNrZW5kRGlzcGF0 Y2hlciogZG9tYWluRGlzcGF0Y2hlciA9IG1fZGlzcGF0Y2hlcnMuZ2V0KGRvbWFpbik7CisgICAg ICAgIGlmICghZG9tYWluRGlzcGF0Y2hlcikgeworICAgICAgICAgICAgcmVwb3J0UHJvdG9jb2xF cnJvcihNZXRob2ROb3RGb3VuZCwgIiciICsgZG9tYWluICsgIicgZG9tYWluIHdhcyBub3QgZm91 bmQiKTsKKyAgICAgICAgICAgIHNlbmRQZW5kaW5nRXJyb3JzKCk7CisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIH0KKworICAgICAgICBTdHJpbmcgbWV0aG9kID0gZG9tYWluQW5kTWV0aG9k WzFdOworICAgICAgICBkb21haW5EaXNwYXRjaGVyLT5kaXNwYXRjaChyZXF1ZXN0SWQsIG1ldGhv ZCwgbWVzc2FnZU9iamVjdC5yZWxlYXNlTm9uTnVsbCgpKTsKKworICAgICAgICBpZiAobV9wcm90 b2NvbEVycm9ycy5zaXplKCkpCisgICAgICAgICAgICBzZW5kUGVuZGluZ0Vycm9ycygpOwogICAg IH0KLQotICAgIFN0cmluZyBtZXRob2QgPSBkb21haW5BbmRNZXRob2RbMV07Ci0gICAgZG9tYWlu RGlzcGF0Y2hlci0+ZGlzcGF0Y2gocmVxdWVzdElkLCBtZXRob2QsIG1lc3NhZ2VPYmplY3QucmVs ZWFzZU5vbk51bGwoKSk7Ci0KLSAgICBpZiAobV9wcm90b2NvbEVycm9ycy5zaXplKCkpCi0gICAg ICAgIHNlbmRQZW5kaW5nRXJyb3JzKCk7CiB9CiAKIHZvaWQgQmFja2VuZERpc3BhdGNoZXI6OnNl bmRSZXNwb25zZShsb25nIHJlcXVlc3RJZCwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4mJiByZXN1 bHQpCg==