Changeset 147684 in webkit


Ignore:
Timestamp:
Apr 4, 2013 5:08:09 PM (11 years ago)
Author:
andersca@apple.com
Message:

Prune unneeded header #includes
​https://bugs.webkit.org/show_bug.cgi?id=113973

Reviewed by Geoffrey Garen.

Reduce the amount of headers included by other headers by:

  • Moving implicit and explicit constructors and destructors into .cpp files so member variable constructors/destructors don't have to be declared.
  • Move CachedResourceClient subclasses out into separate headers so that their respective CachedResource subclasses don't have to be included by the classes that derive from those subclasses.
  • Remove headers that were never needed in the first place.
  • Modules/webaudio/AudioContext.h:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSDOMWindowCustom.cpp:
  • css/CSSFontFaceSource.h:
  • html/canvas/CanvasPattern.cpp:

(WebCore::CanvasPattern::create):
(WebCore::CanvasPattern::CanvasPattern):
(WebCore::CanvasPattern::~CanvasPattern):

  • html/canvas/CanvasPattern.h:

(WebCore::CanvasPattern::pattern):
(WebCore::CanvasPattern::originClean):

  • html/parser/HTMLScriptRunner.h:
  • loader/ImageLoader.h:
  • loader/LinkLoader.h:
  • loader/TextTrackLoader.h:
  • loader/cache/CachedFont.cpp:
  • loader/cache/CachedFont.h:
  • loader/cache/CachedFontClient.h: Added.

(WebCore::CachedFontClient::~CachedFontClient):
(WebCore::CachedFontClient::expectedType):
(WebCore::CachedFontClient::resourceClientType):
(WebCore::CachedFontClient::fontLoaded):

  • loader/cache/CachedResourceHandle.cpp:

(WebCore::CachedResourceHandleBase::CachedResourceHandleBase):
(WebCore::CachedResourceHandleBase::~CachedResourceHandleBase):
(WebCore::CachedResourceHandleBase::setResource):

  • loader/cache/CachedResourceHandle.h:

(WebCore::CachedResourceHandleBase::get):
(WebCore::CachedResourceHandleBase::operator!):
(WebCore::CachedResourceHandleBase::operator UnspecifiedBoolType):
(WebCore::CachedResourceHandleBase::operator=):
(WebCore::CachedResourceHandle::CachedResourceHandle):
(WebCore::CachedResourceHandle::get):
(WebCore::CachedResourceHandle::operator->):
(WebCore::CachedResourceHandle::operator=):
(WebCore::CachedResourceHandle::operator==):
(WebCore::CachedResourceHandle::operator!=):
(WebCore::operator==):
(WebCore::operator!=):

  • loader/cache/CachedSVGDocument.h:
  • loader/cache/CachedSVGDocumentReference.h:
  • loader/cache/CachedSVGDocumentClient.h: Added.

(WebCore::CachedSVGDocumentClient::~CachedSVGDocumentClient):
(WebCore::CachedSVGDocumentClient::expectedType):
(WebCore::CachedSVGDocumentClient::resourceClientType):

  • loader/cache/CachedStyleSheetClient.h:
  • platform/PlatformScreen.h:
  • platform/audio/HRTFElevation.cpp:
  • platform/audio/HRTFKernel.cpp:

(WebCore::HRTFKernel::fftSize):

  • platform/audio/HRTFKernel.h:
  • platform/audio/ReverbConvolverStage.cpp:

(WebCore::ReverbConvolverStage::~ReverbConvolverStage):

  • platform/audio/ReverbConvolverStage.h:
  • platform/graphics/FontPlatformData.h:
  • platform/graphics/GraphicsContext3D.h:
  • platform/graphics/Path.cpp:
  • platform/graphics/Path.h:
  • platform/graphics/Pattern.cpp:
  • platform/graphics/Pattern.h:
  • platform/graphics/filters/FilterOperation.cpp:

(WebCore::ReferenceFilterOperation::ReferenceFilterOperation):
(WebCore::ReferenceFilterOperation::~ReferenceFilterOperation):
(WebCore::ReferenceFilterOperation::setCachedSVGDocumentReference):

  • platform/graphics/filters/FilterOperation.h:
  • platform/graphics/transforms/AffineTransform.h:
  • plugins/DOMMimeType.h:
  • rendering/RenderLayerFilterInfo.h:
  • rendering/style/StyleCachedShader.h:
  • svg/SVGFEImageElement.h:
  • svg/SVGFontFaceUriElement.h:
  • svg/SVGUseElement.h:
  • xml/parser/XMLDocumentParser.h:
Location:
trunk/Source/WebCore
Files:
1 added
42 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r147683 r147684  
     12013-04-04  Anders Carlsson  <andersca@apple.com>
     2
     3        Prune unneeded header #includes
     4        https://bugs.webkit.org/show_bug.cgi?id=113973
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        Reduce the amount of headers included by other headers by:
     9        - Moving implicit and explicit constructors and destructors into .cpp files so member variable constructors/destructors
     10          don't have to be declared.
     11        - Move CachedResourceClient subclasses out into separate headers so that their respective CachedResource subclasses don't
     12          have to be included by the classes that derive from those subclasses.
     13        - Remove headers that were never needed in the first place.
     14
     15        * Modules/webaudio/AudioContext.h:
     16        * WebCore.xcodeproj/project.pbxproj:
     17        * bindings/js/JSDOMWindowCustom.cpp:
     18        * css/CSSFontFaceSource.h:
     19        * html/canvas/CanvasPattern.cpp:
     20        (WebCore::CanvasPattern::create):
     21        (WebCore::CanvasPattern::CanvasPattern):
     22        (WebCore::CanvasPattern::~CanvasPattern):
     23        * html/canvas/CanvasPattern.h:
     24        (WebCore::CanvasPattern::pattern):
     25        (WebCore::CanvasPattern::originClean):
     26        * html/parser/HTMLScriptRunner.h:
     27        * loader/ImageLoader.h:
     28        * loader/LinkLoader.h:
     29        * loader/TextTrackLoader.h:
     30        * loader/cache/CachedFont.cpp:
     31        * loader/cache/CachedFont.h:
     32        * loader/cache/CachedFontClient.h: Added.
     33        (WebCore::CachedFontClient::~CachedFontClient):
     34        (WebCore::CachedFontClient::expectedType):
     35        (WebCore::CachedFontClient::resourceClientType):
     36        (WebCore::CachedFontClient::fontLoaded):
     37        * loader/cache/CachedResourceHandle.cpp:
     38        (WebCore::CachedResourceHandleBase::CachedResourceHandleBase):
     39        (WebCore::CachedResourceHandleBase::~CachedResourceHandleBase):
     40        (WebCore::CachedResourceHandleBase::setResource):
     41        * loader/cache/CachedResourceHandle.h:
     42        (WebCore::CachedResourceHandleBase::get):
     43        (WebCore::CachedResourceHandleBase::operator!):
     44        (WebCore::CachedResourceHandleBase::operator UnspecifiedBoolType):
     45        (WebCore::CachedResourceHandleBase::operator=):
     46        (WebCore::CachedResourceHandle::CachedResourceHandle):
     47        (WebCore::CachedResourceHandle::get):
     48        (WebCore::CachedResourceHandle::operator->):
     49        (WebCore::CachedResourceHandle::operator=):
     50        (WebCore::CachedResourceHandle::operator==):
     51        (WebCore::CachedResourceHandle::operator!=):
     52        (WebCore::operator==):
     53        (WebCore::operator!=):
     54        * loader/cache/CachedSVGDocument.h:
     55        * loader/cache/CachedSVGDocumentReference.h:
     56        * loader/cache/CachedSVGDocumentClient.h: Added.
     57        (WebCore::CachedSVGDocumentClient::~CachedSVGDocumentClient):
     58        (WebCore::CachedSVGDocumentClient::expectedType):
     59        (WebCore::CachedSVGDocumentClient::resourceClientType):
     60        * loader/cache/CachedStyleSheetClient.h:
     61        * platform/PlatformScreen.h:
     62        * platform/audio/HRTFElevation.cpp:
     63        * platform/audio/HRTFKernel.cpp:
     64        (WebCore::HRTFKernel::fftSize):
     65        * platform/audio/HRTFKernel.h:
     66        * platform/audio/ReverbConvolverStage.cpp:
     67        (WebCore::ReverbConvolverStage::~ReverbConvolverStage):
     68        * platform/audio/ReverbConvolverStage.h:
     69        * platform/graphics/FontPlatformData.h:
     70        * platform/graphics/GraphicsContext3D.h:
     71        * platform/graphics/Path.cpp:
     72        * platform/graphics/Path.h:
     73        * platform/graphics/Pattern.cpp:
     74        * platform/graphics/Pattern.h:
     75        * platform/graphics/filters/FilterOperation.cpp:
     76        (WebCore::ReferenceFilterOperation::ReferenceFilterOperation):
     77        (WebCore::ReferenceFilterOperation::~ReferenceFilterOperation):
     78        (WebCore::ReferenceFilterOperation::setCachedSVGDocumentReference):
     79        * platform/graphics/filters/FilterOperation.h:
     80        * platform/graphics/transforms/AffineTransform.h:
     81        * plugins/DOMMimeType.h:
     82        * rendering/RenderLayerFilterInfo.h:
     83        * rendering/style/StyleCachedShader.h:
     84        * svg/SVGFEImageElement.h:
     85        * svg/SVGFontFaceUriElement.h:
     86        * svg/SVGUseElement.h:
     87        * xml/parser/XMLDocumentParser.h:
     88
    1892013-04-04  Christophe Dumez  <ch.dumez@sisa.samsung.com>
    290

  • trunk/Source/WebCore/GNUmakefile.list.am

    r147643 r147684  
    39993999        Source/WebCore/loader/cache/CachedFont.cpp \
    40004000        Source/WebCore/loader/cache/CachedFont.h \
     4001        Source/WebCore/loader/cache/CachedFontClient.h \
    40014002        Source/WebCore/loader/cache/CachedImage.cpp \
    40024003        Source/WebCore/loader/cache/CachedImage.h \
    … …  
    48564857        Source/WebCore/loader/cache/CachedSVGDocument.cpp \
    48574858        Source/WebCore/loader/cache/CachedSVGDocument.h \
     4859        Source/WebCore/loader/cache/CachedSVGDocumentClient.h \
    48584860        Source/WebCore/loader/cache/CachedSVGDocumentReference.h \
    48594861        Source/WebCore/platform/graphics/SVGGlyph.cpp \

  • trunk/Source/WebCore/Modules/webaudio/AudioContext.h

    r137516 r147684  
    3232#include "EventListener.h"
    3333#include "EventTarget.h"
    34 #include "HRTFDatabaseLoader.h"
    3534#include <wtf/HashSet.h>
    3635#include <wtf/MainThread.h>
    … …  
    5251class MediaStreamAudioDestinationNode;
    5352class MediaStreamAudioSourceNode;
     53class HRTFDatabaseLoader;
    5454class HTMLMediaElement;
    5555class ChannelMergerNode;

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

    r147494 r147684  
    623623                1AE82FEC0CAB07EE002237AE /* JSSQLResultSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE82FEA0CAB07EE002237AE /* JSSQLResultSet.cpp */; };
    624624                1AE82FED0CAB07EE002237AE /* JSSQLResultSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE82FEB0CAB07EE002237AE /* JSSQLResultSet.h */; };
     625                1AEF4E67170E160300AB2799 /* CachedFontClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEF4E66170E160300AB2799 /* CachedFontClient.h */; };
     626                1AEF4E69170E174800AB2799 /* CachedSVGDocumentClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEF4E68170E174800AB2799 /* CachedSVGDocumentClient.h */; };
    625627                1AF326790D78B9440068F0C4 /* EditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF326770D78B9440068F0C4 /* EditorClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
    626628                1AF62EE614DA22A70041556C /* ScrollingCoordinatorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AF62EE314DA22A70041556C /* ScrollingCoordinatorMac.mm */; };
    … …  
    20752077                7E5D7A77161D3F8F00896C34 /* OESElementIndexUint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E5D7A74161D3F8F00896C34 /* OESElementIndexUint.h */; };
    20762078                7E66E23316D6EB6C00F7E7FF /* WebGLCompressedTextureATC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E66E23116D6EB6C00F7E7FF /* WebGLCompressedTextureATC.cpp */; };
     2079                7E66E23317E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E66E23117E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp */; };
    20772080                7E66E23416D6EB6C00F7E7FF /* WebGLCompressedTextureATC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E66E23216D6EB6C00F7E7FF /* WebGLCompressedTextureATC.h */; };
     2081                7E66E23417E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */; };
    20782082                7E99AF510B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E99AF520B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp */; };
    20792083                7E99AF530B13846468FB01A5 /* WindowFocusAllowedIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E99AF540B13846468FB01A5 /* WindowFocusAllowedIndicator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    20802084                7EA30F6916DFFE7500257D0B /* JSWebGLCompressedTextureATC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EA30F6716DFFE7500257D0B /* JSWebGLCompressedTextureATC.cpp */; };
     2085                7EA30F6917EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EA30F6717EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.cpp */; };
    20812086                7EA30F6A16DFFE7500257D0B /* JSWebGLCompressedTextureATC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EA30F6816DFFE7500257D0B /* JSWebGLCompressedTextureATC.h */; };
    2082                 7E66E23317E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E66E23117E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp */; };
    2083                 7E66E23417E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */; };
    2084                 7EA30F6917EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EA30F6717EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.cpp */; };
    20852087                7EA30F6A17EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EA30F6817EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h */; };
    20862088                7EE6845F12D26E3800E79415 /* AuthenticationCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */; };
    … …  
    80238025                1AE82FEA0CAB07EE002237AE /* JSSQLResultSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLResultSet.cpp; sourceTree = "<group>"; };
    80248026                1AE82FEB0CAB07EE002237AE /* JSSQLResultSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSQLResultSet.h; sourceTree = "<group>"; };
     8027                1AEF4E66170E160300AB2799 /* CachedFontClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedFontClient.h; sourceTree = "<group>"; };
     8028                1AEF4E68170E174800AB2799 /* CachedSVGDocumentClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedSVGDocumentClient.h; sourceTree = "<group>"; };
    80258029                1AF326770D78B9440068F0C4 /* EditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditorClient.h; sourceTree = "<group>"; };
    80268030                1AF62EE314DA22A70041556C /* ScrollingCoordinatorMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingCoordinatorMac.mm; sourceTree = "<group>"; };
    … …  
    96069610                7E5D7A74161D3F8F00896C34 /* OESElementIndexUint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OESElementIndexUint.h; path = canvas/OESElementIndexUint.h; sourceTree = "<group>"; };
    96079611                7E66E23116D6EB6C00F7E7FF /* WebGLCompressedTextureATC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLCompressedTextureATC.cpp; path = canvas/WebGLCompressedTextureATC.cpp; sourceTree = "<group>"; };
     9612                7E66E23117E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLCompressedTexturePVRTC.cpp; path = canvas/WebGLCompressedTexturePVRTC.cpp; sourceTree = "<group>"; };
    96089613                7E66E23216D6EB6C00F7E7FF /* WebGLCompressedTextureATC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLCompressedTextureATC.h; path = canvas/WebGLCompressedTextureATC.h; sourceTree = "<group>"; };
     9614                7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLCompressedTexturePVRTC.h; path = canvas/WebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; };
    96099615                7E99AF520B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowFocusAllowedIndicator.cpp; sourceTree = "<group>"; };
    96109616                7E99AF540B13846468FB01A5 /* WindowFocusAllowedIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowFocusAllowedIndicator.h; sourceTree = "<group>"; };
    96119617                7EA30F6216DFD62700257D0B /* WebGLCompressedTextureATC.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebGLCompressedTextureATC.idl; path = canvas/WebGLCompressedTextureATC.idl; sourceTree = "<group>"; };
     9618                7EA30F6217EFD62700257D0B /* WebGLCompressedTexturePVRTC.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebGLCompressedTexturePVRTC.idl; path = canvas/WebGLCompressedTexturePVRTC.idl; sourceTree = "<group>"; };
    96129619                7EA30F6716DFFE7500257D0B /* JSWebGLCompressedTextureATC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLCompressedTextureATC.cpp; sourceTree = "<group>"; };
     9620                7EA30F6717EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLCompressedTexturePVRTC.cpp; sourceTree = "<group>"; };
    96139621                7EA30F6816DFFE7500257D0B /* JSWebGLCompressedTextureATC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLCompressedTextureATC.h; sourceTree = "<group>"; };
    9614                 7E66E23117E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLCompressedTexturePVRTC.cpp; path = canvas/WebGLCompressedTexturePVRTC.cpp; sourceTree = "<group>"; };
    9615                 7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLCompressedTexturePVRTC.h; path = canvas/WebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; };
    9616                 7EA30F6217EFD62700257D0B /* WebGLCompressedTexturePVRTC.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebGLCompressedTexturePVRTC.idl; path = canvas/WebGLCompressedTexturePVRTC.idl; sourceTree = "<group>"; };
    9617                 7EA30F6717EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLCompressedTexturePVRTC.cpp; sourceTree = "<group>"; };
    96189622                7EA30F6817EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; };
    96199623                7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationCF.cpp; sourceTree = "<group>"; };
    … …  
    2000420008                                BC64B4C90CB4295D005F2B62 /* CachedFont.cpp */,
    2000520009                                BC64B4CA0CB4295D005F2B62 /* CachedFont.h */,
     20010                                1AEF4E66170E160300AB2799 /* CachedFontClient.h */,
    2000620011                                BCB16C020979C3BD00467741 /* CachedImage.cpp */,
    2000720012                                BCB16C030979C3BD00467741 /* CachedImage.h */,
    … …  
    2002820033                                A104F24114C71F7A009E2C23 /* CachedSVGDocument.cpp */,
    2002920034                                A104F24214C71F7A009E2C23 /* CachedSVGDocument.h */,
     20035                                1AEF4E68170E174800AB2799 /* CachedSVGDocumentClient.h */,
    2003020036                                FB2C15C2165D64900039C9F8 /* CachedSVGDocumentReference.h */,
    2003120037                                0753860014489E9800B78452 /* CachedTextTrack.cpp */,
    … …  
    2462924635                                B275356D0B053814002CE64F /* FloatSize.h in Headers */,
    2463024636                                D72F6D7A153159A3001EE44E /* FlowThreadController.h in Headers */,
     24637                                1AEF4E69170E174800AB2799 /* CachedSVGDocumentClient.h in Headers */,
    2463124638                                14993BE60B2F2B1C0050497F /* FocusController.h in Headers */,
    2463224639                                062287840B4DB322000C34DF /* FocusDirection.h in Headers */,
    … …  
    2535325360                                B2FA3D430AB75A6F000E5AC4 /* JSSVGAnimatedLengthList.h in Headers */,
    2535425361                                B2FA3D450AB75A6F000E5AC4 /* JSSVGAnimatedNumber.h in Headers */,
     25362                                1AEF4E67170E160300AB2799 /* CachedFontClient.h in Headers */,
    2535525363                                B2FA3D470AB75A6F000E5AC4 /* JSSVGAnimatedNumberList.h in Headers */,
    2535625364                                B2FA3D4B0AB75A6F000E5AC4 /* JSSVGAnimatedPreserveAspectRatio.h in Headers */,

  • trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp

    r145745 r147684  
    2626#include "HTMLCollection.h"
    2727#include "HTMLDocument.h"
    28 #include "History.h"
    29 #include "JSArrayBuffer.h"
    30 #include "JSDataView.h"
    3128#include "JSEvent.h"
    3229#include "JSEventListener.h"
    33 #include "JSEventSource.h"
    34 #include "JSFloat32Array.h"
    35 #include "JSFloat64Array.h"
    3630#include "JSHTMLAudioElement.h"
    3731#include "JSHTMLCollection.h"
    3832#include "JSHTMLOptionElement.h"
    39 #include "JSHistory.h"
    4033#include "JSImageConstructor.h"
    41 #include "JSInt16Array.h"
    42 #include "JSInt32Array.h"
    43 #include "JSInt8Array.h"
    44 #include "JSLocation.h"
    45 #include "JSMessageChannel.h"
    4634#include "JSMessagePortCustom.h"
    47 #include "JSUint16Array.h"
    48 #include "JSUint32Array.h"
    49 #include "JSUint8Array.h"
    50 #include "JSUint8ClampedArray.h"
    51 #include "JSWebKitCSSMatrix.h"
    52 #include "JSWebKitPoint.h"
    53 #include "JSXMLHttpRequest.h"
    54 #include "JSXSLTProcessor.h"
    5535#include "Location.h"
    56 #include "MediaPlayer.h"
    5736#include "ScheduledAction.h"
    5837#include "Settings.h"
    5938#include "SharedWorkerRepository.h"
    60 #include <runtime/JSFunction.h>
    6139
    6240#if ENABLE(WORKERS)

  • trunk/Source/WebCore/css/CSSFontFaceSource.h

    r145787 r147684  
    2727#define CSSFontFaceSource_h
    2828
    29 #include "CachedFont.h"
     29#include "CachedFontClient.h"
    3030#include "CachedResourceHandle.h"
    3131#include "Timer.h"
    … …  
    4444class SVGFontFaceElement;
    4545#endif
    46 
    4746
    4847class CSSFontFaceSource : public CachedFontClient {

  • trunk/Source/WebCore/html/canvas/CanvasPattern.cpp

    r127757 r147684  
    2828
    2929#include "ExceptionCode.h"
     30#include "Image.h"
     31#include "Pattern.h"
    3032#include <wtf/text/WTFString.h>
    3133
    3234namespace WebCore {
     35
     36PassRefPtr<CanvasPattern> CanvasPattern::create(PassRefPtr<Image> image, bool repeatX, bool repeatY, bool originClean)
     37{
     38    return adoptRef(new CanvasPattern(image, repeatX, repeatY, originClean));
     39}
     40
     41CanvasPattern::CanvasPattern(PassRefPtr<Image> image, bool repeatX, bool repeatY, bool originClean)
     42    : m_pattern(Pattern::create(image, repeatX, repeatY))
     43    , m_originClean(originClean)
     44{
     45}
     46
     47CanvasPattern::~CanvasPattern()
     48{
     49}
    3350
    3451void CanvasPattern::parseRepetitionType(const String& type, bool& repeatX, bool& repeatY, ExceptionCode& ec)
    … …  
    5875}
    5976
    60 CanvasPattern::CanvasPattern(PassRefPtr<Image> image, bool repeatX, bool repeatY, bool originClean)
    61     : m_pattern(Pattern::create(image, repeatX, repeatY))
    62     , m_originClean(originClean)
    63 {
    64 }
    65 
    66 }
     77} // namespace WebCore

  • trunk/Source/WebCore/html/canvas/CanvasPattern.h

    r65449 r147684  
    2727#define CanvasPattern_h
    2828
    29 #include "Pattern.h"
    3029#include <wtf/Forward.h>
    3130#include <wtf/PassRefPtr.h>
    3231#include <wtf/RefCounted.h>
     32#include <wtf/RefPtr.h>
    3333
    3434namespace WebCore {
    3535
    36     class Image;
     36class Image;
     37class Pattern;
    3738
    38     typedef int ExceptionCode;
     39typedef int ExceptionCode;
    3940
    40     class CanvasPattern : public RefCounted<CanvasPattern> {
    41     public:
    42         static void parseRepetitionType(const String&, bool& repeatX, bool& repeatY, ExceptionCode&);
     41class CanvasPattern : public RefCounted<CanvasPattern> {
     42public:
     43    static PassRefPtr<CanvasPattern> create(PassRefPtr<Image>, bool repeatX, bool repeatY, bool originClean);
     44    ~CanvasPattern();
    4345
    44         static PassRefPtr<CanvasPattern> create(PassRefPtr<Image> image, bool repeatX, bool repeatY, bool originClean)
    45         {
    46             return adoptRef(new CanvasPattern(image, repeatX, repeatY, originClean));
    47         }
     46    static void parseRepetitionType(const String&, bool& repeatX, bool& repeatY, ExceptionCode&);
    4847
    49         Pattern* pattern() const { return m_pattern.get(); }
     48    Pattern* pattern() const { return m_pattern.get(); }
    5049
    51         bool originClean() const { return m_originClean; }
     50    bool originClean() const { return m_originClean; }
    5251
    53     private:
    54         CanvasPattern(PassRefPtr<Image>, bool repeatX, bool repeatY, bool originClean);
     52private:
     53    CanvasPattern(PassRefPtr<Image>, bool repeatX, bool repeatY, bool originClean);
    5554
    56         RefPtr<Pattern> m_pattern;
    57         bool m_originClean;
    58     };
     55    RefPtr<Pattern> m_pattern;
     56    bool m_originClean;
     57};
    5958
    6059} // namespace WebCore

  • trunk/Source/WebCore/html/parser/HTMLScriptRunner.h

    r144565 r147684  
    2929#include "PendingScript.h"
    3030#include <wtf/Deque.h>
     31#include <wtf/PassOwnPtr.h>
    3132#include <wtf/text/TextPosition.h>
    32 #include <wtf/PassRefPtr.h>
    3333
    3434namespace WebCore {

  • trunk/Source/WebCore/loader/ImageLoader.h

    r145501 r147684  
    2424#define ImageLoader_h
    2525
    26 #include "CachedImage.h"
    2726#include "CachedImageClient.h"
    2827#include "CachedResourceHandle.h"
     28#include "Timer.h"
    2929#include <wtf/text/AtomicString.h>
    3030

  • trunk/Source/WebCore/loader/LinkLoader.h

    r144565 r147684  
    4343namespace WebCore {
    4444
     45class Document;
     46class KURL;
    4547struct LinkRelAttribute;
     48
    4649#if ENABLE(LINK_PRERENDER)
    4750class PrerenderHandle;

  • trunk/Source/WebCore/loader/TextTrackLoader.h

    r147325 r147684  
    3131#include "CachedResourceClient.h"
    3232#include "CachedResourceHandle.h"
    33 #include "CachedTextTrack.h"
    3433#include "Timer.h"
    3534#include "WebVTTParser.h"
    … …  
    3837namespace WebCore {
    3938
     39class CachedTextTrack;
    4040class Document;
    4141class TextTrackLoader;

  • trunk/Source/WebCore/loader/cache/CachedFont.cpp

    r146802 r147684  
    2828#include "CachedFont.h"
    2929
    30 #include "CachedResourceClient.h"
     30#include "CachedFontClient.h"
    3131#include "CachedResourceClientWalker.h"
    3232#include "CachedResourceLoader.h"

  • trunk/Source/WebCore/loader/cache/CachedFont.h

    r144565 r147684  
    7777};
    7878
    79 class CachedFontClient : public CachedResourceClient {
    80 public:
    81     virtual ~CachedFontClient() { }
    82     static CachedResourceClientType expectedType() { return FontType; }
    83     virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
    84     virtual void fontLoaded(CachedFont*) { }
    85 };
     79} // namespace WebCore
    8680
    87 }
    88 
    89 #endif
     81#endif // CachedFont_h

  • trunk/Source/WebCore/loader/cache/CachedResourceHandle.cpp

    r144565 r147684  
    2727#include "CachedResourceHandle.h"
    2828
     29#include "CachedResource.h"
    2930#include "WebCoreMemoryInstrumentation.h"
    3031
    3132namespace WebCore {
    3233
    33 void CachedResourceHandleBase::setResource(CachedResource* resource)
     34CachedResourceHandleBase::CachedResourceHandleBase()
     35    : m_resource(0)
     36{
     37}
     38
     39CachedResourceHandleBase::CachedResourceHandleBase(CachedResource* resource)
     40    : m_resource(resource)
     41{
     42    if (m_resource)
     43        m_resource->registerHandle(this);
     44}
     45
     46CachedResourceHandleBase::CachedResourceHandleBase(const CachedResourceHandleBase& other)
     47    : m_resource(other.m_resource)
     48{
     49    if (m_resource)
     50        m_resource->registerHandle(this);
     51}
     52
     53CachedResourceHandleBase::~CachedResourceHandleBase()
     54{
     55    if (m_resource)
     56        m_resource->unregisterHandle(this);
     57}
     58
     59void CachedResourceHandleBase::setResource(CachedResource* resource)
    3460{
    3561    if (resource == m_resource)

  • trunk/Source/WebCore/loader/cache/CachedResourceHandle.h

    r144565 r147684  
    2727#define CachedResourceHandle_h
    2828
    29 #include "CachedResource.h"
     29#include <wtf/Forward.h>
    3030
    3131namespace WebCore {
    3232
    33     class CachedResourceHandleBase {
    34     public:
    35         ~CachedResourceHandleBase() { if (m_resource) m_resource->unregisterHandle(this); }
    36         CachedResource* get() const { return m_resource; }
    37        
    38         bool operator!() const { return !m_resource; }
    39        
    40         // This conversion operator allows implicit conversion to bool but not to other integer types.
    41         typedef CachedResource* CachedResourceHandleBase::*UnspecifiedBoolType;
    42         operator UnspecifiedBoolType() const { return m_resource ? &CachedResourceHandleBase::m_resource : 0; }
     33class CachedResource;
    4334
    44         void reportMemoryUsage(MemoryObjectInfo*) const;
     35class CachedResourceHandleBase {
     36public:
     37    ~CachedResourceHandleBase();
    4538
    46     protected:
    47         CachedResourceHandleBase() : m_resource(0) {}
    48         CachedResourceHandleBase(CachedResource* res) { m_resource = res; if (m_resource) m_resource->registerHandle(this); }
    49         CachedResourceHandleBase(const CachedResourceHandleBase& o) : m_resource(o.m_resource) { if (m_resource) m_resource->registerHandle(this); }
     39    CachedResource* get() const { return m_resource; }
     40   
     41    bool operator!() const { return !m_resource; }
     42   
     43    // This conversion operator allows implicit conversion to bool but not to other integer types.
     44    typedef CachedResource* CachedResourceHandleBase::*UnspecifiedBoolType;
     45    operator UnspecifiedBoolType() const { return m_resource ? &CachedResourceHandleBase::m_resource : 0; }
    5046
    51         void setResource(CachedResource*);
    52        
    53     private:
    54         CachedResourceHandleBase& operator=(const CachedResourceHandleBase&) { return *this; }
    55        
    56         friend class CachedResource;
     47    void reportMemoryUsage(MemoryObjectInfo*) const;
    5748
    58         CachedResource* m_resource;
    59     };
    60        
    61     template <class R> class CachedResourceHandle : public CachedResourceHandleBase {
    62     public:
    63         CachedResourceHandle() { }
    64         CachedResourceHandle(R* res) : CachedResourceHandleBase(res) { }
    65         CachedResourceHandle(const CachedResourceHandle<R>& o) : CachedResourceHandleBase(o) { }
    66         template<typename U> CachedResourceHandle(const CachedResourceHandle<U>& o) : CachedResourceHandleBase(o.get()) { }
     49protected:
     50    CachedResourceHandleBase();
     51    CachedResourceHandleBase(CachedResource*);
     52    CachedResourceHandleBase(const CachedResourceHandleBase&);
    6753
    68         R* get() const { return reinterpret_cast<R*>(CachedResourceHandleBase::get()); }
    69         R* operator->() const { return get(); }
    70                
    71         CachedResourceHandle& operator=(R* res) { setResource(res); return *this; }
    72         CachedResourceHandle& operator=(const CachedResourceHandle& o) { setResource(o.get()); return *this; }
    73         template<typename U> CachedResourceHandle& operator=(const CachedResourceHandle<U>& o) { setResource(o.get()); return *this; }
     54    void setResource(CachedResource*);
     55   
     56private:
     57    CachedResourceHandleBase& operator=(const CachedResourceHandleBase&) { return *this; }
     58   
     59    friend class CachedResource;
    7460
    75         bool operator==(const CachedResourceHandleBase& o) const { return get() == o.get(); }
    76         bool operator!=(const CachedResourceHandleBase& o) const { return get() != o.get(); }
    77     };
     61    CachedResource* m_resource;
     62};
     63   
     64template <class R> class CachedResourceHandle : public CachedResourceHandleBase {
     65public:
     66    CachedResourceHandle() { }
     67    CachedResourceHandle(R* res) : CachedResourceHandleBase(res) { }
     68    CachedResourceHandle(const CachedResourceHandle<R>& o) : CachedResourceHandleBase(o) { }
     69    template<typename U> CachedResourceHandle(const CachedResourceHandle<U>& o) : CachedResourceHandleBase(o.get()) { }
    7870
    79     template <class R, class RR> bool operator==(const CachedResourceHandle<R>& h, const RR* res)
    80     {
    81         return h.get() == res;
    82     }
    83     template <class R, class RR> bool operator==(const RR* res, const CachedResourceHandle<R>& h)
    84     {
    85         return h.get() == res;
    86     }
    87     template <class R, class RR> bool operator!=(const CachedResourceHandle<R>& h, const RR* res)
    88     {
    89         return h.get() != res;
    90     }
    91     template <class R, class RR> bool operator!=(const RR* res, const CachedResourceHandle<R>& h)
    92     {
    93         return h.get() != res;
    94     }
     71    R* get() const { return reinterpret_cast<R*>(CachedResourceHandleBase::get()); }
     72    R* operator->() const { return get(); }
     73
     74    CachedResourceHandle& operator=(R* res) { setResource(res); return *this; }
     75    CachedResourceHandle& operator=(const CachedResourceHandle& o) { setResource(o.get()); return *this; }
     76    template<typename U> CachedResourceHandle& operator=(const CachedResourceHandle<U>& o) { setResource(o.get()); return *this; }
     77
     78    bool operator==(const CachedResourceHandleBase& o) const { return get() == o.get(); }
     79    bool operator!=(const CachedResourceHandleBase& o) const { return get() != o.get(); }
     80};
     81
     82template <class R, class RR> bool operator==(const CachedResourceHandle<R>& h, const RR* res)
     83{
     84    return h.get() == res;
     85}
     86template <class R, class RR> bool operator==(const RR* res, const CachedResourceHandle<R>& h)
     87{
     88    return h.get() == res;
     89}
     90template <class R, class RR> bool operator!=(const CachedResourceHandle<R>& h, const RR* res)
     91{
     92    return h.get() != res;
     93}
     94template <class R, class RR> bool operator!=(const RR* res, const CachedResourceHandle<R>& h)
     95{
     96    return h.get() != res;
    9597}
    9698
    97 #endif
     99} // namespace WebCore
     100
     101#endif // CachedResourceHandle

  • trunk/Source/WebCore/loader/cache/CachedSVGDocument.h

    r144565 r147684  
    2626#if ENABLE(SVG)
    2727#include "CachedResource.h"
    28 #include "CachedResourceClient.h"
    2928#include "CachedResourceHandle.h"
    3029#include "SVGDocument.h"
    … …  
    5150};
    5251
    53 class CachedSVGDocumentClient : public CachedResourceClient {
    54 public:
    55     virtual ~CachedSVGDocumentClient() { }
    56     static CachedResourceClientType expectedType() { return SVGDocumentType; }
    57     virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
    58 };
     52} // namespace WebCore
    5953
    60 }
    61 
    62 #endif
     54#endif // USE(SVG)
    6355
    6456#endif // CachedSVGDocument_h

  • trunk/Source/WebCore/loader/cache/CachedSVGDocumentClient.h

    r147683 r147684  
    2121*/
    2222
    23 #ifndef CachedSVGDocument_h
    24 #define CachedSVGDocument_h
     23#ifndef CachedSVGDocumentClient_h
     24#define CachedSVGDocumentClient_h
    2525
    2626#if ENABLE(SVG)
    27 #include "CachedResource.h"
     27
    2828#include "CachedResourceClient.h"
    29 #include "CachedResourceHandle.h"
    30 #include "SVGDocument.h"
    31 #include "TextResourceDecoder.h"
    3229
    3330namespace WebCore {
    3431
    35 class CachedSVGDocument : public CachedResource {
    36 public:
    37     explicit CachedSVGDocument(const ResourceRequest&);
    38     virtual ~CachedSVGDocument();
    39 
    40     SVGDocument* document() const { return m_document.get(); }
    41 
    42     virtual void setEncoding(const String&);
    43     virtual String encoding() const;
    44     virtual void data(PassRefPtr<ResourceBuffer> data, bool allDataReceived);
    45 
    46     virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
    47 
    48 protected:
    49     RefPtr<SVGDocument> m_document;
    50     RefPtr<TextResourceDecoder> m_decoder;
    51 };
     32class CachedSVGDocument;
    5233
    5334class CachedSVGDocumentClient : public CachedResourceClient {
    … …  
    5839};
    5940
    60 }
     41} // namespace WebCore
    6142
    62 #endif
     43#endif // ENABLE(SVG)
    6344
    64 #endif // CachedSVGDocument_h
     45#endif // CachedSVGDocumentClient_h

  • trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h

    r144565 r147684  
    2828
    2929#if ENABLE(SVG) && ENABLE(CSS_FILTERS)
     30
    3031#include "CachedResourceHandle.h"
    3132#include "CachedSVGDocument.h"
     33#include "CachedSVGDocumentClient.h"
    3234
    3335namespace WebCore {
    … …  
    4446};
    4547
    46 #endif
     48#endif // ENABLE(SVG) && ENABLE(CSS_FILTERS)
    4749
    48 #endif
     50#endif // CachedSVGDocumentReference_h

  • trunk/Source/WebCore/loader/cache/CachedStyleSheetClient.h

    r144565 r147684  
    3131
    3232namespace WebCore {
     33
    3334class CachedCSSStyleSheet;
     35class KURL;
    3436
    3537class CachedStyleSheetClient : public CachedResourceClient {
    … …  
    4143    virtual void setXSLStyleSheet(const String& /* href */, const KURL& /* baseURL */, const String& /* sheet */) { }
    4244};
    43 }
     45
     46} // namespace WebCore
    4447
    4548#endif // CachedStyleSheetClient_h

  • trunk/Source/WebCore/platform/PlatformScreen.h

    r135165 r147684  
    2727#define PlatformScreen_h
    2828
    29 #include "FloatRect.h"
    30 #include <wtf/Forward.h>
    31 #include <wtf/RefPtr.h>
     29#include <wtf/Vector.h>
    3230
    3331#if PLATFORM(MAC)
    3432OBJC_CLASS NSScreen;
    3533OBJC_CLASS NSWindow;
     34#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
     35typedef struct CGRect NSRect;
     36typedef struct CGPoint NSPoint;
     37#else
     38typedef struct _NSRect NSRect;
     39typedef struct _NSPoint NSPoint;
     40#endif
    3641#endif
    3742

  • trunk/Source/WebCore/platform/audio/HRTFElevation.cpp

    r141611 r147684  
    3737#include "Biquad.h"
    3838#include "FFTFrame.h"
     39#include "HRTFDatabaseLoader.h"
    3940#include "HRTFPanner.h"
    4041#include "PlatformMemoryInstrumentation.h"

  • trunk/Source/WebCore/platform/audio/HRTFKernel.cpp

    r141570 r147684  
    100100}
    101101
     102size_t HRTFKernel::fftSize() const
     103{
     104    return m_fftFrame->fftSize();
     105}
     106
    102107PassOwnPtr<AudioChannel> HRTFKernel::createImpulseResponse()
    103108{

  • trunk/Source/WebCore/platform/audio/HRTFKernel.h

    r135220 r147684  
    6767    FFTFrame* fftFrame() { return m_fftFrame.get(); }
    6868   
    69     size_t fftSize() const { return m_fftFrame->fftSize(); }
     69    size_t fftSize() const;
    7070    float frameDelay() const { return m_frameDelay; }
    7171

  • trunk/Source/WebCore/platform/audio/ReverbConvolverStage.cpp

    r120044 r147684  
    3333#include "ReverbConvolverStage.h"
    3434
     35#include "FFTFrame.h"
    3536#include "VectorMath.h"
    3637#include "ReverbAccumulationBuffer.h"
    … …  
    9091    delayBufferSize = delayBufferSize < renderSliceSize ? renderSliceSize : delayBufferSize;
    9192    m_preDelayBuffer.allocate(delayBufferSize);
     93}
     94
     95ReverbConvolverStage::~ReverbConvolverStage()
     96{
    9297}
    9398

  • trunk/Source/WebCore/platform/audio/ReverbConvolverStage.h

    r120044 r147684  
    3131
    3232#include "AudioArray.h"
    33 #include "FFTFrame.h"
    3433#include <wtf/OwnPtr.h>
    3534
    3635namespace WebCore {
    3736
     37class FFTFrame;
    3838class ReverbAccumulationBuffer;
    3939class ReverbConvolver;
    … …  
    4848    // their heavy work (FFT processing) on different slices to balance the load in a real-time thread.
    4949    ReverbConvolverStage(const float* impulseResponse, size_t responseLength, size_t reverbTotalLatency, size_t stageOffset, size_t stageLength, size_t fftSize, size_t renderPhase, size_t renderSliceSize, ReverbAccumulationBuffer*, bool directMode = false);
     50    ~ReverbConvolverStage();
    5051
    5152    // WARNING: framesToProcess must be such that it evenly divides the delay buffer size (stage_offset).

  • trunk/Source/WebCore/platform/graphics/FontPlatformData.h

    r141291 r147684  
    5656typedef struct CGFont* CGFontRef;
    5757typedef const struct __CTFont* CTFontRef;
    58 
    59 #include <CoreFoundation/CFBase.h>
    60 #include <objc/objc-auto.h>
    6158#endif
    6259

  • trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

    r147622 r147684  
    5353
    5454#if PLATFORM(MAC)
    55 #include <OpenGL/OpenGL.h>
    5655#include <wtf/RetainPtr.h>
    5756OBJC_CLASS CALayer;
    … …  
    7170
    7271#if PLATFORM(MAC)
     72typedef struct _CGLContextObject *CGLContextObj;
     73
    7374typedef CGLContextObj PlatformGraphicsContext3D;
    7475#elif PLATFORM(QT)
    … …  
    8788const PlatformGraphicsContext3D NullPlatformGraphicsContext3D = 0;
    8889const Platform3DObject NullPlatform3DObject = 0;
    89 
    90 #if USE(CG)
    91 #include <CoreGraphics/CGContext.h>
    92 #endif
    9390
    9491namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/Path.cpp

    r135411 r147684  
    3333#include "FloatRect.h"
    3434#include "PathTraversalState.h"
     35#include "RoundedRect.h"
    3536#include <math.h>
    3637#include <wtf/MathExtras.h>

  • trunk/Source/WebCore/platform/graphics/Path.h

    r124135 r147684  
    2929#define Path_h
    3030
    31 #include "RoundedRect.h"
    3231#include "WindRule.h"
    3332#include <wtf/FastAllocBase.h>
    … …  
    7877    class FloatSize;
    7978    class GraphicsContext;
     79    class RoundedRect;
    8080    class StrokeStyleApplier;
    8181

  • trunk/Source/WebCore/platform/graphics/Pattern.cpp

    r109171 r147684  
    3131
    3232namespace WebCore {
     33
     34PassRefPtr<Pattern> Pattern::create(PassRefPtr<Image> tileImage, bool repeatX, bool repeatY)
     35{
     36    return adoptRef(new Pattern(tileImage, repeatX, repeatY));
     37}
    3338
    3439Pattern::Pattern(PassRefPtr<Image> image, bool repeatX, bool repeatY)

  • trunk/Source/WebCore/platform/graphics/Pattern.h

    r121503 r147684  
    3030
    3131#include "AffineTransform.h"
    32 #include "Image.h"
    3332
    3433#include <wtf/PassRefPtr.h>
    … …  
    6362
    6463class AffineTransform;
     64class Image;
    6565
    6666class Pattern : public RefCounted<Pattern> {
    6767public:
    68     static PassRefPtr<Pattern> create(PassRefPtr<Image> tileImage, bool repeatX, bool repeatY)
    69     {
    70         return adoptRef(new Pattern(tileImage, repeatX, repeatY));
    71     }
     68    static PassRefPtr<Pattern> create(PassRefPtr<Image> tileImage, bool repeatX, bool repeatY);
    7269    virtual ~Pattern();
    7370

  • trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp

    r144565 r147684  
    3131#include "AnimationUtilities.h"
    3232
     33#if ENABLE(SVG)
     34#include "CachedSVGDocumentReference.h"
     35#endif
     36
    3337namespace WebCore {
     38
     39ReferenceFilterOperation::ReferenceFilterOperation(const String& url, const String& fragment, OperationType type)
     40    : FilterOperation(type)
     41    , m_url(url)
     42    , m_fragment(fragment)
     43{
     44}
     45
     46ReferenceFilterOperation::~ReferenceFilterOperation()
     47{
     48}
     49
     50#if ENABLE(SVG)
     51void ReferenceFilterOperation::setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference> cachedSVGDocumentReference)
     52{
     53    m_cachedSVGDocumentReference = cachedSVGDocumentReference;
     54}
     55#endif
    3456
    3557PassRefPtr<FilterOperation> BasicColorMatrixFilterOperation::blend(const FilterOperation* from, double progress, bool blendToPassthrough)

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

    r144565 r147684  
    4242#endif
    4343
    44 #if ENABLE(SVG)
    45 #include "CachedSVGDocumentReference.h"
    46 #endif
    47 
    4844// Annoyingly, wingdi.h #defines this.
    4945#ifdef PASSTHROUGH
    … …  
    5450
    5551// CSS Filters
     52
     53#if ENABLE(SVG)
     54class CachedSVGDocumentReference;
     55#endif
    5656
    5757#if PLATFORM(BLACKBERRY)
    … …  
    167167        return adoptRef(new ReferenceFilterOperation(url, fragment, type));
    168168    }
     169    ~ReferenceFilterOperation();
    169170
    170171    virtual bool affectsOpacity() const { return true; }
    … …  
    176177#if ENABLE(SVG)
    177178    CachedSVGDocumentReference* cachedSVGDocumentReference() const { return m_cachedSVGDocumentReference.get(); }
    178     void setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference> cachedSVGDocumentReference) { m_cachedSVGDocumentReference = cachedSVGDocumentReference; }
     179    void setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference>);
    179180#endif
    180181
    … …  
    183184
    184185private:
     186    ReferenceFilterOperation(const String& url, const String& fragment, OperationType);
    185187
    186188    virtual bool operator==(const FilterOperation& o) const
    … …  
    190192        const ReferenceFilterOperation* other = static_cast<const ReferenceFilterOperation*>(&o);
    191193        return m_url == other->m_url;
    192     }
    193 
    194     ReferenceFilterOperation(const String& url, const String& fragment, OperationType type)
    195         : FilterOperation(type)
    196         , m_url(url)
    197         , m_fragment(fragment)
    198     {
    199194    }
    200195

  • trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h

    r105296 r147684  
    3434
    3535#if USE(CG)
    36 #include <CoreGraphics/CGAffineTransform.h>
     36typedef struct CGAffineTransform CGAffineTransform;
    3737#elif USE(CAIRO)
    3838#include <cairo.h>

  • trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp

    r135165 r147684  
    3232#include "PlatformScreen.h"
    3333
     34#include "FloatRect.h"
    3435#include "GtkVersioning.h"
    3536#include "HostWindow.h"

  • trunk/Source/WebCore/plugins/DOMMimeType.h

    r104344 r147684  
    2121#define DOMMimeType_h
    2222
    23 #include "Frame.h"
    2423#include "FrameDestructionObserver.h"
    2524#include "PluginData.h"

  • trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h

    r144574 r147684  
    3333#if ENABLE(CSS_FILTERS)
    3434
     35#include "CachedResourceHandle.h"
    3536#include "FilterOperation.h"
    3637#include "LayoutRect.h"
    … …  
    4445
    4546#if ENABLE(SVG)
    46 #include "CachedSVGDocument.h"
     47#include "CachedSVGDocumentClient.h"
    4748#include "Element.h"
    4849#endif

  • trunk/Source/WebCore/rendering/style/StyleCachedShader.h

    r144565 r147684  
    3535#include "CachedResourceHandle.h"
    3636#include "StyleShader.h"
     37#include <wtf/PassRefPtr.h>
    3738
    3839namespace WebCore {

  • trunk/Source/WebCore/svg/SVGFEImageElement.h

    r144565 r147684  
    2323
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    25 #include "CachedImage.h"
     25#include "CachedImageClient.h"
    2626#include "CachedResourceHandle.h"
    2727#include "ImageBuffer.h"

  • trunk/Source/WebCore/svg/SVGFontFaceUriElement.h

    r144565 r147684  
    2222
    2323#if ENABLE(SVG_FONTS)
    24 #include "CachedFont.h"
     24#include "CachedFontClient.h"
    2525#include "CachedResourceHandle.h"
    2626#include "SVGElement.h"
    … …  
    5353
    5454#endif // ENABLE(SVG_FONTS)
    55 #endif
    5655
    57 // vim:ts=4:noet
     56#endif // SVGFontFaceUriElement_h

  • trunk/Source/WebCore/svg/SVGUseElement.h

    r144565 r147684  
    2323
    2424#if ENABLE(SVG)
    25 #include "CachedSVGDocument.h"
     25#include "CachedResourceHandle.h"
     26#include "CachedSVGDocumentClient.h"
    2627#include "SVGAnimatedBoolean.h"
    2728#include "SVGAnimatedLength.h"

  • trunk/Source/WebCore/xml/parser/XMLDocumentParser.h

    r146264 r147684  
    3434#include <wtf/HashMap.h>
    3535#include <wtf/OwnPtr.h>
     36#include <wtf/text/AtomicStringHash.h>
    3637#include <wtf/text/CString.h>
    37 #include <wtf/text/StringHash.h>
    3838
    3939#if USE(QXMLSTREAM)
Note: See TracChangeset for help on using the changeset viewer.