Changeset 170743 in webkit

Timestamp:

Jul 2, 2014 8:31:05 PM (10 years ago)

Author:

roger_fong@apple.com

Message:

Improve handling of primary offscreen plugins.
​https://bugs.webkit.org/show_bug.cgi?id=134528.
<rdar://problem/17471864>

Reviewed by Dean Jackson.

• WebProcess/Plugins/PluginView.cpp:

Determine whether or not the plugin starts offscreen when the plugin is initialized.
(WebKit::PluginView::initializePlugin):
(WebKit::PluginView::pluginSnapshotTimerFired):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::createPlugin):
Use the PluginProcessTypeNormal for offscreen plugins that are potentially primary plugins.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PluginView.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-02  Roger Fong  <roger_fong@apple.com>
+
+        Improve handling of primary offscreen plugins.
+        https://bugs.webkit.org/show_bug.cgi?id=134528.
+        <rdar://problem/17471864>
+
+        Reviewed by Dean Jackson.
+
+        * WebProcess/Plugins/PluginView.cpp: 
+        Determine whether or not the plugin starts offscreen when the plugin is initialized.
+        (WebKit::PluginView::initializePlugin):
+        (WebKit::PluginView::pluginSnapshotTimerFired):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::createPlugin):
+        Use the PluginProcessTypeNormal for offscreen plugins that are potentially primary plugins.
+
 2014-07-02  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -592 +592 @@
     }
 
+    HTMLPlugInImageElement* plugInImageElement = toHTMLPlugInImageElement(m_pluginElement.get());
+    m_didPlugInStartOffScreen = !m_webPage->plugInIntersectsSearchRect(*plugInImageElement);
     m_plugin->initialize(this, m_parameters);
     
@@ -1713 +1715 @@
     HTMLPlugInImageElement* plugInImageElement = toHTMLPlugInImageElement(m_pluginElement.get());
     bool isPlugInOnScreen = m_webPage->plugInIntersectsSearchRect(*plugInImageElement);
-    if (!m_countSnapshotRetries)
-        m_didPlugInStartOffScreen = !isPlugInOnScreen;
-
     bool plugInCameOnScreen = isPlugInOnScreen && m_didPlugInStartOffScreen;
     bool snapshotFound = false;

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -617 +617 @@
 PassRefPtr<Plugin> WebPage::createPlugin(WebFrame* frame, HTMLPlugInElement* pluginElement, const Plugin::Parameters& parameters, String& newMIMEType)
 {
+    HTMLPlugInImageElement& pluginImageElement = toHTMLPlugInImageElement(*pluginElement);
     String frameURLString = frame->coreFrame()->loader().documentLoader()->responseURL().string();
     String pageURLString = m_page->mainFrame().loader().documentLoader()->responseURL().string();
-    PluginProcessType processType = pluginElement->displayState() == HTMLPlugInElement::WaitingForSnapshot ? PluginProcessTypeSnapshot : PluginProcessTypeNormal;
-
+    unsigned pluginArea = 0;
+    PluginProcessType processType = pluginElement->displayState() == HTMLPlugInElement::WaitingForSnapshot && !(plugInIsPrimarySize(pluginImageElement, pluginArea) && !plugInIntersectsSearchRect(pluginImageElement))? PluginProcessTypeSnapshot : PluginProcessTypeNormal;
     bool allowOnlyApplicationPlugins = !frame->coreFrame()->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin);