Changeset 211143 in webkit

Timestamp:

Jan 25, 2017, 8:45:58 AM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r211052. rdar://problem/29857388

Location:

branches/safari-603-branch/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Page.cpp (modified) (2 diffs)
• WebCore/page/Page.h (modified) (1 diff)
• WebCore/plugins/PluginInfoProvider.cpp (modified) (2 diffs)
• WebCore/plugins/PluginInfoProvider.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h (modified) (2 diffs)
• WebKit2/WebProcess/WebProcess.cpp (modified) (1 diff)

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

@@ +1 @@
+2017-01-25  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211052. rdar://problem/29857388
+
+    2017-01-20  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=167268
+            rdar://problem/29857388
+
+            Reviewed by Sam Weinig.
+
+            * page/Page.cpp:
+            (WebCore::Page::refreshPlugins):
+            Call PluginInfoProvider::refresh instead.
+
+            (WebCore::Page::clearPluginData):
+            Add new setter.
+
+            * page/Page.h:
+            Declare new members.
+
+            * plugins/PluginInfoProvider.cpp:
+            (WebCore::PluginInfoProvider::refresh):
+            Put the logic to clear plug-in data and reload frames here.
+
+            * plugins/PluginInfoProvider.h:
+            Add new members.
+
 2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
 

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

@@ -539 +539 @@
     Vector<Ref<Frame>> framesNeedingReload;
 
-    for (auto& page : *allPages) {
+    for (auto& page : *allPages)
         pluginInfoProviders.add(&page->pluginInfoProvider());
-        page->m_pluginData = nullptr;
-
-        if (!reload)
-            continue;
-        
-        for (Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
-            if (frame->loader().subframeLoader().containsPlugins())
-                framesNeedingReload.append(*frame);
-        }
-    }
 
     for (auto& pluginInfoProvider : pluginInfoProviders)
-        pluginInfoProvider->refreshPlugins();
-
-    for (auto& frame : framesNeedingReload)
-        frame->loader().reload();
+        pluginInfoProvider->refresh(reload);
 }
 
@@ -564 +551 @@
         m_pluginData = PluginData::create(*this);
     return *m_pluginData;
+}
+
+void Page::clearPluginData()
+{
+    m_pluginData = nullptr;
 }
 

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

@@ -167 +167 @@
     static void refreshPlugins(bool reload);
     WEBCORE_EXPORT PluginData& pluginData();
+    void clearPluginData();
 
     WEBCORE_EXPORT void setCanStartMedia(bool);

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

@@ -27 +27 @@
 #include "PluginInfoProvider.h"
 
+#include "MainFrame.h"
+#include "Page.h"
+#include "SubframeLoader.h"
+
 namespace WebCore {
 
@@ -32 +36 @@
 {
     ASSERT(m_pages.isEmpty());
+}
+
+void PluginInfoProvider::refresh(bool reloadPages)
+{
+    Vector<Ref<Frame>> framesNeedingReload;
+
+    for (auto& page : m_pages) {
+        page->clearPluginData();
+
+        if (!reloadPages)
+            continue;
+
+        for (Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+            if (frame->loader().subframeLoader().containsPlugins())
+                framesNeedingReload.append(*frame);
+        }
+    }
+
+    for (auto& frame : framesNeedingReload)
+        frame->loader().reload();
 }
 

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

@@ -35 +35 @@
     virtual ~PluginInfoProvider();
 
-    void refreshPlugins(bool reloadPages);
+    void refresh(bool reloadPages);
 
     void addPage(Page&);
     void removePage(Page&);
 
-    virtual void refreshPlugins() = 0;
     virtual void getPluginInfo(Page&, Vector<PluginInfo>&) = 0;
     virtual void getWebVisiblePluginInfo(Page&, Vector<PluginInfo>&) = 0;
 
 private:
+    virtual void refreshPlugins() = 0;
+
     HashSet<Page*> m_pages;
 };

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

@@ +1 @@
+2017-01-25  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211052. rdar://problem/29857388
+
+    2017-01-20  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=167268
+            rdar://problem/29857388
+
+            Reviewed by Sam Weinig.
+
+            * WebProcess/Plugins/WebPluginInfoProvider.h:
+            Make refreshPlugins() private.
+
+            * WebProcess/WebProcess.cpp:
+            (WebKit::WebProcess::refreshPlugins):
+            Call the newly added PluginInfoProvider::refresh().
+
 2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h

@@ -43 +43 @@
 #endif
 
-    void refreshPlugins() override;
-
 private:
     WebPluginInfoProvider();
@@ -50 +48 @@
     void getPluginInfo(WebCore::Page&, Vector<WebCore::PluginInfo>&) override;
     void getWebVisiblePluginInfo(WebCore::Page&, Vector<WebCore::PluginInfo>&) override;
+    void refreshPlugins() override;
 
 #if ENABLE(NETSCAPE_PLUGIN_API)

branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -922 +922 @@
 {
 #if ENABLE(NETSCAPE_PLUGIN_API)
-    WebPluginInfoProvider::singleton().refreshPlugins();
+    WebPluginInfoProvider::singleton().refresh(false);
 #endif
 }