Changeset 144650 in webkit

Timestamp:

Mar 4, 2013, 11:20:55 AM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r144577. <rdar://problem/13328176>

Location:

tags/Safari-537.31.13/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLPlugInImageElement.cpp (modified) (4 diffs)

tags/Safari-537.31.13/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-04  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r144577
+
+    2013-03-03  Dean Jackson  <dino@apple.com>
+
+            Plug-ins that are appropriately large w.r.t page size should autostart
+            https://bugs.webkit.org/show_bug.cgi?id=111242
+
+            Reviewed by Brady Eidson.
+
+            A "full-page" plug-in site should never snapshot. The trick is
+            how to determine what is full-page. This change implements the
+            following algorithm.
+
+            - The plug-in is in the main frame (not an iframe).
+            - The plug-in is sized with width and height 100%.
+            - The displayed area of the plug-in is more than 96% of the viewport area.
+
+            This is definitely not foolproof. For example, zombo.com has a slight
+            border around its plug-in. As the window size gets smaller, the body margin
+            takes up more than 5% of the width or height, and the plug-in doesn't pass
+            the tests above.
+
+            * html/HTMLPlugInImageElement.cpp:
+            (WebCore): New static constant: sizingFullPageThresholdPercentage
+            (WebCore::HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn): Implements
+                the rules described above.
+
 2013-03-01  Lucas Forschler  <lforschler@apple.com>
 

tags/Safari-537.31.13/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -58 +58 @@
 static const int sizingMediumWidthThreshold = 450;
 static const int sizingMediumHeightThreshold = 300;
+static const float sizingFullPageAreaRatioThreshold = 0.96;
 
 // This delay should not exceed the snapshot delay in PluginView.cpp
@@ -415 +416 @@
         return;
 
-    if (document()->isPluginDocument() && document()->frame() == document()->page()->mainFrame()) {
+    bool inMainFrame = document()->frame() == document()->page()->mainFrame();
+
+    if (document()->isPluginDocument() && inMainFrame) {
         LOG(Plugins, "%p Plug-in document in main frame", this);
         return;
@@ -425 +428 @@
     }
 
-    LayoutRect rect = toRenderEmbeddedObject(renderer())->contentBoxRect();
-    int width = rect.width();
-    int height = rect.height();
-    if (width <= sizingTinyDimensionThreshold || height <= sizingTinyDimensionThreshold) {
-        LOG(Plugins, "%p Plug-in is %dx%d, set to play", this, width, height);
+    RenderBox* renderEmbeddedObject = toRenderBox(renderer());
+    Length styleWidth = renderEmbeddedObject->style()->width();
+    Length styleHeight = renderEmbeddedObject->style()->height();
+    LayoutRect contentBoxRect = renderEmbeddedObject->contentBoxRect();
+    int contentWidth = contentBoxRect.width();
+    int contentHeight = contentBoxRect.height();
+    int contentArea = contentWidth * contentHeight;
+    IntSize visibleViewSize = document()->frame()->view()->visibleSize();
+    int visibleArea = visibleViewSize.width() * visibleViewSize.height();
+
+    if (inMainFrame && styleWidth.isPercent() && (styleWidth.percent() == 100)
+        && styleHeight.isPercent() && (styleHeight.percent() == 100)
+        && (static_cast<float>(contentArea) / visibleArea > sizingFullPageAreaRatioThreshold)) {
+        LOG(Plugins, "%p Plug-in is top level full page, set to play", this);
+        return;
+    }
+
+    if (contentWidth <= sizingTinyDimensionThreshold || contentHeight <= sizingTinyDimensionThreshold) {
+        LOG(Plugins, "%p Plug-in is %dx%d, set to play", this, contentWidth, contentHeight);
         return;
     }
@@ -447 +464 @@
     }
 
-    LOG(Plugins, "%p Plug-in hash %x is %dx%d, origin is not auto-start, set to wait for snapshot", this, m_plugInOriginHash, width, height);
+    LOG(Plugins, "%p Plug-in hash %x is %dx%d, origin is not auto-start, set to wait for snapshot", this, m_plugInOriginHash, contentWidth, contentHeight);
     // We may have got to this point by restarting a snapshotted plug-in, in which case we don't want to
     // reset the display state.