Changeset 147470 in webkit

Timestamp:

Apr 2, 2013 11:23:30 AM (11 years ago)

Author:

senorblanco@chromium.org

Message:

[Skia] Enable GPU-accelerated Skia path for FEComposite filter.
​https://bugs.webkit.org/show_bug.cgi?id=113797

Reviewed by Adrienne Walker.

Source/WebCore:

Tests: css3/filters/effect-reference-composite-hw.html

css3/filters/effect-reference-composite.html

• WebCore.gypi:
• platform/graphics/filters/FEComposite.h:

Enable Skia DAG hook for FEComposite.

• platform/graphics/filters/skia/FECompositeSkia.cpp: Added.

(WebCore::FEComposite::createImageFilter):
Implement skia DAG builder for FEComposite, and implement generic
skia version of composite filter.

LayoutTests:

• css3/filters/effect-reference-composite-hw.html: Added.
• css3/filters/effect-reference-composite.html: Added.
• platform/chromium-linux/css3/filters/effect-reference-composite-expected.png: Added.
• platform/chromium-linux/css3/filters/effect-reference-composite-expected.txt: Added.
• platform/chromium-linux/css3/filters/effect-reference-composite-hw-expected.png: Added.
• platform/chromium-linux/css3/filters/effect-reference-composite-hw-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/filters/effect-reference-composite-hw.html (added)
• LayoutTests/css3/filters/effect-reference-composite.html (added)
• LayoutTests/platform/chromium-linux/css3/filters/effect-reference-composite-expected.png (added)
• LayoutTests/platform/chromium-linux/css3/filters/effect-reference-composite-expected.txt (added)
• LayoutTests/platform/chromium-linux/css3/filters/effect-reference-composite-hw-expected.png (added)
• LayoutTests/platform/chromium-linux/css3/filters/effect-reference-composite-hw-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.gypi (modified) (1 diff)
• Source/WebCore/platform/graphics/filters/FEComposite.h (modified) (1 diff)
• Source/WebCore/platform/graphics/filters/skia/FECompositeSkia.cpp (added)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-02  Stephen White  <senorblanco@chromium.org>
+
+        [Skia] Enable GPU-accelerated Skia path for FEComposite filter.
+        https://bugs.webkit.org/show_bug.cgi?id=113797
+
+        Reviewed by Adrienne Walker.
+
+        * css3/filters/effect-reference-composite-hw.html: Added.
+        * css3/filters/effect-reference-composite.html: Added.
+        * platform/chromium-linux/css3/filters/effect-reference-composite-expected.png: Added.
+        * platform/chromium-linux/css3/filters/effect-reference-composite-expected.txt: Added.
+        * platform/chromium-linux/css3/filters/effect-reference-composite-hw-expected.png: Added.
+        * platform/chromium-linux/css3/filters/effect-reference-composite-hw-expected.txt: Added.
+
 2013-04-02  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-02  Stephen White  <senorblanco@chromium.org>
+
+        [Skia] Enable GPU-accelerated Skia path for FEComposite filter.
+        https://bugs.webkit.org/show_bug.cgi?id=113797
+
+        Reviewed by Adrienne Walker.
+
+        Tests: css3/filters/effect-reference-composite-hw.html
+               css3/filters/effect-reference-composite.html
+
+        * WebCore.gypi:
+        * platform/graphics/filters/FEComposite.h:
+        Enable Skia DAG hook for FEComposite.
+        * platform/graphics/filters/skia/FECompositeSkia.cpp: Added.
+        (WebCore::FEComposite::createImageFilter):
+        Implement skia DAG builder for FEComposite, and implement generic
+        skia version of composite filter.
+
 2013-04-02  Andrey Lushnikov  <lushnikov@chromium.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -4088 +4088 @@
             'platform/graphics/filters/skia/FEBlendSkia.cpp',
             'platform/graphics/filters/skia/FEColorMatrixSkia.cpp',
+            'platform/graphics/filters/skia/FECompositeSkia.cpp',
             'platform/graphics/filters/skia/FEComponentTransferSkia.cpp',
             'platform/graphics/filters/skia/FEConvolveMatrixSkia.cpp',

trunk/Source/WebCore/platform/graphics/filters/FEComposite.h

@@ -69 +69 @@
     virtual TextStream& externalRepresentation(TextStream&, int indention) const;
 
+#if USE(SKIA)
+    virtual SkImageFilter* createImageFilter(SkiaImageFilterBuilder*);
+#endif
+
 protected:
     virtual bool requiresValidPreMultipliedPixels() OVERRIDE { return m_type != FECOMPOSITE_OPERATOR_ARITHMETIC; }