Move iframe and plugin compositing triggers into additionalCompositingReasons

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))