Changeset 44118 in webkit


Ignore:
Timestamp:
May 24, 2009 3:43:27 PM (15 years ago)
Author:
krit@webkit.org
Message:

2009-05-24 Dirk Schulze <​krit@webkit.org>

Reviewed by Nikolas Zimmermann.

WebKit needs cross-platform filter system
​https://bugs.webkit.org/show_bug.cgi?id=19991

Added standard input for filter system.

No testcases were added. Filter system is still off.

  • GNUmakefile.am:
  • WebCore.pro:
  • WebCore.xcodeproj/project.pbxproj:
  • platform/graphics/filters/SourceAlpha.cpp: Added. (WebCore::SourceAlpha::create): (WebCore::SourceAlpha::effectName): (WebCore::SourceAlpha::apply): (WebCore::SourceAlpha::dump):
  • platform/graphics/filters/SourceAlpha.h: Added. (WebCore::SourceAlpha::SourceAlpha):
  • platform/graphics/filters/SourceGraphic.cpp: Added. (WebCore::SourceGraphic::create): (WebCore::SourceGraphic::effectName): (WebCore::SourceGraphic::apply): (WebCore::SourceGraphic::dump):
  • platform/graphics/filters/SourceGraphic.h: Added. (WebCore::SourceGraphic::SourceGraphic):
  • svg/FilterBuilder.cpp: Added. (WebCore::FilterBuilder::FilterBuilder): (WebCore::FilterBuilder::add): (WebCore::FilterBuilder::getEffectById): (WebCore::FilterBuilder::clearEffects):
  • svg/FilterBuilder.h:
Location:
trunk/WebCore
Files:
5 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r44116 r44118  
     12009-05-24  Dirk Schulze  <krit@webkit.org>
     2
     3        Reviewed by Nikolas Zimmermann.
     4
     5        WebKit needs cross-platform filter system
     6        [https://bugs.webkit.org/show_bug.cgi?id=19991]
     7
     8        Added standard input for filter system.
     9
     10        No testcases were added. Filter system is still off.
     11
     12        * GNUmakefile.am:
     13        * WebCore.pro:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * platform/graphics/filters/SourceAlpha.cpp: Added.
     16        (WebCore::SourceAlpha::create):
     17        (WebCore::SourceAlpha::effectName):
     18        (WebCore::SourceAlpha::apply):
     19        (WebCore::SourceAlpha::dump):
     20        * platform/graphics/filters/SourceAlpha.h: Added.
     21        (WebCore::SourceAlpha::SourceAlpha):
     22        * platform/graphics/filters/SourceGraphic.cpp: Added.
     23        (WebCore::SourceGraphic::create):
     24        (WebCore::SourceGraphic::effectName):
     25        (WebCore::SourceGraphic::apply):
     26        (WebCore::SourceGraphic::dump):
     27        * platform/graphics/filters/SourceGraphic.h: Added.
     28        (WebCore::SourceGraphic::SourceGraphic):
     29        * svg/FilterBuilder.cpp: Added.
     30        (WebCore::FilterBuilder::FilterBuilder):
     31        (WebCore::FilterBuilder::add):
     32        (WebCore::FilterBuilder::getEffectById):
     33        (WebCore::FilterBuilder::clearEffects):
     34        * svg/FilterBuilder.h:
     35
    1362009-05-24  Simon Hausmann  <simon.hausmann@nokia.com>
    237

  • trunk/WebCore/GNUmakefile.am

    r44100 r44118  
    14381438        WebCore/platform/graphics/filters/FEComponentTransfer.h \
    14391439        WebCore/platform/graphics/filters/FEComposite.h \
     1440        WebCore/platform/graphics/filters/SourceAlpha.h \
     1441        WebCore/platform/graphics/filters/SourceGraphic.h \
    14401442        WebCore/platform/graphics/transforms/IdentityTransformOperation.h \
    14411443        WebCore/platform/graphics/transforms/MatrixTransformOperation.cpp \
    … …  
    25412543        WebCore/platform/graphics/filters/FEComponentTransfer.cpp \
    25422544        WebCore/platform/graphics/filters/FEComposite.cpp \
     2545        WebCore/platform/graphics/filters/SourceAlpha.cpp \
     2546        WebCore/platform/graphics/filters/SourceGraphic.cpp \
    25432547        WebCore/rendering/PointerEventsHitRules.cpp \
    25442548        WebCore/rendering/PointerEventsHitRules.h \
    … …  
    25952599        WebCore/svg/Filter.h \
    25962600        WebCore/svg/FilterBuilder.h \
     2601        WebCore/svg/FilterBuilder.cpp \
    25972602        WebCore/svg/FilterEffect.cpp \
    25982603        WebCore/svg/FilterEffect.h \

  • trunk/WebCore/WebCore.pro

    r44100 r44118  
    17041704        svg/SVGZoomEvent.cpp \
    17051705        rendering/PointerEventsHitRules.cpp \
     1706        svg/FilterBuilder.cpp \
    17061707        svg/FilterEffect.cpp \
    17071708        svg/SVGDocumentExtensions.cpp \
    … …  
    18421843        platform/graphics/filters/FEComponentTransfer.cpp \
    18431844        platform/graphics/filters/FEComposite.cpp \
     1845        platform/graphics/filters/SourceAlpha.cpp \
     1846        platform/graphics/filters/SourceGraphic.cpp \
    18441847        svg/graphics/filters/SVGFEConvolveMatrix.cpp \
    18451848        svg/graphics/filters/SVGFEDiffuseLighting.cpp \

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r44100 r44118  
    997997                7AED3E060FBB1EAA00D2B03C /* InspectorFrontend.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */; };
    998998                849F77760EFEC6200090849D /* StrokeStyleApplier.h in Headers */ = {isa = PBXBuildFile; fileRef = 849F77750EFEC6200090849D /* StrokeStyleApplier.h */; };
     999                84A81F3A0FC7DFCC00955300 /* FilterBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A81F390FC7DFCC00955300 /* FilterBuilder.cpp */; };
     1000                84A81F3D0FC7DFF000955300 /* SourceAlpha.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A81F3B0FC7DFF000955300 /* SourceAlpha.cpp */; };
     1001                84A81F3E0FC7DFF000955300 /* SourceAlpha.h in Headers */ = {isa = PBXBuildFile; fileRef = 84A81F3C0FC7DFF000955300 /* SourceAlpha.h */; };
     1002                84A81F410FC7E02700955300 /* SourceGraphic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A81F3F0FC7E02700955300 /* SourceGraphic.cpp */; };
     1003                84A81F420FC7E02700955300 /* SourceGraphic.h in Headers */ = {isa = PBXBuildFile; fileRef = 84A81F400FC7E02700955300 /* SourceGraphic.h */; };
    9991004                85004D940ACEEAEF00C438F6 /* DOMSVGDefsElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 85004D880ACEEAEF00C438F6 /* DOMSVGDefsElement.h */; };
    10001005                85004D950ACEEAEF00C438F6 /* DOMSVGDefsElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85004D890ACEEAEF00C438F6 /* DOMSVGDefsElement.mm */; };
    … …  
    59825987                7AED3E040FBB1EAA00D2B03C /* InspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontend.h; sourceTree = "<group>"; };
    59835988                849F77750EFEC6200090849D /* StrokeStyleApplier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StrokeStyleApplier.h; sourceTree = "<group>"; };
     5989                84A81F390FC7DFCC00955300 /* FilterBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilterBuilder.cpp; sourceTree = "<group>"; };
     5990                84A81F3B0FC7DFF000955300 /* SourceAlpha.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourceAlpha.cpp; path = filters/SourceAlpha.cpp; sourceTree = "<group>"; };
     5991                84A81F3C0FC7DFF000955300 /* SourceAlpha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourceAlpha.h; path = filters/SourceAlpha.h; sourceTree = "<group>"; };
     5992                84A81F3F0FC7E02700955300 /* SourceGraphic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourceGraphic.cpp; path = filters/SourceGraphic.cpp; sourceTree = "<group>"; };
     5993                84A81F400FC7E02700955300 /* SourceGraphic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourceGraphic.h; path = filters/SourceGraphic.h; sourceTree = "<group>"; };
    59845994                84B2B1F7056BEF3A00D2B771 /* WebCoreKeyGenerator.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreKeyGenerator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    59855995                84B2B1F8056BEF3A00D2B771 /* WebCoreKeyGenerator.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreKeyGenerator.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    1189911909                        isa = PBXGroup;
    1190011910                        children = (
     11911                                84A81F3F0FC7E02700955300 /* SourceGraphic.cpp */,
     11912                                84A81F400FC7E02700955300 /* SourceGraphic.h */,
     11913                                84A81F3B0FC7DFF000955300 /* SourceAlpha.cpp */,
     11914                                84A81F3C0FC7DFF000955300 /* SourceAlpha.h */,
    1190111915                                A75E8B800E1DE2D6007F2481 /* FEBlend.cpp */,
    1190211916                                A75E8B810E1DE2D6007F2481 /* FEBlend.h */,
    … …  
    1256612580                        isa = PBXGroup;
    1256712581                        children = (
     12582                                84A81F390FC7DFCC00955300 /* FilterBuilder.cpp */,
    1256812583                                E46E97860DAAD61B0071E894 /* animation */,
    1256912584                                B25598860D00D8B800BB825C /* graphics */,
    … …  
    1695316968                                29A812430FBB9C1D00510293 /* AccessibilityListBox.h in Headers */,
    1695416969                                29A812490FBB9CA900510293 /* AccessibilityObjectWrapper.h in Headers */,
     16970                                84A81F3E0FC7DFF000955300 /* SourceAlpha.h in Headers */,
     16971                                84A81F420FC7E02700955300 /* SourceGraphic.h in Headers */,
    1695516972                        );
    1695616973                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1897418991                                29A8124A0FBB9CA900510293 /* AccessibilityObjectWrapper.mm in Sources */,
    1897518992                                29A8124B0FBB9CA900510293 /* AXObjectCacheMac.mm in Sources */,
     18993                                84A81F3A0FC7DFCC00955300 /* FilterBuilder.cpp in Sources */,
     18994                                84A81F3D0FC7DFF000955300 /* SourceAlpha.cpp in Sources */,
     18995                                84A81F410FC7E02700955300 /* SourceGraphic.cpp in Sources */,
    1897618996                        );
    1897718997                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/svg/FilterBuilder.h

    r44083 r44118  
    3636        FilterBuilder();
    3737
    38         void add(const String& id, PassRefPtr<FilterEffect> effect);
     38        void add(const AtomicString& id, RefPtr<FilterEffect> effect);
    3939
    40         FilterEffect* getEffectById(const String& id) const;
     40        FilterEffect* getEffectById(const AtomicString& id) const;
    4141        FilterEffect* lastFilter() const { return m_lastEffect.get(); }
    4242
    … …  
    4444
    4545    private:
    46         HashMap<RefPtr<StringImpl>, RefPtr<FilterEffect> > m_namedEffects;
     46        HashMap<RefPtr<AtomicStringImpl>, RefPtr<FilterEffect> > m_builtinEffects;
     47        HashMap<RefPtr<AtomicStringImpl>, RefPtr<FilterEffect> > m_namedEffects;
    4748
    4849        RefPtr<FilterEffect> m_lastEffect;
    49         RefPtr<FilterEffect> m_sourceGraphic;
    50         RefPtr<FilterEffect> m_sourceAlpha;
    5150    };
    5251   
Note: See TracChangeset for help on using the changeset viewer.