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

Unified Diff: Source/core/rendering/RenderBox.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. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
index 84f11e672d2eb3c9686e9e5df2477c6fd974017a..6ed8e53395f61f6f7aa3b9b69291aa9135cfacc8 100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -1252,7 +1252,8 @@ static bool isCandidateForOpaquenessTest(RenderBox* childBox)
if (!childBox->width() || !childBox->height())
return false;
if (RenderLayer* childLayer = childBox->layer()) {
- if (childLayer->isComposited())
+ // FIXME: perhaps this could be less conservative?
+ if (childLayer->compositingState() != NotComposited)
return false;
// FIXME: Deal with z-index.
if (!childStyle->hasAutoZIndex())
@@ -1347,7 +1348,7 @@ void RenderBox::paintClippingMask(PaintInfo& paintInfo, const LayoutPoint& paint
if (!paintInfo.shouldPaintWithinRoot(this) || style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseClippingMask || paintInfo.context->paintingDisabled())
return;
- if (!layer() || !layer()->isComposited())
+ if (!layer() || layer()->compositingState() != PaintsIntoOwnBacking)
Julien - ping for review 2013/10/03 20:08:36 How about we add an ASSERT that we never see HasOw
shawnsingh 2013/10/07 11:45:04 I'm not fixing any bug here, it's just a condition
return;
LayoutRect paintRect = LayoutRect(paintOffset, size());

Powered by Google App Engine
This is Rietveld 408576698