Attachment 220858 Details for Bug 126159 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

blend.patch (text/plain), 4.49 KB, created by Joseph Pecoraro on 2014-01-10 10:48:54 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2014-01-10 10:48:54 PST

Size: 4.49 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1d61df2..98c0a90 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2014-01-10  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        [CSS Blending] Log blending as a layer creation reason in the WI
>+        https://bugs.webkit.org/show_bug.cgi?id=126159
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * inspector/InspectorLayerTreeAgent.cpp:
>+        (WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer):
>+        * inspector/protocol/LayerTree.json:
>+
> 2014-01-10  Daniel Bates  <dabates@apple.com>
> 
>         Speculative build fix for Windows following <http://trac.webkit.org/changeset/161638>
>diff --git a/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp b/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp
>index c96830e..385a397 100644
>--- a/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp
>+++ b/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp
>@@ -307,6 +307,9 @@ void InspectorLayerTreeAgent::reasonsForCompositingLayer(ErrorString* errorStrin
> 
>     if (reasonsBitmask & CompositingReasonRoot)
>         compositingReasons->setRoot(true);
>+
>+    if (reasonsBitmask & CompositingReasonBlending)
>+        compositingReasons->setBlending(true);
> }
> 
> String InspectorLayerTreeAgent::bind(const RenderLayer* layer)
>diff --git a/Source/WebCore/inspector/protocol/LayerTree.json b/Source/WebCore/inspector/protocol/LayerTree.json
>index 1e2a471..33f7dbf 100644
>--- a/Source/WebCore/inspector/protocol/LayerTree.json
>+++ b/Source/WebCore/inspector/protocol/LayerTree.json
>@@ -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." }
>             ]
>         }
>     ],
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 9fe3d27..53d003b 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,14 @@
>+2014-01-10  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        [CSS Blending] Log blending as a layer creation reason in the WI
>+        https://bugs.webkit.org/show_bug.cgi?id=126159
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Localizations/en.lproj/localizedStrings.js:
>+        * UserInterface/LayerTreeSidebarPanel.js:
>+        (WebInspector.LayerTreeSidebarPanel.prototype._populateListOfCompositingReasons):
>+
> 2014-01-10  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
> 
>         Add missing function stub in InspectorFrontendHostStub.js
>diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>index d138ecc1bbc6827b96bbf6920b83411deb7286b2..94d8865857e5f0633bee0abf0dd9e7cf3373df9a 100644
>GIT binary patch
>delta 74
>zcmZ28f%(=%<_+t8g_9U^7*ZMX7*ZH?8FCr&fpqHR34W$n#pV3cCyV+?O|JJ>nY`Xt
>KZ?nGN-%0==P!=)(
>
>delta 22
>ecmcaLk$KGo<_+t8C$IO@o9ypzvH7r{cohJ5iwV{M
>
>diff --git a/Source/WebInspectorUI/UserInterface/LayerTreeSidebarPanel.js b/Source/WebInspectorUI/UserInterface/LayerTreeSidebarPanel.js
>index 9310431..fbe9ed0 100644
>--- a/Source/WebInspectorUI/UserInterface/LayerTreeSidebarPanel.js
>+++ b/Source/WebInspectorUI/UserInterface/LayerTreeSidebarPanel.js
>@@ -428,6 +428,8 @@ WebInspector.LayerTreeSidebarPanel.prototype = {
>             addReason(WebInspector.UIString("Element has âtransform-style: preserve-3dâ style"));
>         if (compositingReasons.root)
>             addReason(WebInspector.UIString("Element is the root element"));
>+        if (compositingReasons.blending)
>+            addReason(WebInspector.UIString("Element has âblend-modeâ style"));
>     }
> };
>

Actions: View | Formatted Diff | Diff

Attachments on bug 126159: 220752 | 220858 | 220859