92564 2012-07-27 17:24:03 -0700 Reset the set of "seen" plugins when the main frame load is committed. 2012-07-27 17:41:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble abarth japhet jochen webkit.review.bot oldest_to_newest 681264 0 jer.noble 2012-07-27 17:24:03 -0700 Reset the set of "seen" plugins when the main frame load is committed. 681265 1 155095 jer.noble 2012-07-27 17:27:52 -0700 Created attachment 155095 Patch 681270 2 155097 jer.noble 2012-07-27 17:31:03 -0700 Created attachment 155097 Patch Fixed compile error. 681275 3 155097 andersca 2012-07-27 17:33:15 -0700 Comment on attachment 155097 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155097&action=review > Source/WebCore/loader/FrameLoader.cpp:3188 > + if (isLoadingMainFrame()) I think this check should be if (m_frame->page() && m_frame == m_frame->page()->mainFrame()) 681282 4 jer.noble 2012-07-27 17:36:54 -0700 (In reply to comment #3) > (From update of attachment 155097 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=155097&action=review > > > Source/WebCore/loader/FrameLoader.cpp:3188 > > + if (isLoadingMainFrame()) > > I think this check should be > > if (m_frame->page() && m_frame == m_frame->page()->mainFrame()) The isLoadingMainFrame() function should do basically that: bool FrameLoader::isLoadingMainFrame() const { Page* page = m_frame->page(); return page && m_frame == page->mainFrame(); } 681285 5 jer.noble 2012-07-27 17:41:32 -0700 Committed r123942: <http://trac.webkit.org/changeset/123942> 155095 2012-07-27 17:27:52 -0700 2012-07-27 17:31:01 -0700 Patch bug-92564-20120727172739.patch text/plain 2707 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzOTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFhMGFlZjZiZmUzNDg1 ODIwZjQ1MTI3N2M4YmM3MmVjNjIwMGM5MS4uMmQ5YmVkNjQ3Y2VkYjljM2JjOWMwZGZkM2VlNTg3 OTc2NjhkZmU4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEyLTA3LTI3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFJlc2V0IHRoZSBzZXQgb2Yg InNlZW4iIHBsdWdpbnMgd2hlbiB0aGUgbWFpbiBmcmFtZSBsb2FkIGlzIGNvbW1pdHRlZC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNTY0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmVjYXVzZSB0aGUg UGFnZSBvYmplY3QgaXMgcmUtdXNlZCBhY3Jvc3MgbmF2aWdhdGlvbiBhbmQgcmVsb2FkLCByZXNl dCB0aGUgbGlzdAorICAgICAgICBvZiBzZWVuIHBsdWdpbnMgd2hlbiB0aGUgbWFpbiBmcmFtZSBs b2FkIGNvbW1pdHMuIFRoaXMgZ2l2ZXMgYSBnb29kIGJhc2VsaW5lIHRvCisgICAgICAgIGNvbXBh cmUgYWdhaW5zdCB0aGUgbnVtYmVyIG9mIHBhZ2VzIGxvYWRlZC4KKworICAgICAgICBObyBuZXcg dGVzdHM7IHRoZSAic2VlbiIgcGx1Z2luIGxpc3QgaXMgZm9yIGRpYWdub3N0aWMgcHVycG9zZXMg b25seS4KKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKToKKyAgICAgICAgKiBwYWdl L1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6cmVzZXRTZWVuUGx1Z2lucyk6Cisg ICAgICAgICogcGFnZS9QYWdlLmg6CisKKzIwMTItMDctMjcgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKICAgICAgICAgQWRkIGRpYWdub3N0aWMgbG9nZ2luZyBmb3IgcGx1Z2lu cy1wZXItcGFnZS4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTkyNTM4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDkyNTA0 MWNjNTZmNTZlZjA4Zjg5NWUwZDA4MDNlY2VlZjg2NGQxYmMuLjFlZmJjZGY1ZmE5YWZhZjc2NWM2 ZmJiNDI0MWNlNjZmNjAwOWI5MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cApAQCAtMzE4NSw2ICszMTg1LDkgQEAgdm9pZCBGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hEaWRDb21t aXRMb2FkKCkKIAogICAgIG1fY2xpZW50LT5kaXNwYXRjaERpZENvbW1pdExvYWQoKTsKIAorICAg IGlmIChpc0xvYWRpbmdNYWluRnJhbWUoKSkKKyAgICAgICAgbV9mcmFtZS0+cGFnZSgpLT5yZXNl dFNlZW5QbHVnaW5zKCk7CisKICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZENvbW1p dExvYWQobV9mcmFtZSwgbV9kb2N1bWVudExvYWRlci5nZXQoKSk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwCmluZGV4IDM5NTc2ZTEyOTk3ZDBiOWRiNTFjMWY5OGQyOTIyMTVhMjNjZGU2MjMuLjQzYTkz NDBhZWQxOGIyMjA1NTYwMGU4MWVkOTg3YTJmMDVlYTViZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApA QCAtMTE3Myw2ICsxMTczLDExIEBAIHZvaWQgUGFnZTo6c2F3UGx1Z2luKGNvbnN0IFN0cmluZyYg c2VydmljZVR5cGUpCiAgICAgbV9zZWVuUGx1Z2lucy5hZGQoc2VydmljZVR5cGUpOwogfQogCit2 b2lkIFBhZ2U6OnJlc2V0U2VlblBsdWdpbnMoKQoreworICAgIG1fc2VlblBsdWdpbnMuY2xlYXIo KQorfQorCiBQYWdlOjpQYWdlQ2xpZW50czo6UGFnZUNsaWVudHMoKQogICAgIDogYWx0ZXJuYXRp dmVUZXh0Q2xpZW50KDApCiAgICAgLCBjaHJvbWVDbGllbnQoMCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKaW5kZXgg YmU1YmQ3MTkwZmE0ODI1ZjMwMWQ1YzhlYTdjY2JlNmFjODFjZDIxZS4uZjhiMDI2ZjczY2Q4NTAw ODg0YzcyZGE0YjYyOWRlMTEzMDM4MGVlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKQEAgLTM1MSw2ICszNTEs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgaGFzU2VlblBsdWdpbihjb25z dCBTdHJpbmcmIHNlcnZpY2VUeXBlKSBjb25zdDsKICAgICAgICAgYm9vbCBoYXNTZWVuQW55UGx1 Z2luKCkgY29uc3Q7CiAgICAgICAgIHZvaWQgc2F3UGx1Z2luKGNvbnN0IFN0cmluZyYgc2Vydmlj ZVR5cGUpOworICAgICAgICB2b2lkIHJlc2V0U2VlblBsdWdpbnMoKTsKIAogICAgIHByaXZhdGU6 CiAgICAgICAgIHZvaWQgaW5pdEdyb3VwKCk7Cg== 155097 2012-07-27 17:31:03 -0700 2012-07-27 17:33:15 -0700 Patch bug-92564-20120727173050.patch text/plain 2708 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzOTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFhMGFlZjZiZmUzNDg1 ODIwZjQ1MTI3N2M4YmM3MmVjNjIwMGM5MS4uMmQ5YmVkNjQ3Y2VkYjljM2JjOWMwZGZkM2VlNTg3 OTc2NjhkZmU4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEyLTA3LTI3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFJlc2V0IHRoZSBzZXQgb2Yg InNlZW4iIHBsdWdpbnMgd2hlbiB0aGUgbWFpbiBmcmFtZSBsb2FkIGlzIGNvbW1pdHRlZC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNTY0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmVjYXVzZSB0aGUg UGFnZSBvYmplY3QgaXMgcmUtdXNlZCBhY3Jvc3MgbmF2aWdhdGlvbiBhbmQgcmVsb2FkLCByZXNl dCB0aGUgbGlzdAorICAgICAgICBvZiBzZWVuIHBsdWdpbnMgd2hlbiB0aGUgbWFpbiBmcmFtZSBs b2FkIGNvbW1pdHMuIFRoaXMgZ2l2ZXMgYSBnb29kIGJhc2VsaW5lIHRvCisgICAgICAgIGNvbXBh cmUgYWdhaW5zdCB0aGUgbnVtYmVyIG9mIHBhZ2VzIGxvYWRlZC4KKworICAgICAgICBObyBuZXcg dGVzdHM7IHRoZSAic2VlbiIgcGx1Z2luIGxpc3QgaXMgZm9yIGRpYWdub3N0aWMgcHVycG9zZXMg b25seS4KKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKToKKyAgICAgICAgKiBwYWdl L1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6cmVzZXRTZWVuUGx1Z2lucyk6Cisg ICAgICAgICogcGFnZS9QYWdlLmg6CisKKzIwMTItMDctMjcgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKICAgICAgICAgQWRkIGRpYWdub3N0aWMgbG9nZ2luZyBmb3IgcGx1Z2lu cy1wZXItcGFnZS4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTkyNTM4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDkyNTA0 MWNjNTZmNTZlZjA4Zjg5NWUwZDA4MDNlY2VlZjg2NGQxYmMuLjFlZmJjZGY1ZmE5YWZhZjc2NWM2 ZmJiNDI0MWNlNjZmNjAwOWI5MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cApAQCAtMzE4NSw2ICszMTg1LDkgQEAgdm9pZCBGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hEaWRDb21t aXRMb2FkKCkKIAogICAgIG1fY2xpZW50LT5kaXNwYXRjaERpZENvbW1pdExvYWQoKTsKIAorICAg IGlmIChpc0xvYWRpbmdNYWluRnJhbWUoKSkKKyAgICAgICAgbV9mcmFtZS0+cGFnZSgpLT5yZXNl dFNlZW5QbHVnaW5zKCk7CisKICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZENvbW1p dExvYWQobV9mcmFtZSwgbV9kb2N1bWVudExvYWRlci5nZXQoKSk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwCmluZGV4IDM5NTc2ZTEyOTk3ZDBiOWRiNTFjMWY5OGQyOTIyMTVhMjNjZGU2MjMuLmYxMDY3 N2MyM2Q0MzFhZGY3YWFlMzI3ZDQwMjc1OGY0MWZkODQ3MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApA QCAtMTE3Myw2ICsxMTczLDExIEBAIHZvaWQgUGFnZTo6c2F3UGx1Z2luKGNvbnN0IFN0cmluZyYg c2VydmljZVR5cGUpCiAgICAgbV9zZWVuUGx1Z2lucy5hZGQoc2VydmljZVR5cGUpOwogfQogCit2 b2lkIFBhZ2U6OnJlc2V0U2VlblBsdWdpbnMoKQoreworICAgIG1fc2VlblBsdWdpbnMuY2xlYXIo KTsKK30KKwogUGFnZTo6UGFnZUNsaWVudHM6OlBhZ2VDbGllbnRzKCkKICAgICA6IGFsdGVybmF0 aXZlVGV4dENsaWVudCgwKQogICAgICwgY2hyb21lQ2xpZW50KDApCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1BhZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4 IGJlNWJkNzE5MGZhNDgyNWYzMDFkNWM4ZWE3Y2NiZTZhYzgxY2QyMWUuLmY4YjAyNmY3M2NkODUw MDg4NGM3MmRhNGI2MjlkZTExMzAzODBlZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC0zNTEsNiArMzUx LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIGhhc1NlZW5QbHVnaW4oY29u c3QgU3RyaW5nJiBzZXJ2aWNlVHlwZSkgY29uc3Q7CiAgICAgICAgIGJvb2wgaGFzU2VlbkFueVBs dWdpbigpIGNvbnN0OwogICAgICAgICB2b2lkIHNhd1BsdWdpbihjb25zdCBTdHJpbmcmIHNlcnZp Y2VUeXBlKTsKKyAgICAgICAgdm9pZCByZXNldFNlZW5QbHVnaW5zKCk7CiAKICAgICBwcml2YXRl OgogICAgICAgICB2b2lkIGluaXRHcm91cCgpOwo=