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

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

Issue 59063003: Don't coerce pointers to compositor layer mappings to booleans. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Respond to reviewer feedback. Created 7 years, 1 month 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/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 6e9369ab684efe0235cfed936d466a7445fb15c7..90ac58bf20ef21fc50aa88a4718c344aafbbdf24 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -2077,7 +2077,7 @@ bool FrameView::isTransparent() const
void FrameView::setTransparent(bool isTransparent)
{
m_isTransparent = isTransparent;
- if (renderView() && renderView()->layer()->compositedLayerMapping())
+ if (renderView() && renderView()->layer()->compositingState() == PaintsIntoOwnBacking)
renderView()->layer()->compositedLayerMapping()->updateContentsOpaque();
}
@@ -2098,7 +2098,8 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor)
else
m_baseBackgroundColor = backgroundColor;
- if (CompositedLayerMapping* compositedLayerMapping = renderView() ? renderView()->layer()->compositedLayerMapping() : 0) {
+ if (renderView() && renderView()->layer()->compositingState() == PaintsIntoOwnBacking) {
+ CompositedLayerMappingPtr compositedLayerMapping = renderView()->layer()->compositedLayerMapping();
compositedLayerMapping->updateContentsOpaque();
if (compositedLayerMapping->mainGraphicsLayer())
compositedLayerMapping->mainGraphicsLayer()->setNeedsDisplay();

Powered by Google App Engine
This is Rietveld 408576698