Simplify CompositingReasonFinder::requiresCompositingForPlugin

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 51 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, needToRecomputeCompositingRequirements))
+    if (requiresCompositingForPlugin(renderer))
         directReasons |= CompositingReasonPlugin;
     else if (requiresCompositingForFrame(renderer))
         directReasons |= CompositingReasonIFrame;
 
     if (requiresCompositingForBackfaceVisibilityHidden(renderer))
         directReasons |= CompositingReasonBackfaceVisibilityHidden;
 
     if (requiresCompositingForAnimation(renderer))
         directReasons |= CompositingReasonActiveAnimation;
 
@@ skipping 41 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, bool* needToRecomputeCompositingRequirements) const
+bool CompositingReasonFinder::requiresCompositingForPlugin(RenderObject* renderer) const
 {
     if (!(m_compositingTriggers & 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
 {
     return renderer->isRenderPart() && toRenderPart(renderer)->requiresAcceleratedCompositing();
 }
 
 bool CompositingReasonFinder::requiresCompositingForBackfaceVisibilityHidden(RenderObject* renderer) const
 {
     if (!(m_compositingTriggers & ThreeDTransformTrigger))
@@ skipping 174 matching lines @@
 
     return true;
 }
 
 bool CompositingReasonFinder::requiresCompositingForOverflowScrolling(const RenderLayer* layer) const
 {
     return layer->needsCompositedScrolling();
 }
 
 }