Chromium Code Reviews

Unified Diff: Source/core/page/FrameView.cpp

Issue 24921002: Make compositingState explicit (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: addressed first round of reviewer comments Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Index: Source/core/page/FrameView.cpp
diff --git a/Source/core/page/FrameView.cpp b/Source/core/page/FrameView.cpp
index adb77d7c114b9b384374e1f5bd3ac77f3c9f1369..30c879bb9bb56bb66c42bfa5a9880f8ebc04ae7d 100644
--- a/Source/core/page/FrameView.cpp
+++ b/Source/core/page/FrameView.cpp
@@ -1245,7 +1245,7 @@ void FrameView::updateCanBlitOnScrollRecursively()
bool FrameView::contentsInCompositedLayer() const
{
RenderView* renderView = this->renderView();
- if (renderView && renderView->isComposited()) {
+ if (renderView && renderView->compositingState() == PaintsIntoOwnBacking) {
GraphicsLayer* layer = renderView->layer()->backing()->graphicsLayer();
if (layer && layer->drawsContent())
return true;
@@ -1359,7 +1359,7 @@ bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect
// Composited layers may still actually paint into their ancestor.
// If that happens, the viewport constrained object needs to be
// repainted on scroll.
- if (layer->isComposited() && !layer->backing()->paintsIntoCompositedAncestor())
+ if (layer->compositingState() == PaintsIntoOwnBacking)
continue;
if (layer->viewportConstrainedNotCompositedReason() == RenderLayer::NotCompositedForBoundsOutOfView

Powered by Google App Engine