Merge 148856 "Disable solid background color optimization for composited layers."

chromium/GraphicsLayerChromium.cpp

Index: chromium/GraphicsLayerChromium.cpp
===================================================================
--- chromium/GraphicsLayerChromium.cpp	(revision 149028)
+++ chromium/GraphicsLayerChromium.cpp	(working copy)
@@ -517,36 +517,6 @@
 
 void GraphicsLayerChromium::setContentsToSolidColor(const Color& color)
 {
-    if (color == m_contentsSolidColor)
-        return;
-
-    bool childrenChanged = false;
-
-    m_contentsSolidColor = color;
-
-    if (color.isValid() && color.alpha()) {
-        if (!m_contentsSolidColorLayer) {
-            m_contentsSolidColorLayer = adoptPtr(Platform::current()->compositorSupport()->createSolidColorLayer());
-            registerContentsLayer(m_contentsSolidColorLayer->layer());
-
-            setupContentsLayer(m_contentsSolidColorLayer->layer());
-            childrenChanged = true;
-        }
-
-        m_contentsSolidColorLayer->setBackgroundColor(color.rgb());
-        updateContentsRect();
-    } else {
-        if (m_contentsSolidColorLayer) {
-            childrenChanged = true;
-            unregisterContentsLayer(m_contentsSolidColorLayer->layer());
-            m_contentsSolidColorLayer.clear();
-        }
-        m_contentsLayer = 0;
-    }
-
-    if (childrenChanged)
-        updateChildList();
-
 }
 
 static HashSet<int>* s_registeredLayerSet;