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

Unified Diff: Source/core/rendering/RenderView.cpp

Issue 27030009: Revert "Make compositingState explicit (re-land #2 with bogus ASSERT removed)" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix build error Created 7 years, 2 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/rendering/RenderTreeAsText.cpp ('k') | Source/core/rendering/RenderWidget.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderView.cpp
diff --git a/Source/core/rendering/RenderView.cpp b/Source/core/rendering/RenderView.cpp
index 2d2dcbd99b8ca8562f8f0bb3ab2e910d416c02ac..618bf5f7f0cf5715774d10095ede2b1366b4c26d 100644
--- a/Source/core/rendering/RenderView.cpp
+++ b/Source/core/rendering/RenderView.cpp
@@ -439,6 +439,11 @@ void RenderView::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
paintObject(paintInfo, paintOffset);
}
+static inline bool isComposited(RenderObject* object)
+{
+ return object->hasLayer() && toRenderLayerModelObject(object)->layer()->isComposited();
+}
+
static inline bool rendererObscuresBackground(RenderObject* rootObject)
{
if (!rootObject)
@@ -450,7 +455,7 @@ static inline bool rendererObscuresBackground(RenderObject* rootObject)
|| style->hasTransform())
return false;
- if (rootObject->compositingState() == PaintsIntoOwnBacking)
+ if (isComposited(rootObject))
return false;
const RenderObject* rootRenderer = rootObject->rendererForRootBackground();
« no previous file with comments | « Source/core/rendering/RenderTreeAsText.cpp ('k') | Source/core/rendering/RenderWidget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698