Changeset 158889 in webkit

Timestamp:

Nov 7, 2013 5:42:59 PM (10 years ago)

Author:

Simon Fraser

Message:

Lots of layers get solid color but transparent contents layers now
​https://bugs.webkit.org/show_bug.cgi?id=123537

Source/WebCore:

Reviewed by Tim Horton.

We call rendererBackgroundColor() to determine the layer's background color,
but on most elements this returns the transparent color (a valid color).
This caused us to allocate a contentsLayer, and use the transparent color as its
backgroundColor, which was wasteful.

Fix by only making a background-color layer if the color is not transparent (zero alpha).

Also avoid making a new contents layer on every color change, and make sure that
we don't do implicit animations for backgroundColor, and some other properties
that were omitted by mistake.

Layer tree dumps don't dump content layers, so no way to test easily.

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::setContentsToSolidColor):

• platform/graphics/ca/mac/PlatformCALayerMac.mm:

(nullActionsDictionary):

Source/WebKit2:

Reviewed by Tim Horton.

Add some properties to the list of things not to implicitly animate.

• Shared/mac/RemoteLayerTreePropertyApplier.mm:

(WebKit::RemoteLayerTreePropertyApplier::disableActionsForLayer):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (1 diff)
• WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Lots of layers get solid color but transparent contents layers now
+        https://bugs.webkit.org/show_bug.cgi?id=123537
+
+        Reviewed by Tim Horton.
+        
+        We call rendererBackgroundColor() to determine the layer's background color,
+        but on most elements this returns the transparent color (a valid color).
+        This caused us to allocate a contentsLayer, and use the transparent color as its
+        backgroundColor, which was wasteful.
+        
+        Fix by only making a background-color layer if the color is not transparent (zero alpha).
+        
+        Also avoid making a new contents layer on every color change, and make sure that
+        we don't do implicit animations for backgroundColor, and some other properties
+        that were omitted by mistake.
+
+        Layer tree dumps don't dump content layers, so no way to test easily.
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::setContentsToSolidColor):
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        (nullActionsDictionary):
+
 2013-11-07  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -819 +819 @@
 
     m_contentsSolidColor = color;
-
-    if (m_contentsSolidColor.isValid()) {
-        m_contentsLayerPurpose = ContentsLayerForBackgroundColor;
-        m_contentsLayer = createPlatformCALayer(PlatformCALayer::LayerTypeLayer, this);
+    
+    bool contentsLayerChanged = false;
+
+    if (m_contentsSolidColor.isValid() && m_contentsSolidColor.alpha()) {
+        if (!m_contentsLayer || m_contentsLayerPurpose != ContentsLayerForBackgroundColor) {
+            m_contentsLayerPurpose = ContentsLayerForBackgroundColor;
+            m_contentsLayer = createPlatformCALayer(PlatformCALayer::LayerTypeLayer, this);
 #ifndef NDEBUG
-        m_contentsLayer->setName("Background Color Layer");
+            m_contentsLayer->setName("Background Color Layer");
 #endif
+            contentsLayerChanged = true;
+        }
     } else {
+        contentsLayerChanged = m_contentsLayer;
         m_contentsLayerPurpose = NoContentsLayer;
         m_contentsLayer = 0;
     }
 
-    noteSublayersChanged();
+    if (contentsLayerChanged)
+        noteSublayersChanged();
+
     noteLayerPropertyChanged(ContentsColorLayerChanged);
 }

trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm

@@ -148 +148 @@
                              nullValue, @"anchorPoint",
                              nullValue, @"anchorPointZ",
+                             nullValue, @"backgroundColor",
+                             nullValue, @"borderColor",
+                             nullValue, @"borderWidth",
                              nullValue, @"bounds",
                              nullValue, @"contents",
                              nullValue, @"contentsRect",
+                             nullValue, @"contentsScale",
+                             nullValue, @"cornerRadius",
                              nullValue, @"opacity",
                              nullValue, @"position",

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-07  Simon Fraser  <simon.fraser@apple.com>
+
+        Lots of layers get solid color but transparent contents layers now
+        https://bugs.webkit.org/show_bug.cgi?id=123537
+
+        Reviewed by Tim Horton.
+        
+        Add some properties to the list of things not to implicitly animate.
+
+        * Shared/mac/RemoteLayerTreePropertyApplier.mm:
+        (WebKit::RemoteLayerTreePropertyApplier::disableActionsForLayer):
+
 2013-11-07  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm

@@ -162 +162 @@
             @"anchorPoint" : nullValue,
             @"anchorPointZ" : nullValue,
+            @"backgroundColor" : nullValue,
+            @"borderColor" : nullValue,
+            @"borderWidth" : nullValue,
             @"bounds" : nullValue,
             @"contents" : nullValue,
             @"contentsRect" : nullValue,
+            @"contentsScale" : nullValue,
+            @"cornerRadius" : nullValue,
             @"opacity" : nullValue,
             @"position" : nullValue,