Modified: trunk/Source/WebCore/ChangeLog (161672 => 161673)
--- trunk/Source/WebCore/ChangeLog 2014-01-10 21:37:34 UTC (rev 161672)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 21:42:07 UTC (rev 161673)
@@ -1,3 +1,14 @@
+2014-01-10 Joseph Pecoraro <[email protected]>
+
+ [CSS Blending] Log blending as a layer creation reason in the WI
+ https://bugs.webkit.org/show_bug.cgi?id=126159
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorLayerTreeAgent.cpp:
+ (WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer):
+ * inspector/protocol/LayerTree.json:
+
2014-01-10 Andy Estes <[email protected]>
Fix some iOS build errors during bindings generation.
Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (161672 => 161673)
--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2014-01-10 21:37:34 UTC (rev 161672)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2014-01-10 21:42:07 UTC (rev 161673)
@@ -307,6 +307,9 @@
if (reasonsBitmask & CompositingReasonRoot)
compositingReasons->setRoot(true);
+
+ if (reasonsBitmask & CompositingReasonBlending)
+ compositingReasons->setBlending(true);
}
String InspectorLayerTreeAgent::bind(const RenderLayer* layer)
Modified: trunk/Source/WebCore/inspector/protocol/LayerTree.json (161672 => 161673)
--- trunk/Source/WebCore/inspector/protocol/LayerTree.json 2014-01-10 21:37:34 UTC (rev 161672)
+++ trunk/Source/WebCore/inspector/protocol/LayerTree.json 2014-01-10 21:42:07 UTC (rev 161673)
@@ -69,7 +69,8 @@
{ "name": "blendingWithCompositedDescendants", "type": "boolean", "optional": true, "description": "Composition due to association with an element with CSS blending applied and composited descendants." },
{ "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." },
- { "name": "root", "type": "boolean", "optional": true, "description": "Composition due to association with the root element." }
+ { "name": "root", "type": "boolean", "optional": true, "description": "Composition due to association with the root element." },
+ { "name": "blending", "type": "boolean", "optional": true, "description": "Composition due to association with an element with a \"blend-mode\" style." }
]
}
],
Modified: trunk/Source/WebInspectorUI/ChangeLog (161672 => 161673)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-01-10 21:37:34 UTC (rev 161672)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-01-10 21:42:07 UTC (rev 161673)
@@ -1,3 +1,14 @@
+2014-01-10 Joseph Pecoraro <[email protected]>
+
+ [CSS Blending] Log blending as a layer creation reason in the WI
+ https://bugs.webkit.org/show_bug.cgi?id=126159
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/LayerTreeSidebarPanel.js:
+ (WebInspector.LayerTreeSidebarPanel.prototype._populateListOfCompositingReasons):
+
2014-01-10 Peter Molnar <[email protected]>
Add missing function stub in InspectorFrontendHostStub.js
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (161672 => 161673)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2014-01-10 21:37:34 UTC (rev 161672)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2014-01-10 21:42:07 UTC (rev 161673)
@@ -149,6 +149,7 @@
l o c a l i z e d S t r i n g s [ "