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

cc/LayerChromium.cpp

 // Copyright 2010 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 "LayerChromium.h"
 
 #include "CCActiveAnimation.h"
@@ skipping 32 matching lines @@
     , m_anchorPoint(0.5, 0.5)
     , m_backgroundColor(0)
     , m_debugBorderColor(0)
     , m_debugBorderWidth(0)
     , m_opacity(1.0)
     , m_anchorPointZ(0)
     , m_isContainerForFixedPositionLayers(false)
     , m_fixedToContainerLayer(false)
     , m_isDrawable(false)
     , m_masksToBounds(false)
-    , m_opaque(false)
+    , m_contentsOpaque(false)
     , m_doubleSided(true)
     , m_useLCDText(false)
     , m_preserves3D(false)
     , m_useParentBackfaceVisibility(false)
     , m_drawCheckerboardForMissingTiles(false)
     , m_forceRenderSurface(false)
     , m_replicaLayer(0)
     , m_drawOpacity(0)
     , m_drawOpacityIsAnimating(false)
     , m_renderTarget(0)
@@ skipping 277 matching lines @@
         return;
     m_opacity = opacity;
     setNeedsCommit();
 }
 
 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();
 }
 
 void LayerChromium::setPosition(const FloatPoint& position)
 {
     if (m_position == position)
         return;
     m_position = position;
     setNeedsCommit();
 }
@@ skipping 172 matching lines @@
     layer->setMasksToBounds(m_masksToBounds);
     layer->setScrollable(m_scrollable);
     layer->setShouldScrollOnMainThread(m_shouldScrollOnMainThread);
     layer->setHaveWheelEventHandlers(m_haveWheelEventHandlers);
     // Copying a Region is more expensive than most layer properties, since it involves copying two Vectors that may be
     // arbitrarily large depending on page content, so we only push the property if it's changed.
     if (m_nonFastScrollableRegionChanged) {
         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);
     layer->setIsContainerForFixedPositionLayers(m_isContainerForFixedPositionLayers);
     layer->setFixedToContainerLayer(m_fixedToContainerLayer);
     layer->setPreserves3D(preserves3D());
     layer->setUseParentBackfaceVisibility(m_useParentBackfaceVisibility);
     layer->setScrollPosition(m_scrollPosition);
     layer->setMaxScrollPosition(m_maxScrollPosition);
     layer->setSublayerTransform(m_sublayerTransform);
@@ skipping 202 matching lines @@
 }
 
 void LayerChromium::notifyAnimationFinished(double wallClockTime)
 {
     if (m_layerAnimationDelegate)
         m_layerAnimationDelegate->notifyAnimationFinished(wallClockTime);
 }
 
 Region LayerChromium::visibleContentOpaqueRegion() const
 {
-    if (opaque())
+    if (contentsOpaque())
         return visibleContentRect();
     return Region();
 }
 
 ScrollbarLayerChromium* LayerChromium::toScrollbarLayerChromium()
 {
     return 0;
 }
 
 void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChromium> >::iterator, void*)
 {
     // Currently we don't use z-order to decide what to paint, so there's no need to actually sort LayerChromiums.
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)