Changeset 146454 in webkit


Ignore:
Timestamp:
Mar 21, 2013, 5:16:35 AM (12 years ago)
Author:
senorblanco@chromium.org
Message:

[skia] feConvolveMatrix should use accelerated path
​https://bugs.webkit.org/show_bug.cgi?id=112828

Reviewed by James Robinson.

Source/WebCore:

Covered by layout tests css3/filters/effect-reference*.html.

  • WebCore.gypi:

Add FEConvolveMatrixSkia.cpp to the build.

  • platform/graphics/filters/FEConvolveMatrix.h:

Enable the skia accelerated path for feConvolveMatrix.

  • platform/graphics/filters/skia/FEConvolveMatrixSkia.cpp:

(WebCore::FEConvolveMatrix::createImageFilter):
Implement building/conversion from FEConvolveMatrix to
SkMatrixConvolutionImageFilter.

LayoutTests:

  • css3/filters/effect-reference-hw.html:
  • css3/filters/effect-reference.html:

Add new test case for feConvolveMatrix as a reference filter.

  • platform/chromium/TestExpectations:

Suppress failures until the test can be rebaselined.

Location:
trunk
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r146452 r146454  
     12013-03-21  Stephen White  <senorblanco@chromium.org>
     2
     3        [skia] feConvolveMatrix should use accelerated path
     4        https://bugs.webkit.org/show_bug.cgi?id=112828
     5
     6        Reviewed by James Robinson.
     7
     8        * css3/filters/effect-reference-hw.html:
     9        * css3/filters/effect-reference.html:
     10        Add new test case for feConvolveMatrix as a reference filter.
     11        * platform/chromium/TestExpectations:
     12        Suppress failures until the test can be rebaselined.
     13
    1142013-03-21  Sergey Ryazanov  <serya@chromium.org>
    215

  • trunk/LayoutTests/css3/filters/effect-reference-hw.html

    r143101 r146454  
    3232      <feOffset dx="10" dy="10"/>
    3333    </filter>
     34    <filter id="convolvematrix">
     35      <feConvolveMatrix order="3 3" kernelMatrix="1 1 1   1 -7 1   1 1 1" bias ="0.3"/>
     36    </filter>
    3437  </defs>
    3538</svg>
    … …  
    4851<img style="-webkit-filter: url(#lighting); filter: url(#lighting);" src="resources/reference.png">
    4952<img style="-webkit-filter: url(#offset); filter: url(#offset);" src="resources/reference.png">
     53<img style="-webkit-filter: url(#convolvematrix); filter: url(#convolvematrix);" src="resources/reference.png">

  • trunk/LayoutTests/css3/filters/effect-reference.html

    r143101 r146454  
    3232      <feOffset dx="10" dy="10"/>
    3333    </filter>
     34    <filter id="convolvematrix">
     35      <feConvolveMatrix order="3 3" kernelMatrix="1 1 1   1 -7 1   1 1 1" bias ="0.3"/>
     36    </filter>
    3437  </defs>
    3538</svg>
    … …  
    4750<img style="-webkit-filter: url(#lighting); filter: url(#lighting);" src="resources/reference.png">
    4851<img style="-webkit-filter: url(#offset); filter: url(#offset);" src="resources/reference.png">
     52<img style="-webkit-filter: url(#convolvematrix); filter: url(#convolvematrix);" src="resources/reference.png">

  • trunk/LayoutTests/platform/chromium/TestExpectations

    r146441 r146454  
    119119# Has been timing out intermittently for a long time.
    120120webkit.org/b/101236 [ Debug ] css3/filters/custom/custom-filter-animation.html [ Pass Timeout ]
     121
     122# Needs rebaseline
     123webkit.org/b/112828 css3/filters/effect-reference.html [ Failure ImageOnlyFailure Pass ]
     124webkit.org/b/112828 css3/filters/effect-reference-hw.html [ Failure ImageOnlyFailure Pass ]
    121125
    122126# Has been failing since r133544-133546

  • trunk/Source/WebCore/ChangeLog

    r146453 r146454  
     12013-03-21  Stephen White  <senorblanco@chromium.org>
     2
     3        [skia] feConvolveMatrix should use accelerated path
     4        https://bugs.webkit.org/show_bug.cgi?id=112828
     5
     6        Reviewed by James Robinson.
     7
     8        Covered by layout tests css3/filters/effect-reference*.html.
     9
     10        * WebCore.gypi:
     11        Add FEConvolveMatrixSkia.cpp to the build.
     12        * platform/graphics/filters/FEConvolveMatrix.h:
     13        Enable the skia accelerated path for feConvolveMatrix.
     14        * platform/graphics/filters/skia/FEConvolveMatrixSkia.cpp:
     15        (WebCore::FEConvolveMatrix::createImageFilter):
     16        Implement building/conversion from FEConvolveMatrix to
     17        SkMatrixConvolutionImageFilter.
     18
    1192013-03-21  Kunihiko Sakamoto  <ksakamoto@chromium.org>
    220

  • trunk/Source/WebCore/WebCore.gypi

    r146449 r146454  
    41684168            'platform/graphics/filters/skia/FEColorMatrixSkia.cpp',
    41694169            'platform/graphics/filters/skia/FEComponentTransferSkia.cpp',
     4170            'platform/graphics/filters/skia/FEConvolveMatrixSkia.cpp',
    41704171            'platform/graphics/filters/skia/FEGaussianBlurSkia.cpp',
    41714172            'platform/graphics/filters/skia/FEMorphologySkia.cpp',

  • trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.h

    r115248 r146454  
    7272
    7373    virtual void platformApplySoftware();
     74#if USE(SKIA)
     75    virtual SkImageFilter* createImageFilter(SkiaImageFilterBuilder*);
     76#endif
    7477    virtual void dump();
    7578
Note: See TracChangeset for help on using the changeset viewer.