Changeset 166800 in webkit

Timestamp:

Apr 4, 2014 1:34:23 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Blending] Add compositing reason for isolation.
​https://bugs.webkit.org/show_bug.cgi?id=131153

Patch by Ion Rosca <Ion Rosca> on 2014-04-04
Reviewed by Joseph Pecoraro.

Source/WebCore:

There are 2 reasons involving blend modes for a layer to be composited:
1) the layer has blend mode and has composited descendants: CompositingReasonBlendingWithCompositedDescendants.
2) the layer has to isolate composited blending descendants: CompositingReasonIsolatesCompositedBlendingDescendants

Test: inspector-protocol/layers/layers-blending-compositing-reasons.html

• inspector/InspectorLayerTreeAgent.cpp:

(WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer):

• inspector/protocol/LayerTree.json:
• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::reasonsForCompositing):
(WebCore::RenderLayerCompositor::logReasonsForCompositing):

• rendering/RenderLayerCompositor.h: adding CompositingReasonIsolatesCompositedBlendingDescendants.

Source/WebInspectorUI:

• Localizations/en.lproj/localizedStrings.js:
• UserInterface/Views/LayerTreeSidebarPanel.js:

(WebInspector.LayerTreeSidebarPanel.prototype._populateListOfCompositingReasons):

LayoutTests:

• inspector-protocol/layers/layers-blending-compositing-reasons-expected.txt: Added.
• inspector-protocol/layers/layers-blending-compositing-reasons.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector-protocol/layers/layers-blending-compositing-reasons-expected.txt (added)
• LayoutTests/inspector-protocol/layers/layers-blending-compositing-reasons.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (modified) (1 diff)
• Source/WebCore/inspector/protocol/LayerTree.json (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayerCompositor.h (modified) (1 diff)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Views/LayerTreeSidebarPanel.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-04  Ion Rosca  <rosca@adobe.com>
+
+        [CSS Blending] Add compositing reason for isolation.
+        https://bugs.webkit.org/show_bug.cgi?id=131153
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector-protocol/layers/layers-blending-compositing-reasons-expected.txt: Added.
+        * inspector-protocol/layers/layers-blending-compositing-reasons.html: Added.
+
 2014-04-04  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-04  Ion Rosca  <rosca@adobe.com>
+
+        [CSS Blending] Add compositing reason for isolation.
+        https://bugs.webkit.org/show_bug.cgi?id=131153
+
+        Reviewed by Joseph Pecoraro.
+
+        There are 2 reasons involving blend modes for a layer to be composited:
+        1) the layer has blend mode and has composited descendants: CompositingReasonBlendingWithCompositedDescendants.
+        2) the layer has to isolate composited blending descendants: CompositingReasonIsolatesCompositedBlendingDescendants
+
+        Test: inspector-protocol/layers/layers-blending-compositing-reasons.html
+
+        * inspector/InspectorLayerTreeAgent.cpp:
+        (WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer):
+        * inspector/protocol/LayerTree.json:
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::reasonsForCompositing):
+        (WebCore::RenderLayerCompositor::logReasonsForCompositing):
+        * rendering/RenderLayerCompositor.h: adding CompositingReasonIsolatesCompositedBlendingDescendants.
+
 2014-04-04  Bem Jones-Bey  <bjonesbe@adobe.com>
 

trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp

@@ -299 +299 @@
         compositingReasons->setBlendingWithCompositedDescendants(true);
 
+    if (reasonsBitmask & CompositingReasonIsolatesCompositedBlendingDescendants)
+        compositingReasons->setIsolatesCompositedBlendingDescendants(true);
+
     if (reasonsBitmask & CompositingReasonPerspective)
         compositingReasons->setPerspective(true);

trunk/Source/WebCore/inspector/protocol/LayerTree.json

@@ -68 +68 @@
                 { "name": "filterWithCompositedDescendants", "type": "boolean", "optional": true, "description": "Composition due to association with an element with CSS filters applied and composited descendants." },
                 { "name": "blendingWithCompositedDescendants", "type": "boolean", "optional": true, "description": "Composition due to association with an element with CSS blending applied and composited descendants." },
+                { "name": "isolatesCompositedBlendingDescendants", "type": "boolean", "optional": true, "description": "Composition due to association with an element isolating compositing descendants having CSS blending applied." },
                 { "name": "perspective", "type": "boolean", "optional": true, "description": "Composition due to association with an element with perspective applied." },
                 { "name": "preserve3D", "type": "boolean", "optional": true, "description": "Composition due to association with an element with a \"transform-style: preserve-3d\" style." },

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -2128 +2128 @@
 #if ENABLE(CSS_COMPOSITING)
         if (layer.isolatesCompositedBlending())
+            reasons |= CompositingReasonIsolatesCompositedBlendingDescendants;
+
+        if (layer.hasBlendMode())
             reasons |= CompositingReasonBlendingWithCompositedDescendants;
 #endif
@@ -2203 +2206 @@
     if (reasons & CompositingReasonFilterWithCompositedDescendants)
         return "filter with composited descendants";
-            
+
+#if ENABLE(CSS_COMPOSITING)
     if (reasons & CompositingReasonBlendingWithCompositedDescendants)
         return "blending with composited descendants";
+
+    if (reasons & CompositingReasonIsolatesCompositedBlendingDescendants)
+        return "isolates composited blending descendants";
+#endif
 
     if (reasons & CompositingReasonPerspective)

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -81 +81 @@
     CompositingReasonPerspective                            = 1 << 21,
     CompositingReasonPreserve3D                             = 1 << 22,
-    CompositingReasonRoot                                   = 1 << 23
+    CompositingReasonRoot                                   = 1 << 23,
+    CompositingReasonIsolatesCompositedBlendingDescendants  = 1 << 24,
 };
 typedef unsigned CompositingReasons;

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2014-04-04  Ion Rosca  <rosca@adobe.com>
+
+        [CSS Blending] Add compositing reason for isolation.
+        https://bugs.webkit.org/show_bug.cgi?id=131153
+
+        Reviewed by Joseph Pecoraro.
+
+        * Localizations/en.lproj/localizedStrings.js:
+        * UserInterface/Views/LayerTreeSidebarPanel.js:
+        (WebInspector.LayerTreeSidebarPanel.prototype._populateListOfCompositingReasons):
+
 2014-04-02  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -151 +151 @@
 localizedStrings["Element establishes a stacking context"] = "Element establishes a stacking context";
 localizedStrings["Element has CSS blending applied and composited descendants"] = "Element has CSS blending applied and composited descendants";
+localizedStrings["Element is a stacking context and has composited descendants with CSS blending applied"] = "Element is a stacking context and has composited descendants with CSS blending applied";
 localizedStrings["Element has CSS filters applied"] = "Element has CSS filters applied";
 localizedStrings["Element has CSS filters applied and composited descendants"] = "Element has CSS filters applied and composited descendants";

trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeSidebarPanel.js

@@ -433 +433 @@
         if (compositingReasons.blendingWithCompositedDescendants)
             addReason(WebInspector.UIString("Element has CSS blending applied and composited descendants"));
+        if (compositingReasons.isolatesCompositedBlendingDescendants)
+            addReason(WebInspector.UIString("Element is a stacking context and has composited descendants with CSS blending applied"));
         if (compositingReasons.perspective)
             addReason(WebInspector.UIString("Element has perspective applied"));