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

Unified Diff: Source/core/layout/compositing/CompositingRequirementsUpdater.cpp

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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
Index: Source/core/layout/compositing/CompositingRequirementsUpdater.cpp
diff --git a/Source/core/layout/compositing/CompositingRequirementsUpdater.cpp b/Source/core/layout/compositing/CompositingRequirementsUpdater.cpp
index 6ff306607a2a7e00707a148eddc51280918c16ea..596fb02540ad89866a083cf39ad08611b7ea099f 100644
--- a/Source/core/layout/compositing/CompositingRequirementsUpdater.cpp
+++ b/Source/core/layout/compositing/CompositingRequirementsUpdater.cpp
@@ -163,7 +163,7 @@ static CompositingReasons subtreeReasonsForCompositing(Layer* layer, bool hasCom
// FIXME: This should move into CompositingReasonFinder::potentialCompositingReasonsFromStyle, but
// theres a poor interaction with LayoutTextControlSingleLine, which sets this hasOverflowClip directly.
- if (layer->renderer()->hasClipOrOverflowClip())
+ if (layer->layoutObject()->hasClipOrOverflowClip())
subtreeReasons |= CompositingReasonClipsCompositingDescendants;
}
@@ -217,7 +217,7 @@ void CompositingRequirementsUpdater::updateRecursive(Layer* ancestorLayer, Layer
// Layer children and whose children can't use its backing to render
// into. These children (the controls) always need to be promoted into their
// own layers to draw on top of the accelerated video.
- if (currentRecursionData.m_compositingAncestor && currentRecursionData.m_compositingAncestor->renderer()->isVideo())
+ if (currentRecursionData.m_compositingAncestor && currentRecursionData.m_compositingAncestor->layoutObject()->isVideo())
directReasons |= CompositingReasonVideoOverlay;
if (compositor->canBeComposited(layer)) {
@@ -257,7 +257,7 @@ void CompositingRequirementsUpdater::updateRecursive(Layer* ancestorLayer, Layer
// descendants, that element is no longer relevant to whether or not we
// should opt in. Unfortunately we can't easily remove from the list
// while we're iterating, so we have to store it for later removal.
- if (unclippedDescendant->renderer()->containingBlock() == layer->renderer()) {
+ if (unclippedDescendant->layoutObject()->containingBlock() == layer->layoutObject()) {
unclippedDescendantsToRemove.append(i);
continue;
}
@@ -417,7 +417,7 @@ void CompositingRequirementsUpdater::updateRecursive(Layer* ancestorLayer, Layer
reflectionLayer->setCompositingReasons(reflectionCompositingReason, CompositingReasonReflectionOfCompositedParent);
}
- if (willBeCompositedOrSquashed && layer->renderer()->style()->hasBlendMode())
+ if (willBeCompositedOrSquashed && layer->layoutObject()->style()->hasBlendMode())
currentRecursionData.m_hasUnisolatedCompositedBlendingDescendant = true;
// Turn overlap testing off for later layers if it's already off, or if we have an animating transform.
@@ -425,7 +425,7 @@ void CompositingRequirementsUpdater::updateRecursive(Layer* ancestorLayer, Layer
// we know for sure the animation is contained inside the clipping rectangle, which is already added to the overlap map.
bool isCompositedClippingLayer = compositor->canBeComposited(layer) && (reasonsToComposite & CompositingReasonClipsCompositingDescendants);
bool isCompositedWithInlineTransform = reasonsToComposite & CompositingReasonInlineTransform;
- if ((!childRecursionData.m_testingOverlap && !isCompositedClippingLayer) || layer->renderer()->style()->hasCurrentTransformAnimation() || isCompositedWithInlineTransform)
+ if ((!childRecursionData.m_testingOverlap && !isCompositedClippingLayer) || layer->layoutObject()->style()->hasCurrentTransformAnimation() || isCompositedWithInlineTransform)
currentRecursionData.m_testingOverlap = false;
if (childRecursionData.m_compositingAncestor == layer)

Powered by Google App Engine
This is Rietveld 408576698