Changeset 95406 in webkit

Timestamp:

Sep 19, 2011 2:19:33 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Re-name LayerChromium border functions to reflect that
they are only for debug use.
​https://bugs.webkit.org/show_bug.cgi?id=68212

Patch by Shawn Singh <​shawnsingh@chromium.org> on 2011-09-19
Reviewed by James Robinson.

Code cleanup towards unit testing.

• platform/graphics/chromium/GraphicsLayerChromium.cpp:

(WebCore::GraphicsLayerChromium::clearBackgroundColor):
(WebCore::GraphicsLayerChromium::setDebugBackgroundColor):
(WebCore::GraphicsLayerChromium::setDebugBorder):
(WebCore::GraphicsLayerChromium::updateLayerBackgroundColor):
(WebCore::GraphicsLayerChromium::setupContentsLayer):

• platform/graphics/chromium/LayerChromium.cpp:

(WebCore::LayerChromium::setDebugBorderColor):
(WebCore::LayerChromium::setDebugBorderWidth):

• platform/graphics/chromium/LayerChromium.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/GraphicsLayerChromium.cpp (modified) (6 diffs)
• platform/graphics/chromium/LayerChromium.cpp (modified) (2 diffs)
• platform/graphics/chromium/LayerChromium.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-19  Shawn Singh  <shawnsingh@chromium.org>
+
+        Re-name LayerChromium border functions to reflect that
+        they are only for debug use.
+        https://bugs.webkit.org/show_bug.cgi?id=68212
+
+        Reviewed by James Robinson.
+
+        Code cleanup towards unit testing.
+
+        * platform/graphics/chromium/GraphicsLayerChromium.cpp:
+        (WebCore::GraphicsLayerChromium::clearBackgroundColor):
+        (WebCore::GraphicsLayerChromium::setDebugBackgroundColor):
+        (WebCore::GraphicsLayerChromium::setDebugBorder):
+        (WebCore::GraphicsLayerChromium::updateLayerBackgroundColor):
+        (WebCore::GraphicsLayerChromium::setupContentsLayer):
+        * platform/graphics/chromium/LayerChromium.cpp:
+        (WebCore::LayerChromium::setDebugBorderColor):
+        (WebCore::LayerChromium::setDebugBorderWidth):
+        * platform/graphics/chromium/LayerChromium.h:
+
 2011-09-18  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp

@@ -64 +64 @@
 namespace WebCore {
 
-static void setLayerBorderColor(LayerChromium& layer, const Color& color)
-{
-    layer.setBorderColor(color);
-}
-
-static void clearBorderColor(LayerChromium& layer)
-{
-    layer.setBorderColor(static_cast<RGBA32>(0));
-}
-
-static void setLayerBackgroundColor(LayerChromium& layer, const Color& color)
-{
-    layer.setBackgroundColor(color);
-}
-
-static void clearLayerBackgroundColor(LayerChromium& layer)
-{
-    layer.setBackgroundColor(static_cast<RGBA32>(0));
-}
-
 PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
 {
@@ -272 +252 @@
 
     GraphicsLayer::clearBackgroundColor();
-    clearLayerBackgroundColor(*m_contentsLayer);
+    m_contentsLayer->setBackgroundColor(static_cast<RGBA32>(0));
 }
 
@@ -450 +430 @@
 {
     if (color.isValid())
-        setLayerBackgroundColor(*m_layer, color);
+        m_layer->setBackgroundColor(color);
     else
-        clearLayerBackgroundColor(*m_layer);
+        m_layer->setBackgroundColor(static_cast<RGBA32>(0));
 }
 
@@ -458 +438 @@
 {
     if (color.isValid()) {
-        setLayerBorderColor(*m_layer, color);
-        m_layer->setBorderWidth(borderWidth);
+        m_layer->setDebugBorderColor(color);
+        m_layer->setDebugBorderWidth(borderWidth);
     } else {
-        clearBorderColor(*m_layer);
-        m_layer->setBorderWidth(0);
+        m_layer->setDebugBorderColor(static_cast<RGBA32>(0));
+        m_layer->setDebugBorderWidth(0);
     }
 }
@@ -632 +612 @@
     // We never create the contents layer just for background color yet.
     if (m_backgroundColorSet)
-        setLayerBackgroundColor(*m_contentsLayer, m_backgroundColor);
+        m_contentsLayer->setBackgroundColor(m_backgroundColor);
     else
-        clearLayerBackgroundColor(*m_contentsLayer);
+        m_contentsLayer->setBackgroundColor(static_cast<RGBA32>(0));
 }
 
@@ -673 +653 @@
 
         if (showDebugBorders()) {
-            setLayerBorderColor(*m_contentsLayer, Color(0, 0, 128, 180));
-            m_contentsLayer->setBorderWidth(1);
+            m_contentsLayer->setDebugBorderColor(Color(0, 0, 128, 180));
+            m_contentsLayer->setDebugBorderWidth(1);
         }
     }

trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp

@@ -322 +322 @@
 }
 
-void LayerChromium::setBorderColor(const Color& color)
+void LayerChromium::setDebugBorderColor(const Color& color)
 {
     m_debugBorderColor = color;
@@ -328 +328 @@
 }
 
-void LayerChromium::setBorderWidth(float width)
+void LayerChromium::setDebugBorderWidth(float width)
 {
     m_debugBorderWidth = width;

trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h

@@ -177 +177 @@
     virtual void protectVisibleTileTextures() { }
 
-    // These exists just for debugging (via drawDebugBorder()).
-    void setBorderColor(const Color&);
-
+    // These exist just for debugging (via drawDebugBorder()).
+    void setDebugBorderColor(const Color&);
+    void setDebugBorderWidth(float);
     void drawDebugBorder();
-
-    void setBorderWidth(float);
 
     virtual void pushPropertiesTo(CCLayerImpl*);