76548 2012-01-18 09:18:49 -0800 Web Inspector: there should be a way to set HTML for given frame. 2012-01-18 10:59:16 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck kbalazs keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 537911 0 pfeldman 2012-01-18 09:18:49 -0800 Patch to follow. 537923 1 122946 pfeldman 2012-01-18 09:32:53 -0800 Created attachment 122946 Patch 537925 2 122946 yurys 2012-01-18 09:36:54 -0800 Comment on attachment 122946 Patch Can we have a test for this? 537944 3 122946 timothy 2012-01-18 09:49:44 -0800 Comment on attachment 122946 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122946&action=review > Source/WebCore/inspector/front-end/DOMAgent.js:-1144 > - var doc = this._domAgent._documentURLToDocument[resource.url]; Do you still need the _documentURLToDocument map? I feel that map is flawed in the case where multiple frames with the same URL exist. And this patch fixes that issue by using frameId. Who still needs _documentURLToDocument? 537947 4 pfeldman 2012-01-18 09:54:03 -0800 (In reply to comment #3) > (From update of attachment 122946 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=122946&action=review > > > Source/WebCore/inspector/front-end/DOMAgent.js:-1144 > > - var doc = this._domAgent._documentURLToDocument[resource.url]; > > Do you still need the _documentURLToDocument map? I feel that map is flawed in the case where multiple frames with the same URL exist. And this patch fixes that issue by using frameId. Who still needs _documentURLToDocument? Good point. Will nuke it prior to landing. 537949 5 timothy 2012-01-18 09:55:44 -0800 Great! 537952 6 pfeldman 2012-01-18 09:57:01 -0800 Committed r105288: <http://trac.webkit.org/changeset/105288> 537979 7 kbalazs 2012-01-18 10:35:57 -0800 Seems like it makes Qt regress again: http://build.webkit.sed.hu/results/x86-64%20Linux%20Qt%20Release/r105288%20(32590)/inspector/elements/set-html-via-resource-pretty-diff.html 538001 8 pfeldman 2012-01-18 10:59:16 -0800 (In reply to comment #7) > Seems like it makes Qt regress again: http://build.webkit.sed.hu/results/x86-64%20Linux%20Qt%20Release/r105288%20(32590)/inspector/elements/set-html-via-resource-pretty-diff.html Fixed it, sorry about that. 122946 2012-01-18 09:32:53 -0800 2012-01-18 09:49:44 -0800 Patch bug-76548-20120118213251.patch text/plain 6063 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1Mjg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjRjZTk0YmUyNWU1MDI5 YjNiNjEzZGI5MjRiNGIzODJmNDJiNTI0Yi4uZTE1NDVjYmQyYWU4NTllMDI4MWNiZTliMTZkNGMw N2FlMTcwOTY4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTE4ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiB0aGVyZSBzaG91bGQgYmUgYSB3YXkgdG8gc2V0IEhUTUwgZm9yIGdpdmVuIGZyYW1lLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY1NDgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6c2V0RG9jdW1lbnRDb250 ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50Lmg6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5ET01Nb2RlbFJlc291cmNlQmluZGluZy5wcm90b3R5cGUuc2V0Q29udGVudC5jYWxsYmFja1dy YXBwZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU1vZGVsUmVzb3VyY2VCaW5kaW5nLnBy b3RvdHlwZS5zZXRDb250ZW50KToKKwogMjAxMi0wMS0xOCAgQW5kcmV5IEtvc3lha292ICA8Y2Fz ZXFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG9taXQgY29tcHJlc3Np b24gZmllbGQgaW4gSEFSIGVudHJpZXMgZm9yIHJlc291cmNlcyBjb21pbmcgZnJvbSBjYWNoZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IDFiNDE1NDY1ZTcwNGRh MzkyYjA1YzhkN2FlMTQzMmUyNzZmN2JjZjkuLjEyNmQ5ZWU1ZWNiMmEwYjZhYTZjZGMwMjlhYWVi MzIxYWJlZmYyOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAg LTI5OSw2ICsyOTksMTUgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJyZXN1bHQi LCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiOiAiU2VhcmNoUmVzdWx0IiB9LCAi ZGVzY3JpcHRpb24iOiAiTGlzdCBvZiBzZWFyY2ggcmVzdWx0cy4iIH0KICAgICAgICAgICAgICAg ICBdLAogICAgICAgICAgICAgICAgICJoaWRkZW4iOiB0cnVlCisgICAgICAgICAgICB9LAorICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgICJuYW1lIjogInNldERvY3VtZW50Q29udGVudCIs CisgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIlNldHMgZ2l2ZW4gbWFya3VwIGFzIHRo ZSBkb2N1bWVudCdzIEhUTUwuIiwKKyAgICAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsKKyAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJmcmFtZUlkIiwgIiRyZWYiOiAiTmV0d29yay5G cmFtZUlkIiwgImRlc2NyaXB0aW9uIjogIkZyYW1lIGlkIHRvIHNldCBIVE1MIGZvci4iIH0sCisg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaHRtbCIsICJ0eXBlIjogInN0cmluZyIsICJk ZXNjcmlwdGlvbiI6ICJIVE1MIGNvbnRlbnQgdG8gc2V0LiIgIH0KKyAgICAgICAgICAgICAgICBd LAorICAgICAgICAgICAgICAgICJoaWRkZW4iOiB0cnVlCiAgICAgICAgICAgICB9CiAgICAgICAg IF0sCiAgICAgICAgICJldmVudHMiOiBbCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JQYWdlQWdlbnQuY3BwCmluZGV4IDcxMmZhNTFmYTgyN2U3MDY2ZmUwMjExZGZhNDI4 YTAzYmIyODg1ZDIuLmU2OGNmOGY2NjliY2YxYmMxNWIwMjFmMzg3ZTlkZTk5M2Q5YjQxZDcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCkBA IC00Miw2ICs0Miw3IEBACiAjaW5jbHVkZSAiQ29udGVudFNlYXJjaFV0aWxzLmgiCiAjaW5jbHVk ZSAiQ29va2llLmgiCiAjaW5jbHVkZSAiQ29va2llSmFyLmgiCisjaW5jbHVkZSAiRE9NRWRpdG9y LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJEb2N1bWVudExvYWRlci5oIgog I2luY2x1ZGUgIkZyYW1lLmgiCkBAIC01NjIsNiArNTYzLDIxIEBAIHZvaWQgSW5zcGVjdG9yUGFn ZUFnZW50OjpzZWFyY2hJblJlc291cmNlcyhFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgdGV4 dCwgY29uCiAgICAgcmVzdWx0cyA9IHNlYXJjaFJlc3VsdHM7CiB9CiAKK3ZvaWQgSW5zcGVjdG9y UGFnZUFnZW50OjpzZXREb2N1bWVudENvbnRlbnQoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW5nLCBj b25zdCBTdHJpbmcmIGZyYW1lSWQsIGNvbnN0IFN0cmluZyYgaHRtbCkKK3sKKyAgICBGcmFtZSog ZnJhbWUgPSBhc3NlcnRGcmFtZShlcnJvclN0cmluZywgZnJhbWVJZCk7CisgICAgaWYgKCFmcmFt ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gZnJhbWUtPmRv Y3VtZW50KCk7CisgICAgaWYgKCFkb2N1bWVudCkgeworICAgICAgICAqZXJyb3JTdHJpbmcgPSAi Tm8gRG9jdW1lbnQgaW5zdGFuY2UgdG8gc2V0IEhUTUwgZm9yIjsKKyAgICAgICAgcmV0dXJuOwor ICAgIH0KKyAgICBET01FZGl0b3IgZWRpdG9yKGRvY3VtZW50KTsKKyAgICBlZGl0b3IucGF0Y2hE b2N1bWVudChodG1sKTsKK30KKwogdm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmRpZENsZWFyV2lu ZG93T2JqZWN0SW5Xb3JsZChGcmFtZSogZnJhbWUsIERPTVdyYXBwZXJXb3JsZCogd29ybGQpCiB7 CiAgICAgaWYgKHdvcmxkICE9IG1haW5UaHJlYWROb3JtYWxXb3JsZCgpKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5oCmluZGV4IDc5ZDIyZTViYzFlODY5 OWQzM2EzYjc3OGZmMTNiOWI0YTVkZDUwNzIuLmE2N2E4MDcwNjEwOTBhMTk1MWVjYjIwYTZkNTcz OWRkZjQyNzdiNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JQYWdlQWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFn ZUFnZW50LmgKQEAgLTk5LDYgKzk5LDcgQEAgcHVibGljOgogICAgIHZvaWQgZ2V0UmVzb3VyY2VD b250ZW50KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBmcmFtZUlkLCBjb25zdCBTdHJpbmcm IHVybCwgU3RyaW5nKiBjb250ZW50LCBib29sKiBiYXNlNjRFbmNvZGVkKTsKICAgICB2b2lkIHNl YXJjaEluUmVzb3VyY2UoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIGZyYW1lSWQsIGNvbnN0 IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHF1ZXJ5LCBjb25zdCBib29sKiBjb25zdCBvcHRp b25hbENhc2VTZW5zaXRpdmUsIGNvbnN0IGJvb2wqIGNvbnN0IG9wdGlvbmFsSXNSZWdleCwgUmVm UHRyPEluc3BlY3RvckFycmF5PiYpOwogICAgIHZvaWQgc2VhcmNoSW5SZXNvdXJjZXMoRXJyb3JT dHJpbmcqLCBjb25zdCBTdHJpbmcmLCBjb25zdCBib29sKiBjb25zdCBjYXNlU2Vuc2l0aXZlLCBj b25zdCBib29sKiBjb25zdCBpc1JlZ2V4LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+Jik7CisgICAg dm9pZCBzZXREb2N1bWVudENvbnRlbnQoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIGZyYW1l SWQsIGNvbnN0IFN0cmluZyYgaHRtbCk7CiAKICAgICAvLyBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b24gQVBJCiAgICAgdm9pZCBkaWRDbGVhcldpbmRvd09iamVjdEluV29ybGQoRnJhbWUqLCBET01X cmFwcGVyV29ybGQqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRE9NQWdlbnQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RP TUFnZW50LmpzCmluZGV4IGI3NjhlYjFhOWU1MTE3NDU1YTM3YzhlMmY2M2JhMzRmOTBmZTg5OTgu LjEzOWExNTZiMTJmYzU2Y2Y3NDRlNzFiZDdkM2Q4NDZmZDdkYTlkY2UgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcwpAQCAtMTEzMSw2ICsxMTMx LDEyIEBAIFdlYkluc3BlY3Rvci5ET01Nb2RlbFJlc291cmNlQmluZGluZyA9IGZ1bmN0aW9uKGRv bUFnZW50KQogV2ViSW5zcGVjdG9yLkRPTU1vZGVsUmVzb3VyY2VCaW5kaW5nLnByb3RvdHlwZSA9 IHsKICAgICBzZXRDb250ZW50OiBmdW5jdGlvbihyZXNvdXJjZSwgY29udGVudCwgbWFqb3JDaGFu Z2UsIHVzZXJDYWxsYmFjaykKICAgICB7CisgICAgICAgIHZhciBmcmFtZUlkID0gcmVzb3VyY2Uu ZnJhbWVJZDsKKyAgICAgICAgaWYgKCFmcmFtZUlkKQorICAgICAgICAgICAgcmV0dXJuOworCisg ICAgICAgIFBhZ2VBZ2VudC5zZXREb2N1bWVudENvbnRlbnQoZnJhbWVJZCwgY29udGVudCwgY2Fs bGJhY2tXcmFwcGVyKTsKKwogICAgICAgICBmdW5jdGlvbiBjYWxsYmFja1dyYXBwZXIoZXJyb3Ip CiAgICAgICAgIHsKICAgICAgICAgICAgIGlmIChtYWpvckNoYW5nZSkKQEAgLTExMzgsMzAgKzEx NDQsNiBAQCBXZWJJbnNwZWN0b3IuRE9NTW9kZWxSZXNvdXJjZUJpbmRpbmcucHJvdG90eXBlID0g ewogICAgICAgICAgICAgaWYgKHVzZXJDYWxsYmFjaykKICAgICAgICAgICAgICAgICB1c2VyQ2Fs bGJhY2soZXJyb3IpOwogICAgICAgICB9Ci0KLSAgICAgICAgZnVuY3Rpb24gc2V0T3V0ZXJIVE1M KHJlcG9ydEVycm9yKQotICAgICAgICB7Ci0gICAgICAgICAgICB2YXIgZG9jID0gdGhpcy5fZG9t QWdlbnQuX2RvY3VtZW50VVJMVG9Eb2N1bWVudFtyZXNvdXJjZS51cmxdOwotICAgICAgICAgICAg aWYgKGRvYykgewotICAgICAgICAgICAgICAgIERPTUFnZW50LnNldE91dGVySFRNTChkb2MuaWQs IGNvbnRlbnQsIGNhbGxiYWNrV3JhcHBlci5iaW5kKHRoaXMpKTsKLSAgICAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGlmIChyZXBvcnRFcnJvcikK LSAgICAgICAgICAgICAgICB1c2VyQ2FsbGJhY2soIk5vIGRvY3VtZW50IHdpdGggZ2l2ZW4gVVJM IGZvdW5kIik7Ci0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KLSAgICAKLSAg ICAgICAgdGhpcy5fZG9tQWdlbnQucmVxdWVzdERvY3VtZW50KHdpdGhEb2N1bWVudC5iaW5kKHRo aXMpKTsKLQotICAgICAgICBmdW5jdGlvbiB3aXRoRG9jdW1lbnQoZG9jKQotICAgICAgICB7Ci0g ICAgICAgICAgICBpZiAoc2V0T3V0ZXJIVE1MLmNhbGwodGhpcywgZmFsc2UpKQotICAgICAgICAg ICAgICAgIHJldHVybjsKLQotICAgICAgICAgICAgLy8gV2UgYXJlIGVkaXRpbmcgb25lIG9mIHRo ZSBpZnJhbWVzLCBidXQgaXQgaGFzIG5vdCB5ZXQgYmVlbiBsb2FkZWQgaW4gdGhlIERPTSB0cmVl LgotICAgICAgICAgICAgLy8gTG9hZCBhbGwgaWZyYW1lIG5vZGVzIGhlcmUuCi0gICAgICAgICAg ICBET01BZ2VudC5xdWVyeVNlbGVjdG9yQWxsKGRvYy5pZCwgImlmcmFtZVtzcmNdIiwgc2V0T3V0 ZXJIVE1MLmJpbmQodGhpcywgdHJ1ZSkpOwotICAgICAgICB9CiAgICAgfSwKIAogICAgIGNhblNl dENvbnRlbnQ6IGZ1bmN0aW9uKCkK