Changeset 44309 in webkit


Ignore:
Timestamp:
May 31, 2009 10:36:12 PM (15 years ago)
Author:
krit@webkit.org
Message:

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

Reviewed by Nikolas Zimmermann.

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

A short clean-up. FilterBuilder is SVG specific. Move it
to svg/graphics/filters and rename it to SVGFilterBuilder.

  • GNUmakefile.am:
  • WebCore.pro:
  • WebCore.xcodeproj/project.pbxproj:
  • svg/FilterBuilder.cpp: Removed.
  • svg/FilterBuilder.h: Removed.
  • svg/SVGFilterElement.cpp:
  • svg/SVGFilterPrimitiveStandardAttributes.h:
  • svg/graphics/SVGResourceFilter.cpp: (WebCore::SVGResourceFilter::SVGResourceFilter):
  • svg/graphics/SVGResourceFilter.h: (WebCore::SVGResourceFilter::builder):
  • svg/graphics/filters/SVGFilterBuilder.cpp: Added. (WebCore::SVGFilterBuilder::SVGFilterBuilder): (WebCore::SVGFilterBuilder::add): (WebCore::SVGFilterBuilder::getEffectById): (WebCore::SVGFilterBuilder::clearEffects):
  • svg/graphics/filters/SVGFilterBuilder.h: Added. (WebCore::SVGFilterBuilder::lastEffect):
Location:
trunk/WebCore
Files:
2 added
2 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r44308 r44309  
     12009-05-31  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        A short clean-up. FilterBuilder is SVG specific. Move it
     9        to svg/graphics/filters and rename it to SVGFilterBuilder.
     10
     11        * GNUmakefile.am:
     12        * WebCore.pro:
     13        * WebCore.xcodeproj/project.pbxproj:
     14        * svg/FilterBuilder.cpp: Removed.
     15        * svg/FilterBuilder.h: Removed.
     16        * svg/SVGFilterElement.cpp:
     17        * svg/SVGFilterPrimitiveStandardAttributes.h:
     18        * svg/graphics/SVGResourceFilter.cpp:
     19        (WebCore::SVGResourceFilter::SVGResourceFilter):
     20        * svg/graphics/SVGResourceFilter.h:
     21        (WebCore::SVGResourceFilter::builder):
     22        * svg/graphics/filters/SVGFilterBuilder.cpp: Added.
     23        (WebCore::SVGFilterBuilder::SVGFilterBuilder):
     24        (WebCore::SVGFilterBuilder::add):
     25        (WebCore::SVGFilterBuilder::getEffectById):
     26        (WebCore::SVGFilterBuilder::clearEffects):
     27        * svg/graphics/filters/SVGFilterBuilder.h: Added.
     28        (WebCore::SVGFilterBuilder::lastEffect):
     29
    1302009-05-31  Alexey Proskuryakov  <ap@webkit.org>
    231

  • trunk/WebCore/GNUmakefile.am

    r44303 r44309  
    26242624        WebCore/svg/ColorDistance.h \
    26252625        WebCore/svg/ElementTimeControl.h \
    2626         WebCore/svg/FilterBuilder.h \
    2627         WebCore/svg/FilterBuilder.cpp \
    26282626        WebCore/svg/GradientAttributes.h \
    26292627        WebCore/svg/LinearGradientAttributes.h \
    … …  
    29572955        WebCore/svg/graphics/filters/SVGFilter.cpp \
    29582956        WebCore/svg/graphics/filters/SVGFilter.h \
     2957        WebCore/svg/graphics/filters/SVGFilterBuilder.h \
     2958        WebCore/svg/graphics/filters/SVGFilterBuilder.cpp \
    29592959        WebCore/svg/graphics/filters/SVGFilterEffect.cpp \
    29602960        WebCore/svg/graphics/filters/SVGFilterEffect.h \

  • trunk/WebCore/WebCore.pro

    r44299 r44309  
    17201720        svg/SVGZoomEvent.cpp \
    17211721        rendering/PointerEventsHitRules.cpp \
    1722         svg/FilterBuilder.cpp \
    17231722        svg/SVGDocumentExtensions.cpp \
    17241723        svg/SVGImageLoader.cpp \
    … …  
    18671866        svg/graphics/filters/SVGFETurbulence.cpp \
    18681867        svg/graphics/filters/SVGFilter.cpp \
     1868        svg/graphics/filters/SVGFilterBuilder.cpp \
    18691869        svg/graphics/filters/SVGFilterEffect.cpp \
    18701870        svg/graphics/filters/SVGLightSource.cpp \

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

    r44303 r44309  
    5151                081D81310EE0E74D00D73689 /* WMLTimerElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 081D812F0EE0E74D00D73689 /* WMLTimerElement.cpp */; };
    5252                081D81320EE0E74D00D73689 /* WMLTimerElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 081D81300EE0E74D00D73689 /* WMLTimerElement.h */; };
     53                081EBF3A0FD34F4100DA7559 /* SVGFilterBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 081EBF380FD34F4100DA7559 /* SVGFilterBuilder.cpp */; };
     54                081EBF3B0FD34F4100DA7559 /* SVGFilterBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 081EBF390FD34F4100DA7559 /* SVGFilterBuilder.h */; };
    5355                08203A9F0ED8C35300B8B61A /* WMLAccessElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08203A9D0ED8C35300B8B61A /* WMLAccessElement.cpp */; };
    5456                08203AA00ED8C35300B8B61A /* WMLAccessElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08203A9E0ED8C35300B8B61A /* WMLAccessElement.h */; };
    … …  
    745747                4E19592D0A39DACC00220FE5 /* MediaQueryExp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E1959270A39DACC00220FE5 /* MediaQueryExp.cpp */; };
    746748                4E19592E0A39DACC00220FE5 /* MediaQueryExp.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959280A39DACC00220FE5 /* MediaQueryExp.h */; };
    747                 50A5DF760E1A13C9000A03AE /* FilterBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 50A5DF740E1A13C9000A03AE /* FilterBuilder.h */; };
    748749                510184690B08602A004A825F /* CachedPage.h in Headers */ = {isa = PBXBuildFile; fileRef = 510184670B08602A004A825F /* CachedPage.h */; settings = {ATTRIBUTES = (Private, ); }; };
    749750                5101846A0B08602A004A825F /* CachedPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510184680B08602A004A825F /* CachedPage.cpp */; };
    … …  
    10001001                845E72FC0FD2623900A87D79 /* SVGFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 845E72FA0FD2623900A87D79 /* SVGFilter.h */; };
    10011002                849F77760EFEC6200090849D /* StrokeStyleApplier.h in Headers */ = {isa = PBXBuildFile; fileRef = 849F77750EFEC6200090849D /* StrokeStyleApplier.h */; };
    1002                 84A81F3A0FC7DFCC00955300 /* FilterBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A81F390FC7DFCC00955300 /* FilterBuilder.cpp */; };
    10031003                84A81F3D0FC7DFF000955300 /* SourceAlpha.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A81F3B0FC7DFF000955300 /* SourceAlpha.cpp */; };
    10041004                84A81F3E0FC7DFF000955300 /* SourceAlpha.h in Headers */ = {isa = PBXBuildFile; fileRef = 84A81F3C0FC7DFF000955300 /* SourceAlpha.h */; };
    … …  
    49504950                081D812F0EE0E74D00D73689 /* WMLTimerElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLTimerElement.cpp; sourceTree = "<group>"; };
    49514951                081D81300EE0E74D00D73689 /* WMLTimerElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLTimerElement.h; sourceTree = "<group>"; };
     4952                081EBF380FD34F4100DA7559 /* SVGFilterBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFilterBuilder.cpp; sourceTree = "<group>"; };
     4953                081EBF390FD34F4100DA7559 /* SVGFilterBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGFilterBuilder.h; sourceTree = "<group>"; };
    49524954                08203A9D0ED8C35300B8B61A /* WMLAccessElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLAccessElement.cpp; sourceTree = "<group>"; };
    49534955                08203A9E0ED8C35300B8B61A /* WMLAccessElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLAccessElement.h; sourceTree = "<group>"; };
    … …  
    57105712                4E1959270A39DACC00220FE5 /* MediaQueryExp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MediaQueryExp.cpp; sourceTree = "<group>"; };
    57115713                4E1959280A39DACC00220FE5 /* MediaQueryExp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MediaQueryExp.h; sourceTree = "<group>"; };
    5712                 50A5DF740E1A13C9000A03AE /* FilterBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilterBuilder.h; sourceTree = "<group>"; };
    57135714                510184670B08602A004A825F /* CachedPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedPage.h; sourceTree = "<group>"; };
    57145715                510184680B08602A004A825F /* CachedPage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedPage.cpp; sourceTree = "<group>"; };
    … …  
    59895990                845E72FA0FD2623900A87D79 /* SVGFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGFilter.h; sourceTree = "<group>"; };
    59905991                849F77750EFEC6200090849D /* StrokeStyleApplier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StrokeStyleApplier.h; sourceTree = "<group>"; };
    5991                 84A81F390FC7DFCC00955300 /* FilterBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilterBuilder.cpp; sourceTree = "<group>"; };
    59925992                84A81F3B0FC7DFF000955300 /* SourceAlpha.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourceAlpha.cpp; path = filters/SourceAlpha.cpp; sourceTree = "<group>"; };
    59935993                84A81F3C0FC7DFF000955300 /* SourceAlpha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourceAlpha.h; path = filters/SourceAlpha.h; sourceTree = "<group>"; };
    … …  
    1258312583                        isa = PBXGroup;
    1258412584                        children = (
    12585                                 84A81F390FC7DFCC00955300 /* FilterBuilder.cpp */,
    1258612585                                E46E97860DAAD61B0071E894 /* animation */,
    1258712586                                B25598860D00D8B800BB825C /* graphics */,
    … …  
    1259012589                                E415F1830D9A1A830033CE97 /* ElementTimeControl.h */,
    1259112590                                E415F10C0D9A05870033CE97 /* ElementTimeControl.idl */,
    12592                                 50A5DF740E1A13C9000A03AE /* FilterBuilder.h */,
    1259312591                                B22277CD0D00BF1F0071B782 /* GradientAttributes.h */,
    1259412592                                B22277CE0D00BF1F0071B782 /* LinearGradientAttributes.h */,
    … …  
    1305113049                        isa = PBXGroup;
    1305213050                        children = (
    13053                                 845E72F90FD2623900A87D79 /* SVGFilter.cpp */,
    13054                                 845E72FA0FD2623900A87D79 /* SVGFilter.h */,
    1305513051                                B255989D0D00D8B800BB825C /* cg */,
    1305613052                                B25598D70D00D8B900BB825C /* SVGDistantLightSource.h */,
    … …  
    1307913075                                B25598F50D00D8B900BB825C /* SVGFETurbulence.cpp */,
    1308013076                                B25598F60D00D8B900BB825C /* SVGFETurbulence.h */,
     13077                                845E72F90FD2623900A87D79 /* SVGFilter.cpp */,
     13078                                845E72FA0FD2623900A87D79 /* SVGFilter.h */,
     13079                                081EBF380FD34F4100DA7559 /* SVGFilterBuilder.cpp */,
     13080                                081EBF390FD34F4100DA7559 /* SVGFilterBuilder.h */,
    1308113081                                B25598F70D00D8B900BB825C /* SVGFilterEffect.cpp */,
    1308213082                                B25598F80D00D8B900BB825C /* SVGFilterEffect.h */,
    … …  
    1565015650                                514B3F730C722047000530DF /* FileSystem.h in Headers */,
    1565115651                                BC5EB69F0E81DAEB00B25965 /* FillLayer.h in Headers */,
    15652                                 50A5DF760E1A13C9000A03AE /* FilterBuilder.h in Headers */,
    1565315652                                A8CFF04F0A154F09000A4234 /* FixedTableLayout.h in Headers */,
    1565415653                                BC073BAA0C399B1F000F5979 /* FloatConversion.h in Headers */,
    … …  
    1695116950                                845E72F80FD261EE00A87D79 /* Filter.h in Headers */,
    1695216951                                845E72FC0FD2623900A87D79 /* SVGFilter.h in Headers */,
     16952                                081EBF3B0FD34F4100DA7559 /* SVGFilterBuilder.h in Headers */,
    1695316953                        );
    1695416954                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1896818968                                29A8124A0FBB9CA900510293 /* AccessibilityObjectWrapper.mm in Sources */,
    1896918969                                29A8124B0FBB9CA900510293 /* AXObjectCacheMac.mm in Sources */,
    18970                                 84A81F3A0FC7DFCC00955300 /* FilterBuilder.cpp in Sources */,
    1897118970                                84A81F3D0FC7DFF000955300 /* SourceAlpha.cpp in Sources */,
    1897218971                                84A81F410FC7E02700955300 /* SourceGraphic.cpp in Sources */,
    … …  
    1897418973                                082341C50FCF3A9500D75BD6 /* WMLSelectElement.cpp in Sources */,
    1897518974                                845E72FB0FD2623900A87D79 /* SVGFilter.cpp in Sources */,
     18975                                081EBF3A0FD34F4100DA7559 /* SVGFilterBuilder.cpp in Sources */,
    1897618976                        );
    1897718977                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/svg/SVGFilterElement.cpp

    r44299 r44309  
    2828
    2929#include "Attr.h"
    30 #include "FilterBuilder.h"
     30#include "SVGFilterBuilder.h"
    3131#include "MappedAttribute.h"
    3232#include "PlatformString.h"

  • trunk/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h

    r44299 r44309  
    2525
    2626#if ENABLE(SVG) && ENABLE(FILTERS)
    27 #include "FilterBuilder.h"
     27#include "SVGFilterBuilder.h"
    2828#include "SVGResourceFilter.h"
    2929#include "SVGStyledElement.h"

  • trunk/WebCore/svg/graphics/SVGResourceFilter.cpp

    r44299 r44309  
    2626#include "SVGResourceFilter.h"
    2727
    28 #include "FilterBuilder.h"
    2928#include "FilterEffect.h"
    3029#include "GraphicsContext.h"
    … …  
    3231#include "PlatformString.h"
    3332#include "SVGFilter.h"
     33#include "SVGFilterBuilder.h"
    3434#include "SVGRenderTreeAsText.h"
    3535#include "SVGFilterPrimitiveStandardAttributes.h"
    … …  
    4545    , m_sourceGraphicBuffer(0)
    4646{
    47     m_filterBuilder.set(new FilterBuilder());
     47    m_filterBuilder.set(new SVGFilterBuilder());
    4848}
    4949

  • trunk/WebCore/svg/graphics/SVGResourceFilter.h

    r44299 r44309  
    3939
    4040class Filter;
    41 class FilterBuilder;
    4241class FilterEffect;
    4342class GraphicsContext;
     43class SVGFilterBuilder;
    4444class SVGFilterPrimitiveStandardAttributes;
    4545
    … …  
    8080    void addFilterEffect(SVGFilterPrimitiveStandardAttributes*, PassRefPtr<FilterEffect>);
    8181
    82     FilterBuilder* builder() { return m_filterBuilder.get(); }
     82    SVGFilterBuilder* builder() { return m_filterBuilder.get(); }
    8383   
    8484private:
    … …  
    9595    FloatRect m_itemBBox;
    9696
    97     OwnPtr<FilterBuilder> m_filterBuilder;
     97    OwnPtr<SVGFilterBuilder> m_filterBuilder;
    9898    GraphicsContext* m_savedContext;
    9999    OwnPtr<ImageBuffer> m_sourceGraphicBuffer;
Note: See TracChangeset for help on using the changeset viewer.