Renamed LayerChromium::opaque to LayerChromium::contentsOpaque. Having both opaque and opacity on t…

cc/CCLayerImpl.cpp

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "CCLayerImpl.h"
 
@@ skipping 19 matching lines @@
     , m_anchorPoint(0.5, 0.5)
     , m_anchorPointZ(0)
     , m_scrollable(false)
     , m_shouldScrollOnMainThread(false)
     , m_haveWheelEventHandlers(false)
     , m_backgroundColor(0)
     , m_doubleSided(true)
     , m_layerPropertyChanged(false)
     , m_layerSurfacePropertyChanged(false)
     , m_masksToBounds(false)
-    , m_opaque(false)
+    , m_contentsOpaque(false)
     , m_opacity(1.0)
     , m_preserves3D(false)
     , m_useParentBackfaceVisibility(false)
     , m_drawCheckerboardForMissingTiles(false)
     , m_useLCDText(false)
     , m_drawsContent(false)
     , m_forceRenderSurface(false)
     , m_isContainerForFixedPositionLayers(false)
     , m_fixedToContainerLayer(false)
     , m_pageScaleDelta(1)
@@ skipping 66 matching lines @@
 {
     for (size_t i = 0; i < m_children.size(); ++i) {
         if (m_children[i]->drawsContent() || m_children[i]->descendantDrawsContent())
             return true;
     }
     return false;
 }
 
 scoped_ptr<CCSharedQuadState> CCLayerImpl::createSharedQuadState() const
 {
-    return CCSharedQuadState::create(m_drawTransform, m_visibleContentRect, m_drawableContentRect, m_drawOpacity, m_opaque);
+    return CCSharedQuadState::create(m_drawTransform, m_visibleContentRect, m_drawableContentRect, m_drawOpacity, m_contentsOpaque);
 }
 
 void CCLayerImpl::willDraw(CCResourceProvider*)
 {
 #ifndef NDEBUG
     // willDraw/didDraw must be matched.
     ASSERT(!m_betweenWillDrawAndDidDraw);
     m_betweenWillDrawAndDidDraw = true;
 #endif
 }
@@ skipping 347 matching lines @@
 
 void CCLayerImpl::setMasksToBounds(bool masksToBounds)
 {
     if (m_masksToBounds == masksToBounds)
         return;
 
     m_masksToBounds = masksToBounds;
     noteLayerPropertyChangedForSubtree();
 }
 
-void CCLayerImpl::setOpaque(bool opaque)
+void CCLayerImpl::setContentsOpaque(bool opaque)
 {
-    if (m_opaque == opaque)
+    if (m_contentsOpaque == opaque)
         return;
 
-    m_opaque = opaque;
+    m_contentsOpaque = opaque;
     noteLayerPropertyChangedForSubtree();
 }
 
 void CCLayerImpl::setOpacity(float opacity)
 {
     if (m_opacity == opacity)
         return;
 
     m_opacity = opacity;
     m_layerSurfacePropertyChanged = true;
@@ skipping 109 matching lines @@
 {
     if (m_doubleSided == doubleSided)
         return;
 
     m_doubleSided = doubleSided;
     noteLayerPropertyChangedForSubtree();
 }
 
 Region CCLayerImpl::visibleContentOpaqueRegion() const
 {
-    if (opaque())
+    if (contentsOpaque())
         return visibleContentRect();
     return Region();
 }
 
 void CCLayerImpl::didLoseContext()
 {
 }
 
 void CCLayerImpl::setMaxScrollPosition(const IntSize& maxScrollPosition)
 {
@@ skipping 27 matching lines @@
     if (!m_scrollbarAnimationController)
         m_scrollbarAnimationController = CCScrollbarAnimationController::create(this);
     m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer);
     m_scrollbarAnimationController->updateScrollOffset(this);
 }
 
 }
 
 
 #endif // USE(ACCELERATED_COMPOSITING)