Changeset 147178 in webkit

Timestamp:

Mar 28, 2013 4:08:43 PM (11 years ago)

Author:

wangxianzhu@chromium.org

Message:

[Chromium] Don't create SolidColorLayer for full transparent background
​https://bugs.webkit.org/show_bug.cgi?id=113524

Reviewed by James Robinson.

Source/WebCore:

Test: GraphicsLayerChromiumTest.setContentsToSolidColor

• platform/graphics/chromium/GraphicsLayerChromium.cpp:

(WebCore::GraphicsLayerChromium::setContentsToSolidColor):

Source/WebKit/chromium:

• tests/GraphicsLayerChromiumTest.cpp:

(GraphicsLayerChromiumTest::setContentsToSolidColor):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-28  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        [Chromium] Don't create SolidColorLayer for full transparent background
+        https://bugs.webkit.org/show_bug.cgi?id=113524
+
+        Reviewed by James Robinson.
+
+        Test: GraphicsLayerChromiumTest.setContentsToSolidColor
+
+        * platform/graphics/chromium/GraphicsLayerChromium.cpp:
+        (WebCore::GraphicsLayerChromium::setContentsToSolidColor):
+
 2013-03-28  Arnaud Renevier  <a.renevier@sisa.samsung.com>
 

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

@@ -525 +525 @@
     m_contentsSolidColor = color;
 
-    if (color.isValid()) {
+    if (color.isValid() && color.alpha()) {
         if (!m_contentsSolidColorLayer) {
             m_contentsSolidColorLayer = adoptPtr(Platform::current()->compositorSupport()->createSolidColorLayer());

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-03-28  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        [Chromium] Don't create SolidColorLayer for full transparent background
+        https://bugs.webkit.org/show_bug.cgi?id=113524
+
+        Reviewed by James Robinson.
+
+        * tests/GraphicsLayerChromiumTest.cpp:
+        (GraphicsLayerChromiumTest::setContentsToSolidColor):
+
 2013-03-28  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp

@@ -148 +148 @@
 }
 
+TEST_F(GraphicsLayerChromiumTest, setContentsToSolidColor)
+{
+    m_graphicsLayer->setContentsToSolidColor(Color::transparent);
+    EXPECT_FALSE(m_graphicsLayer->contentsLayer());
+
+    m_graphicsLayer->setContentsToSolidColor(Color::white);
+    EXPECT_TRUE(m_graphicsLayer->contentsLayer());
+
+    m_graphicsLayer->setContentsToSolidColor(Color());
+    EXPECT_FALSE(m_graphicsLayer->contentsLayer());
+}
+
 } // namespace