Title: [124939] branches/safari-536.26-branch/Source/WebCore
- Revision
- 124939
- Author
- [email protected]
- Date
- 2012-08-07 16:37:43 -0700 (Tue, 07 Aug 2012)
Log Message
Merged r123942. <rdar://problem/11979232>
Modified Paths
Diff
Modified: branches/safari-536.26-branch/Source/WebCore/ChangeLog (124938 => 124939)
--- branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-07 23:31:50 UTC (rev 124938)
+++ branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-07 23:37:43 UTC (rev 124939)
@@ -1,5 +1,28 @@
2012-08-06 Lucas Forschler <[email protected]>
+ Merge 123942
+
+ 2012-07-27 Jer Noble <[email protected]>
+
+ Reset the set of "seen" plugins when the main frame load is committed.
+ https://bugs.webkit.org/show_bug.cgi?id=92564
+
+ Reviewed by Anders Carlsson.
+
+ Because the Page object is re-used across navigation and reload, reset the list
+ of seen plugins when the main frame load commits. This gives a good baseline to
+ compare against the number of pages loaded.
+
+ No new tests; the "seen" plugin list is for diagnostic purposes only.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::dispatchDidCommitLoad):
+ * page/Page.cpp:
+ (WebCore::Page::resetSeenPlugins):
+ * page/Page.h:
+
+2012-08-06 Lucas Forschler <[email protected]>
+
Merge 123930
2012-07-27 Jer Noble <[email protected]>
Modified: branches/safari-536.26-branch/Source/WebCore/loader/FrameLoader.cpp (124938 => 124939)
--- branches/safari-536.26-branch/Source/WebCore/loader/FrameLoader.cpp 2012-08-07 23:31:50 UTC (rev 124938)
+++ branches/safari-536.26-branch/Source/WebCore/loader/FrameLoader.cpp 2012-08-07 23:37:43 UTC (rev 124939)
@@ -3165,6 +3165,9 @@
m_client->dispatchDidCommitLoad();
+ if (isLoadingMainFrame())
+ m_frame->page()->resetSeenPlugins();
+
InspectorInstrumentation::didCommitLoad(m_frame, m_documentLoader.get());
}
Modified: branches/safari-536.26-branch/Source/WebCore/page/Page.cpp (124938 => 124939)
--- branches/safari-536.26-branch/Source/WebCore/page/Page.cpp 2012-08-07 23:31:50 UTC (rev 124938)
+++ branches/safari-536.26-branch/Source/WebCore/page/Page.cpp 2012-08-07 23:37:43 UTC (rev 124939)
@@ -1167,6 +1167,11 @@
m_seenPlugins.add(serviceType);
}
+void Page::resetSeenPlugins()
+{
+ m_seenPlugins.clear();
+}
+
Page::PageClients::PageClients()
: alternativeTextClient(0)
, chromeClient(0)
Modified: branches/safari-536.26-branch/Source/WebCore/page/Page.h (124938 => 124939)
--- branches/safari-536.26-branch/Source/WebCore/page/Page.h 2012-08-07 23:31:50 UTC (rev 124938)
+++ branches/safari-536.26-branch/Source/WebCore/page/Page.h 2012-08-07 23:37:43 UTC (rev 124939)
@@ -354,6 +354,7 @@
bool hasSeenPlugin(const String& serviceType) const;
bool hasSeenAnyPlugin() const;
void sawPlugin(const String& serviceType);
+ void resetSeenPlugins();
private:
void initGroup();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
