Move iframe and plugin compositing triggers into additionalCompositingReasons

Source/core/rendering/compositing/CompositingReasonFinder.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/rendering/compositing/CompositingReasonFinder.h"
 
 #include "CSSPropertyNames.h"
 #include "HTMLNames.h"
 #include "core/animation/ActiveAnimations.h"
@@ skipping 49 matching lines @@
 }
 
 CompositingReasons CompositingReasonFinder::directReasons(const RenderLayer* layer, bool* needToRecomputeCompositingRequirements) const
 {
     RenderObject* renderer = layer->renderer();
     CompositingReasons directReasons = CompositingReasonNone;
 
     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;
 
     if (requiresCompositingForAnimation(renderer))
         directReasons |= CompositingReasonActiveAnimation;
 
     if (requiresCompositingForTransition(renderer))
         directReasons |= CompositingReasonTransitionProperty;
 
     if (requiresCompositingForFilters(renderer))
@@ skipping 37 matching lines @@
 {
     if (!(m_compositingTriggers & ThreeDTransformTrigger))
         return false;
 
     RenderStyle* style = renderer->style();
     // Note that we ask the renderer if it has a transform, because the style may have transforms,
     // but the renderer may be an inline that doesn't suppport them.
     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))
         return false;
 
     return renderer->style()->backfaceVisibility() == BackfaceVisibilityHidden;
 }
 
 bool CompositingReasonFinder::requiresCompositingForAnimation(RenderObject* renderer) const
 {
@@ skipping 167 matching lines @@
 
     return true;
 }
 
 bool CompositingReasonFinder::requiresCompositingForOverflowScrolling(const RenderLayer* layer) const
 {
     return layer->needsCompositedScrolling();
 }
 
 }