Simplify CompositingReasonFinder::requiresCompositingForPlugin

Simplify CompositingReasonFinder::requiresCompositingForPlugin

This CL removes the optimization not to create a composited layer for 0x0
plugins. Removing this optimization simplifies the CompositingReasonFinder and
removes a dependency on layout information. We've already removed a similar
optimization for 0x0 iframes.

This CL also removes RenderEmbeddedObject::allowsAcceleratedCompositing. This
function is redundant with RenderPart::requiresAcceleratedCompositing because
RenderPart is a base class of RenderEmbeddedObject.

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=169693

[Ian Vollick, 2014-03-20 20:01:44]

On 2014/03/20 19:55:43, abarth wrote:

Nice! lgtm.

[abarth-chromium, 2014-03-20 20:05:04]

The CQ bit was checked by abarth@chromium.org

[commit-bot: I haz the power, 2014-03-20 20:05:43]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/202523008/1

[commit-bot: I haz the power, 2014-03-20 20:06:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-20 20:06:06]

Failed to apply patch for
Source/core/rendering/compositing/CompositingReasonFinder.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/rendering/compositing/CompositingReasonFinder.cpp
  Hunk #1 FAILED at 72.
  Hunk #2 FAILED at 162.
  2 out of 2 hunks FAILED -- saving rejects to file
Source/core/rendering/compositing/CompositingReasonFinder.cpp.rej

Patch:       Source/core/rendering/compositing/CompositingReasonFinder.cpp
Index: Source/core/rendering/compositing/CompositingReasonFinder.cpp
diff --git a/Source/core/rendering/compositing/CompositingReasonFinder.cpp
b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
index
42598d87f1198ca69831476ca49f2feef3842783..ab0ce3ed030ad78a40f270ddc07efd69bf305e7b
100644
--- a/Source/core/rendering/compositing/CompositingReasonFinder.cpp
+++ b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
@@ -72,7 +72,7 @@ CompositingReasons
CompositingReasonFinder::directReasons(const RenderLayer* lay
         directReasons |= CompositingReasonVideo;
     else if (requiresCompositingForCanvas(renderer))
         directReasons |= CompositingReasonCanvas;
-    else if (requiresCompositingForPlugin(renderer,
needToRecomputeCompositingRequirements))
+    else if (requiresCompositingForPlugin(renderer))
         directReasons |= CompositingReasonPlugin;
     else if (requiresCompositingForFrame(renderer))
         directReasons |= CompositingReasonIFrame;
@@ -162,25 +162,12 @@ bool
CompositingReasonFinder::requiresCompositingForCanvas(RenderObject* rendere
     return false;
 }
 
-bool CompositingReasonFinder::requiresCompositingForPlugin(RenderObject*
renderer, bool* needToRecomputeCompositingRequirements) const
+bool CompositingReasonFinder::requiresCompositingForPlugin(RenderObject*
renderer) const
 {
     if (!(m_compositingTriggers & ChromeClient::PluginTrigger))
         return false;
 
-    if (!renderer->isEmbeddedObject() ||
!toRenderEmbeddedObject(renderer)->allowsAcceleratedCompositing())
-        return false;
-
-    // FIXME: this seems bogus. If we don't know the layout position/size of
the plugin yet, would't that be handled elsewhere?
-    *needToRecomputeCompositingRequirements = true;
-
-    RenderWidget* pluginRenderer = toRenderWidget(renderer);
-    // If we can't reliably know the size of the plugin yet, don't change
compositing state.
-    if (pluginRenderer->needsLayout())
-        return pluginRenderer->hasLayer() &&
pluginRenderer->layer()->hasCompositedLayerMapping();
-
-    // Don't go into compositing mode if height or width are zero, or size is
1x1.
-    IntRect contentBox = pixelSnappedIntRect(pluginRenderer->contentBoxRect());
-    return contentBox.height() * contentBox.width() > 1;
+    return renderer->isEmbeddedObject() &&
toRenderEmbeddedObject(renderer)->requiresAcceleratedCompositing();
 }
 
 bool CompositingReasonFinder::requiresCompositingForFrame(RenderObject*
renderer) const

[abarth-chromium, 2014-03-20 20:12:24]

The CQ bit was checked by abarth@chromium.org

[commit-bot: I haz the power, 2014-03-20 20:12:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/202523008/20001

[abarth-chromium, 2014-03-20 20:15:34]

The CQ bit was unchecked by abarth@chromium.org

[abarth-chromium, 2014-03-20 20:18:02]

The CQ bit was checked by abarth@chromium.org

[commit-bot: I haz the power, 2014-03-20 20:18:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/202523008/30006

[commit-bot: I haz the power, 2014-03-20 20:21:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-20 20:21:03]

Try jobs failed on following builders:
  tryserver.blink on linux_blink_dbg

[abarth-chromium, 2014-03-20 20:24:43]

The CQ bit was checked by abarth@chromium.org

[commit-bot: I haz the power, 2014-03-20 20:24:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/202523008/30006

[commit-bot: I haz the power, 2014-03-20 20:27:18]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-20 20:27:19]

Try jobs failed on following builders:
  tryserver.blink on linux_blink_dbg

[abarth-chromium, 2014-03-20 20:53:10]

The CQ bit was checked by abarth@chromium.org

[commit-bot: I haz the power, 2014-03-20 20:53:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/abarth@chromium.org/202523008/30006

[abarth-chromium, 2014-03-20 21:10:54]

Committed patchset #3 manually as r169693 (presubmit successful).