Changeset 223254 in webkit

Timestamp:

Oct 12, 2017, 2:12:36 PM (8 years ago)

Author:

Simon Fraser

Message:

Don't assert if mix-blend-mode is set to a non-separable blend mode on a composited layer
​https://bugs.webkit.org/show_bug.cgi?id=178196
rdar://problem/34942337

Reviewed by Dan Bates.

Source/WebCore:

Core Animation doesn't support non-separable blend modes (hue, saturation, color, luminosity)
on layers, but don't assert if we try to use them.

Test: compositing/filters/blend-mode-saturation.html

• platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm:

(PlatformCAFilters::setBlendingFiltersOnLayer):

LayoutTests:

• compositing/filters/blend-mode-saturation-expected.txt: Added.
• compositing/filters/blend-mode-saturation.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/filters/blend-mode-saturation-expected.txt (added)
• LayoutTests/compositing/filters/blend-mode-saturation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-10-11  Simon Fraser  <simon.fraser@apple.com>
+
+        Don't assert if mix-blend-mode is set to a non-separable blend mode on a composited layer
+        https://bugs.webkit.org/show_bug.cgi?id=178196
+        rdar://problem/34942337
+
+        Reviewed by Dan Bates.
+
+        * compositing/filters/blend-mode-saturation-expected.txt: Added.
+        * compositing/filters/blend-mode-saturation.html: Added.
+
 2017-10-12  John Wilander  <wilander@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-11  Simon Fraser  <simon.fraser@apple.com>
+
+        Don't assert if mix-blend-mode is set to a non-separable blend mode on a composited layer
+        https://bugs.webkit.org/show_bug.cgi?id=178196
+        rdar://problem/34942337
+
+        Reviewed by Dan Bates.
+
+        Core Animation doesn't support non-separable blend modes (hue, saturation, color, luminosity)
+        on layers, but don't assert if we try to use them.
+
+        Test: compositing/filters/blend-mode-saturation.html
+
+        * platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm:
+        (PlatformCAFilters::setBlendingFiltersOnLayer):
+
 2017-10-12  John Wilander  <wilander@apple.com>
 

trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm

@@ -587 +587 @@
         filter = [CAFilter filterWithType:kCAFilterPlusL];
         break;
+    case BlendModeHue:
+    case BlendModeSaturation:
+    case BlendModeColor:
+    case BlendModeLuminosity:
+        // FIXME: CA does't support non-separable blend modes on compositing filters.
+        break;
     default:
         ASSERT_NOT_REACHED();