Move rendering/RenderObject to layout/LayoutObject.

Source/core/layout/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/layout/compositing/CompositingReasonFinder.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/dom/Document.h"
 #include "core/frame/FrameView.h"
@@ skipping 56 matching lines @@
     ASSERT(!m_renderView.needsLayout());
     if (isMainFrame())
         return false;
 
     if (!(m_compositingTriggers & ScrollableInnerFrameTrigger))
         return false;
 
     return m_renderView.frameView()->isScrollable();
 }
 
-CompositingReasons CompositingReasonFinder::potentialCompositingReasonsFromStyle(RenderObject* renderer) const
+CompositingReasons CompositingReasonFinder::potentialCompositingReasonsFromStyle(LayoutObject* renderer) const
 {
     if (RuntimeEnabledFeatures::slimmingPaintCompositorLayerizationEnabled())
         return CompositingReasonNone;
 
     CompositingReasons reasons = CompositingReasonNone;
 
     RenderStyle* style = renderer->style();
 
     if (requiresCompositingForTransform(renderer))
         reasons |= CompositingReason3DTransform;
@@ skipping 41 matching lines @@
     if (style->hasBlendMode())
         reasons |= CompositingReasonBlendingWithCompositedDescendants;
 
     if (renderer->hasReflection())
         reasons |= CompositingReasonReflectionWithCompositedDescendants;
 
     ASSERT(!(reasons & ~CompositingReasonComboAllStyleDeterminedReasons));
     return reasons;
 }
 
-bool CompositingReasonFinder::requiresCompositingForTransform(RenderObject* renderer) const
+bool CompositingReasonFinder::requiresCompositingForTransform(LayoutObject* renderer) const
 {
     // 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 support them.
     return renderer->hasTransformRelatedProperty() && renderer->style()->transform().has3DOperation();
 }
 
 CompositingReasons CompositingReasonFinder::nonStyleDeterminedDirectReasons(const Layer* layer) const
 {
     CompositingReasons directReasons = CompositingReasonNone;
-    RenderObject* renderer = layer->renderer();
+    LayoutObject* renderer = layer->renderer();
 
     if (hasOverflowScrollTrigger()) {
         if (layer->clipParent())
             directReasons |= CompositingReasonOutOfFlowClipping;
 
         if (const Layer* scrollingAncestor = layer->ancestorScrollingLayer()) {
             if (scrollingAncestor->needsCompositedScrolling() && layer->scrollParent())
                 directReasons |= CompositingReasonOverflowScrollingParent;
         }
 
@@ skipping 20 matching lines @@
 
 bool CompositingReasonFinder::requiresCompositingForPositionFixed(const Layer* layer) const
 {
     if (!(m_compositingTriggers & ViewportConstrainedPositionedTrigger))
         return false;
     // Don't promote fixed position elements that are descendants of a non-view container, e.g. transformed elements.
     // They will stay fixed wrt the container rather than the enclosing frame.
     return layer->scrollsWithViewport() && m_renderView.frameView()->isScrollable();
 }
 
-bool CompositingReasonFinder::requiresCompositingForScrollBlocksOn(const RenderObject* renderer) const
+bool CompositingReasonFinder::requiresCompositingForScrollBlocksOn(const LayoutObject* renderer) const
 {
-    // Note that the other requires* functions run at RenderObject::styleDidChange time and so can rely
+    // Note that the other requires* functions run at LayoutObject::styleDidChange time and so can rely
     // only on the style of their object.  This function runs at CompositingRequirementsUpdater::update
     // time, and so can consider the style of other objects.
     RenderStyle* style = renderer->style();
 
     // We should only get here by CompositingReasonScrollBlocksOn being a potential compositing reason.
     ASSERT(style->hasScrollBlocksOn() && !renderer->isDocumentElement());
 
     // scroll-blocks-on style is propagated from the document element to the document.
     ASSERT(!renderer->isRenderView()
         || !renderer->document().documentElement()
@@ skipping 21 matching lines @@
             // Either way, we don't need to require compositing for scroll blocks on.  This avoids
             // enabling compositing by default, and avoids cluttering the root layers compositing reasons.
             return false;
         }
     }
 
     return true;
 }
 
 }