Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: Source/core/page/scrolling/ScrollingCoordinator.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/page/scrolling/ScrollingCoordinator.h ('k') | Source/core/paint/BlockPainter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/scrolling/ScrollingCoordinator.cpp
diff --git a/Source/core/page/scrolling/ScrollingCoordinator.cpp b/Source/core/page/scrolling/ScrollingCoordinator.cpp
index 379a4111a29c69e48f65458514abbfbc35697b10..07a1d01a6ed56e35e80571113e0fbf95ed1472c5 100644
--- a/Source/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/Source/core/page/scrolling/ScrollingCoordinator.cpp
@@ -215,7 +215,7 @@ static WebLayerPositionConstraint computePositionConstraint(const Layer* layer)
ASSERT(layer->hasCompositedLayerMapping());
do {
if (layer->renderer()->style()->position() == FixedPosition) {
- const RenderObject* fixedPositionObject = layer->renderer();
+ const LayoutObject* fixedPositionObject = layer->renderer();
bool fixedToRight = !fixedPositionObject->style()->right().isAuto();
bool fixedToBottom = !fixedPositionObject->style()->bottom().isAuto();
return WebLayerPositionConstraint::fixedPosition(fixedToRight, fixedToBottom);
@@ -224,7 +224,7 @@ static WebLayerPositionConstraint computePositionConstraint(const Layer* layer)
layer = layer->parent();
// Composited layers that inherit a fixed position state will be positioned with respect to the nearest compositedLayerMapping's GraphicsLayer.
- // So, once we find a layer that has its own compositedLayerMapping, we can stop searching for a fixed position RenderObject.
+ // So, once we find a layer that has its own compositedLayerMapping, we can stop searching for a fixed position LayoutObject.
} while (layer && !layer->hasCompositedLayerMapping());
return WebLayerPositionConstraint();
}
@@ -442,7 +442,7 @@ static void makeLayerChildFrameMap(const LocalFrame* currentFrame, LayerFrameMap
for (const Frame* child = tree.firstChild(); child; child = child->tree().nextSibling()) {
if (!child->isLocalFrame())
continue;
- const RenderObject* ownerRenderer = toLocalFrame(child)->ownerRenderer();
+ const LayoutObject* ownerRenderer = toLocalFrame(child)->ownerRenderer();
if (!ownerRenderer)
continue;
const Layer* containingLayer = ownerRenderer->enclosingLayer();
@@ -540,7 +540,7 @@ static void projectRectsToGraphicsLayerSpace(LocalFrame* mainFrame, const LayerH
if (layer->parent()) {
layer = layer->parent();
- } else if (RenderObject* parentDocRenderer = layer->renderer()->frame()->ownerRenderer()) {
+ } else if (LayoutObject* parentDocRenderer = layer->renderer()->frame()->ownerRenderer()) {
layer = parentDocRenderer->enclosingLayer();
touchHandlerInChildFrame = true;
}
@@ -831,7 +831,7 @@ static void accumulateDocumentTouchEventTargetRects(LayerHitTestRects& rects, co
if (node->isDocumentNode() && node != document) {
accumulateDocumentTouchEventTargetRects(rects, toDocument(node));
- } else if (RenderObject* renderer = node->renderer()) {
+ } else if (LayoutObject* renderer = node->renderer()) {
// If the set also contains one of our ancestor nodes then processing
// this node would be redundant.
bool hasTouchEventTargetAncestor = false;
@@ -958,14 +958,14 @@ bool ScrollingCoordinator::hasVisibleSlowRepaintViewportConstrainedObjects(Frame
if (!viewportConstrainedObjects)
return false;
- for (const RenderObject* renderer : *viewportConstrainedObjects) {
+ for (const LayoutObject* renderer : *viewportConstrainedObjects) {
ASSERT(renderer->isBoxModelObject() && renderer->hasLayer());
ASSERT(renderer->style()->position() == FixedPosition);
Layer* layer = toRenderBoxModelObject(renderer)->layer();
// Whether the Layer scrolls with the viewport is a tree-depenent
// property and our viewportConstrainedObjects collection is maintained
- // with only RenderObject-level information.
+ // with only LayoutObject-level information.
if (!layer->scrollsWithViewport())
continue;
« no previous file with comments | « Source/core/page/scrolling/ScrollingCoordinator.h ('k') | Source/core/paint/BlockPainter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698