Changeset 169820 in webkit

Timestamp:

Jun 11, 2014 12:59:24 PM (10 years ago)

Author:

roger_fong@apple.com

Message:

Don't snapshot offscreen plugins that would normally be considered primary plugins after they are moved in view.
​https://bugs.webkit.org/show_bug.cgi?id=133667.
<rdar://problem/16743250>

Reviewed by Tim Horton.

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::PluginView):
(WebKit::PluginView::pluginSnapshotTimerFired):
Set the display state to Playing if the following is true:
The plugin in question is large enough to be considered the primary snapshot and either:
a) The maximum number of snapshot retries has been reached and no good snapshot has been found.
b) The plugin is moved to be on-screen while the snapshot attempts are in progress.

• WebProcess/Plugins/PluginView.h:
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::plugInIntersectsSearchRect): Re-factor out intersection logic.
(WebKit::WebPage::plugInIsPrimarySize): Re-factor out primary plugin size logic.
(WebKit::WebPage::determinePrimarySnapshottedPlugIn): Use the above two methods here.

• WebProcess/WebPage/WebPage.h:

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-06-11  Roger Fong  <roger_fong@apple.com>
+
+        Don't snapshot offscreen plugins that would normally be considered primary plugins after they are moved in view.
+        https://bugs.webkit.org/show_bug.cgi?id=133667.
+        <rdar://problem/16743250>
+
+        Reviewed by Tim Horton.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::PluginView):
+        (WebKit::PluginView::pluginSnapshotTimerFired):
+        Set the display state to Playing if the following is true:
+        The plugin in question is large enough to be considered the primary snapshot and either:
+        a) The maximum number of snapshot retries has been reached and no good snapshot has been found.
+        b) The plugin is moved to be on-screen while the snapshot attempts are in progress.
+        * WebProcess/Plugins/PluginView.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::plugInIntersectsSearchRect): Re-factor out intersection logic.
+        (WebKit::WebPage::plugInIsPrimarySize): Re-factor out primary plugin size logic.
+        (WebKit::WebPage::determinePrimarySnapshottedPlugIn): Use the above two methods here.
+        * WebProcess/WebPage/WebPage.h:
+
 2014-06-11  Anders Carlsson  <andersca@apple.com>
 

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

@@ -287 +287 @@
     , m_isBeingDestroyed(false)
     , m_pluginProcessHasCrashed(false)
+    , m_didPlugInStartOffScreen(false)
     , m_pendingURLRequestsTimer(RunLoop::main(), this, &PluginView::pendingURLRequestsTimerFired)
 #if ENABLE(NETSCAPE_PLUGIN_API)
@@ -1689 +1690 @@
     ASSERT(m_plugin);
 
+    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;
+
     if (m_plugin->supportsSnapshotting()) {
         // Snapshot might be 0 if plugin size is 0x0.
@@ -1696 +1705 @@
             snapshotImage = snapshot->createImage();
         m_pluginElement->updateSnapshot(snapshotImage.get());
+        bool snapshotIsAlmostSolidColor = isAlmostSolidColor(toBitmapImage(snapshotImage.get()));
+        snapshotFound = snapshotImage && !snapshotIsAlmostSolidColor;
 
 #if PLATFORM(COCOA)
         unsigned maximumSnapshotRetries = frame() ? frame()->settings().maximumPlugInSnapshotAttempts() : 0;
-        if (snapshotImage && isAlmostSolidColor(toBitmapImage(snapshotImage.get())) && m_countSnapshotRetries < maximumSnapshotRetries) {
+        if (snapshotImage && snapshotIsAlmostSolidColor && m_countSnapshotRetries < maximumSnapshotRetries && !plugInCameOnScreen) {
             ++m_countSnapshotRetries;
             m_pluginSnapshotTimer.restart();
@@ -1706 +1717 @@
 #endif
     }
-    // Even if there is no snapshot we still set the state to DisplayingSnapshot
-    // since we just want to display the default empty box.
-    m_pluginElement->setDisplayState(HTMLPlugInElement::DisplayingSnapshot);
+    unsigned candidateArea = 0;
+    bool noSnapshotFoundAfterMaxRetries = m_countSnapshotRetries == frame()->settings().maximumPlugInSnapshotAttempts() && !isPlugInOnScreen && !snapshotFound;
+    if (m_webPage->plugInIsPrimarySize(*plugInImageElement, candidateArea)
+        && (noSnapshotFoundAfterMaxRetries || plugInCameOnScreen))
+        m_pluginElement->setDisplayState(HTMLPlugInElement::Playing);
+    else
+        m_pluginElement->setDisplayState(HTMLPlugInElement::DisplayingSnapshot);
 }
 

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

@@ -239 +239 @@
     bool m_isBeingDestroyed;
     bool m_pluginProcessHasCrashed;
+    bool m_didPlugInStartOffScreen;
 
     // Pending URLRequests that the plug-in has made.

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

@@ -4473 +4473 @@
                 continue;
             auto& pluginRenderBox = toRenderBox(*pluginRenderer);
+            if (!plugInIntersectsSearchRect(plugInImageElement))
+                continue;
+
             IntRect plugInRectRelativeToView = plugInImageElement.clientRect();
-            if (plugInRectRelativeToView.isEmpty())
-                continue;
             IntSize scrollOffset = mainFrame.view()->documentScrollOffsetRelativeToViewOrigin();
             IntRect plugInRectRelativeToTopDocument(plugInRectRelativeToView.location() + scrollOffset, plugInRectRelativeToView.size());
-            if (!plugInRectRelativeToTopDocument.intersects(searchRect))
-                continue;
-
             HitTestResult hitTestResult(plugInRectRelativeToTopDocument.center());
             mainRenderView.hitTest(request, hitTestResult);
@@ -4505 +4503 @@
                 plugInImageElement.restartSnapshottedPlugIn();
             }
-            if (pluginRenderBox.contentWidth() < primarySnapshottedPlugInMinimumWidth || pluginRenderBox.contentHeight() < primarySnapshottedPlugInMinimumHeight)
-                continue;
-
-            LayoutUnit contentArea = pluginRenderBox.contentWidth() * pluginRenderBox.contentHeight();
-            if (contentArea > candidatePlugInArea * primarySnapshottedPlugInSearchBucketSize) {
+
+            if (plugInIsPrimarySize(plugInImageElement, candidatePlugInArea))
                 candidatePlugIn = &plugInImageElement;
-                candidatePlugInArea = contentArea;
-            }
         }
     }
@@ -4547 +4540 @@
 
     return (pageOrigin == m_primaryPlugInPageOrigin && pluginOrigin == m_primaryPlugInOrigin && mimeType == m_primaryPlugInMimeType);
+}
+
+bool WebPage::plugInIntersectsSearchRect(HTMLPlugInImageElement& plugInImageElement)
+{
+    MainFrame& mainFrame = corePage()->mainFrame();
+    if (!mainFrame.view())
+        return false;
+    if (!mainFrame.view()->renderView())
+        return false;
+
+    IntRect searchRect = IntRect(IntPoint(), corePage()->mainFrame().view()->contentsSize());
+    searchRect.intersect(IntRect(IntPoint(), IntSize(primarySnapshottedPlugInSearchLimit, primarySnapshottedPlugInSearchLimit)));
+
+    IntRect plugInRectRelativeToView = plugInImageElement.clientRect();
+    if (plugInRectRelativeToView.isEmpty())
+        return false;
+    IntSize scrollOffset = mainFrame.view()->documentScrollOffsetRelativeToViewOrigin();
+    IntRect plugInRectRelativeToTopDocument(plugInRectRelativeToView.location() + scrollOffset, plugInRectRelativeToView.size());
+
+    return plugInRectRelativeToTopDocument.intersects(searchRect);
+}
+
+bool WebPage::plugInIsPrimarySize(WebCore::HTMLPlugInImageElement& plugInImageElement, unsigned& candidatePlugInArea)
+{
+    auto& pluginRenderBox = toRenderBox(*(plugInImageElement.renderer()));
+    if (pluginRenderBox.contentWidth() < primarySnapshottedPlugInMinimumWidth || pluginRenderBox.contentHeight() < primarySnapshottedPlugInMinimumHeight)
+        return false;
+
+    LayoutUnit contentArea = pluginRenderBox.contentWidth() * pluginRenderBox.contentHeight();
+    if (contentArea > candidatePlugInArea * primarySnapshottedPlugInSearchBucketSize) {
+        candidatePlugInArea = contentArea;
+        return true;
+    }
+    return false;
 }
 #endif // ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -119 +119 @@
 class FrameView;
 class HTMLPlugInElement;
+class HTMLPlugInImageElement;
 class IntPoint;
 class KeyboardEvent;
@@ -792 +793 @@
     void resetPrimarySnapshottedPlugIn();
     bool matchesPrimaryPlugIn(const String& pageOrigin, const String& pluginOrigin, const String& mimeType) const;
+    bool plugInIntersectsSearchRect(WebCore::HTMLPlugInImageElement& pluginImageElement);
+    bool plugInIsPrimarySize(WebCore::HTMLPlugInImageElement& pluginImageElement, unsigned &pluginArea);
 #endif