Move iframe and plugin compositing triggers into additionalCompositingReasons

Move iframe and plugin compositing triggers into additionalCompositingReasons

This CL move the computation of iframe and plugin compositing triggers into
iframe- and plugin-specific overrides of
RenderObject::additionalCompositingReasons. This approach means that we don't
need to take subtype specific branches for every type in
CompositingReasonFinder.

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

[ojan, 2014-03-20 20:36:21]

lgtm

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

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

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

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

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

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 67.
  Hunk #2 FAILED at 131.
  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
e8c0212d234fb09993f3e40effb5287f030ae073..8c51867eda459f3e630989b8e28933080ccb6fcd
100644
--- a/Source/core/rendering/compositing/CompositingReasonFinder.cpp
+++ b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
@@ -67,13 +67,6 @@ CompositingReasons
CompositingReasonFinder::directReasons(const RenderLayer* lay
     if (requiresCompositingForTransform(renderer))
         directReasons |= CompositingReason3DTransform;
 
-    // Only zero or one of the following conditions will be true for a given
RenderLayer.
-    // FIXME: These should be handled by overrides of
RenderObject::additionalCompositingReasons.
-    if (requiresCompositingForPlugin(renderer))
-        directReasons |= CompositingReasonPlugin;
-    else if (requiresCompositingForFrame(renderer))
-        directReasons |= CompositingReasonIFrame;
-
     if (requiresCompositingForBackfaceVisibilityHidden(renderer))
         directReasons |= CompositingReasonBackfaceVisibilityHidden;
 
@@ -131,19 +124,6 @@ bool
CompositingReasonFinder::requiresCompositingForTransform(RenderObject* rend
     return renderer->hasTransform() && style->transform().has3DOperation();
 }
 
-bool CompositingReasonFinder::requiresCompositingForPlugin(RenderObject*
renderer) const
-{
-    if (!(m_compositingTriggers & PluginTrigger))
-        return false;
-
-    return renderer->isEmbeddedObject() &&
toRenderEmbeddedObject(renderer)->requiresAcceleratedCompositing();
-}
-
-bool CompositingReasonFinder::requiresCompositingForFrame(RenderObject*
renderer) const
-{
-    return renderer->isRenderPart() &&
toRenderPart(renderer)->requiresAcceleratedCompositing();
-}
-
 bool
CompositingReasonFinder::requiresCompositingForBackfaceVisibilityHidden(RenderObject*
renderer) const
 {
     if (!(m_compositingTriggers & ThreeDTransformTrigger))

[abarth-chromium, 2014-03-20 20:38:33]

Note: https://codereview.chromium.org/202523008/ needs to land first.

[abarth-chromium, 2014-03-20 21:14:04]

The CQ bit was checked by abarth@chromium.org

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

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

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

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

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

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

[pdr., 2014-03-20 21:25:06]

On 2014/03/20 21:16:11, I haz the power (commit-bot) wrote:
> Try jobs failed on following builders:
>   tryserver.blink on win_blink_compile_dbg

Ownerless crbug.com/341317 bites again.

[pdr., 2014-03-20 21:25:09]

The CQ bit was checked by pdr@chromium.org

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

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

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

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

[commit-bot: I haz the power, 2014-03-20 22:29:55]

Change committed as 169701