Changeset 211144 in webkit

Timestamp:

Jan 25, 2017, 8:46:02 AM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r211114. rdar://problem/29857388

Location:

branches/safari-603-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Page.cpp (modified) (1 diff)
• plugins/PluginInfoProvider.cpp (modified) (2 diffs)

branches/safari-603-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-25  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211114. rdar://problem/29857388
+
+    2017-01-24  Anders Carlsson  <andersca@apple.com>
+
+            When Safari reloads pages with Flash objects after Flash is installed, placeholders don't paint (but do work!)
+            https://bugs.webkit.org/show_bug.cgi?id=167391
+            rdar://problem/29857388
+
+            Reviewed by Sam Weinig.
+
+            * page/Page.cpp:
+            (WebCore::Page::refreshPlugins):
+            Remove an unused variable.
+
+            * plugins/PluginInfoProvider.cpp:
+            (WebCore::PluginInfoProvider::refresh):
+            Make sure to call refreshPlugins(). Instead of reloading subframes, just reload all the main frames with
+            subframes that contain plug-ins.
+
 2017-01-25  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Source/WebCore/page/Page.cpp

@@ -537 +537 @@
     HashSet<PluginInfoProvider*> pluginInfoProviders;
 
-    Vector<Ref<Frame>> framesNeedingReload;
-
     for (auto& page : *allPages)
         pluginInfoProviders.add(&page->pluginInfoProvider());

branches/safari-603-branch/Source/WebCore/plugins/PluginInfoProvider.cpp

@@ -40 +40 @@
 void PluginInfoProvider::refresh(bool reloadPages)
 {
-    Vector<Ref<Frame>> framesNeedingReload;
+    refreshPlugins();
+
+    Vector<Ref<MainFrame>> framesNeedingReload;
 
     for (auto& page : m_pages) {
@@ -50 +52 @@
         for (Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
             if (frame->loader().subframeLoader().containsPlugins())
-                framesNeedingReload.append(*frame);
+                framesNeedingReload.append(page->mainFrame());
         }
     }