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

Unified Diff: cc/LayerChromium.cpp

Issue 11035020: Renamed LayerChromium::opaque to LayerChromium::contentsOpaque. Having both opaque and opacity on t… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 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: cc/LayerChromium.cpp
diff --git a/cc/LayerChromium.cpp b/cc/LayerChromium.cpp
index a7db9fdcceca82ae3d2fe7d235223f7bf606cbd8..744a2b5ee273bd9c14b2b742ae3ba447b1f7e4dd 100644
--- a/cc/LayerChromium.cpp
+++ b/cc/LayerChromium.cpp
@@ -50,7 +50,7 @@ LayerChromium::LayerChromium()
, m_fixedToContainerLayer(false)
, m_isDrawable(false)
, m_masksToBounds(false)
- , m_opaque(false)
+ , m_contentsOpaque(false)
, m_doubleSided(true)
, m_useLCDText(false)
, m_preserves3D(false)
@@ -348,11 +348,11 @@ bool LayerChromium::opacityIsAnimating() const
return m_layerAnimationController->isAnimatingProperty(CCActiveAnimation::Opacity);
}
-void LayerChromium::setOpaque(bool opaque)
+void LayerChromium::setContentsOpaque(bool opaque)
{
- if (m_opaque == opaque)
+ if (m_contentsOpaque == opaque)
return;
- m_opaque = opaque;
+ m_contentsOpaque = opaque;
setNeedsDisplay();
}
@@ -545,7 +545,7 @@ void LayerChromium::pushPropertiesTo(CCLayerImpl* layer)
layer->setNonFastScrollableRegion(m_nonFastScrollableRegion);
m_nonFastScrollableRegionChanged = false;
}
- layer->setOpaque(m_opaque);
+ layer->setContentsOpaque(m_contentsOpaque);
if (!opacityIsAnimating())
layer->setOpacity(m_opacity);
layer->setPosition(m_position);
@@ -768,7 +768,7 @@ void LayerChromium::notifyAnimationFinished(double wallClockTime)
Region LayerChromium::visibleContentOpaqueRegion() const
{
- if (opaque())
+ if (contentsOpaque())
return visibleContentRect();
return Region();
}

Powered by Google App Engine
This is Rietveld 408576698