Prune unneeded header #includes
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Apr 2013 00:08:09 +0000 (00:08 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Apr 2013 00:08:09 +0000 (00:08 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147684 268f45cc-cd09-0410-ab3c-d52691b4dbfc

44 files changed:
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Modules/webaudio/AudioContext.h
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/JSDOMWindowCustom.cpp
Source/WebCore/css/CSSFontFaceSource.h
Source/WebCore/html/canvas/CanvasPattern.cpp
Source/WebCore/html/canvas/CanvasPattern.h
Source/WebCore/html/parser/HTMLScriptRunner.h
Source/WebCore/loader/ImageLoader.h
Source/WebCore/loader/LinkLoader.h
Source/WebCore/loader/TextTrackLoader.h
Source/WebCore/loader/cache/CachedFont.cpp
Source/WebCore/loader/cache/CachedFont.h
Source/WebCore/loader/cache/CachedFontClient.h [new file with mode: 0644]
Source/WebCore/loader/cache/CachedResourceHandle.cpp
Source/WebCore/loader/cache/CachedResourceHandle.h
Source/WebCore/loader/cache/CachedSVGDocument.h
Source/WebCore/loader/cache/CachedSVGDocumentClient.h [new file with mode: 0644]
Source/WebCore/loader/cache/CachedSVGDocumentReference.h
Source/WebCore/loader/cache/CachedStyleSheetClient.h
Source/WebCore/platform/PlatformScreen.h
Source/WebCore/platform/audio/HRTFElevation.cpp
Source/WebCore/platform/audio/HRTFKernel.cpp
Source/WebCore/platform/audio/HRTFKernel.h
Source/WebCore/platform/audio/ReverbConvolverStage.cpp
Source/WebCore/platform/audio/ReverbConvolverStage.h
Source/WebCore/platform/graphics/FontPlatformData.h
Source/WebCore/platform/graphics/GraphicsContext3D.h
Source/WebCore/platform/graphics/Path.cpp
Source/WebCore/platform/graphics/Path.h
Source/WebCore/platform/graphics/Pattern.cpp
Source/WebCore/platform/graphics/Pattern.h
Source/WebCore/platform/graphics/filters/FilterOperation.cpp
Source/WebCore/platform/graphics/filters/FilterOperation.h
Source/WebCore/platform/graphics/transforms/AffineTransform.h
Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
Source/WebCore/plugins/DOMMimeType.h
Source/WebCore/rendering/RenderLayerFilterInfo.h
Source/WebCore/rendering/style/StyleCachedShader.h
Source/WebCore/svg/SVGFEImageElement.h
Source/WebCore/svg/SVGFontFaceUriElement.h
Source/WebCore/svg/SVGUseElement.h
Source/WebCore/xml/parser/XMLDocumentParser.h

index e76838c..994b92a 100644 (file)
@@ -1,3 +1,91 @@
+2013-04-04  Anders Carlsson  <andersca@apple.com>
+
+        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:
+
 2013-04-04  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 
         [Cairo] Stop passing raw pointers to BitmapImage::create()
index aa1d5a5..f79b280 100644 (file)
@@ -3998,6 +3998,7 @@ webcore_sources += \
        Source/WebCore/loader/cache/CachedCSSStyleSheet.h \
        Source/WebCore/loader/cache/CachedFont.cpp \
        Source/WebCore/loader/cache/CachedFont.h \
+       Source/WebCore/loader/cache/CachedFontClient.h \
        Source/WebCore/loader/cache/CachedImage.cpp \
        Source/WebCore/loader/cache/CachedImage.h \
        Source/WebCore/loader/cache/CachedImageClient.h \
@@ -4855,6 +4856,7 @@ webcore_svg_sources += \
        Source/WebCore/css/WebKitCSSSVGDocumentValue.h \
        Source/WebCore/loader/cache/CachedSVGDocument.cpp \
        Source/WebCore/loader/cache/CachedSVGDocument.h \
+       Source/WebCore/loader/cache/CachedSVGDocumentClient.h \
        Source/WebCore/loader/cache/CachedSVGDocumentReference.h \
        Source/WebCore/platform/graphics/SVGGlyph.cpp \
        Source/WebCore/platform/graphics/SVGGlyph.h \
index 8a06668..f7ceaf3 100644 (file)
@@ -31,7 +31,6 @@
 #include "AudioDestinationNode.h"
 #include "EventListener.h"
 #include "EventTarget.h"
-#include "HRTFDatabaseLoader.h"
 #include <wtf/HashSet.h>
 #include <wtf/MainThread.h>
 #include <wtf/OwnPtr.h>
@@ -51,6 +50,7 @@ class AudioBufferSourceNode;
 class MediaElementAudioSourceNode;
 class MediaStreamAudioDestinationNode;
 class MediaStreamAudioSourceNode;
+class HRTFDatabaseLoader;
 class HTMLMediaElement;
 class ChannelMergerNode;
 class ChannelSplitterNode;
index 5a4e360..ded8324 100644 (file)
                1AE82F900CAAFA9D002237AE /* JSDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE82F8E0CAAFA9D002237AE /* JSDatabase.h */; };
                1AE82FEC0CAB07EE002237AE /* JSSQLResultSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE82FEA0CAB07EE002237AE /* JSSQLResultSet.cpp */; };
                1AE82FED0CAB07EE002237AE /* JSSQLResultSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE82FEB0CAB07EE002237AE /* JSSQLResultSet.h */; };
+               1AEF4E67170E160300AB2799 /* CachedFontClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEF4E66170E160300AB2799 /* CachedFontClient.h */; };
+               1AEF4E69170E174800AB2799 /* CachedSVGDocumentClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEF4E68170E174800AB2799 /* CachedSVGDocumentClient.h */; };
                1AF326790D78B9440068F0C4 /* EditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF326770D78B9440068F0C4 /* EditorClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AF62EE614DA22A70041556C /* ScrollingCoordinatorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AF62EE314DA22A70041556C /* ScrollingCoordinatorMac.mm */; };
                1AF62EE714DA22A70041556C /* ScrollingCoordinator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF62EE414DA22A70041556C /* ScrollingCoordinator.cpp */; };
                7E5D7A76161D3F8F00896C34 /* OESElementIndexUint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E5D7A73161D3F8F00896C34 /* OESElementIndexUint.cpp */; };
                7E5D7A77161D3F8F00896C34 /* OESElementIndexUint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E5D7A74161D3F8F00896C34 /* OESElementIndexUint.h */; };
                7E66E23316D6EB6C00F7E7FF /* WebGLCompressedTextureATC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E66E23116D6EB6C00F7E7FF /* WebGLCompressedTextureATC.cpp */; };
+               7E66E23317E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E66E23117E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp */; };
                7E66E23416D6EB6C00F7E7FF /* WebGLCompressedTextureATC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E66E23216D6EB6C00F7E7FF /* WebGLCompressedTextureATC.h */; };
+               7E66E23417E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */; };
                7E99AF510B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E99AF520B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp */; };
                7E99AF530B13846468FB01A5 /* WindowFocusAllowedIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E99AF540B13846468FB01A5 /* WindowFocusAllowedIndicator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7EA30F6916DFFE7500257D0B /* JSWebGLCompressedTextureATC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EA30F6716DFFE7500257D0B /* JSWebGLCompressedTextureATC.cpp */; };
-               7EA30F6A16DFFE7500257D0B /* JSWebGLCompressedTextureATC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EA30F6816DFFE7500257D0B /* JSWebGLCompressedTextureATC.h */; };
-               7E66E23317E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E66E23117E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp */; };
-               7E66E23417E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */; };
                7EA30F6917EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EA30F6717EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.cpp */; };
+               7EA30F6A16DFFE7500257D0B /* JSWebGLCompressedTextureATC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EA30F6816DFFE7500257D0B /* JSWebGLCompressedTextureATC.h */; };
                7EA30F6A17EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EA30F6817EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h */; };
                7EE6845F12D26E3800E79415 /* AuthenticationCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */; };
                7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EE6844D12D26E3800E79415 /* AuthenticationCF.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AE82F8E0CAAFA9D002237AE /* JSDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDatabase.h; sourceTree = "<group>"; };
                1AE82FEA0CAB07EE002237AE /* JSSQLResultSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSQLResultSet.cpp; sourceTree = "<group>"; };
                1AE82FEB0CAB07EE002237AE /* JSSQLResultSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSQLResultSet.h; sourceTree = "<group>"; };
+               1AEF4E66170E160300AB2799 /* CachedFontClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedFontClient.h; sourceTree = "<group>"; };
+               1AEF4E68170E174800AB2799 /* CachedSVGDocumentClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedSVGDocumentClient.h; sourceTree = "<group>"; };
                1AF326770D78B9440068F0C4 /* EditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditorClient.h; sourceTree = "<group>"; };
                1AF62EE314DA22A70041556C /* ScrollingCoordinatorMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingCoordinatorMac.mm; sourceTree = "<group>"; };
                1AF62EE414DA22A70041556C /* ScrollingCoordinator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingCoordinator.cpp; sourceTree = "<group>"; };
                7E5D7A73161D3F8F00896C34 /* OESElementIndexUint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OESElementIndexUint.cpp; path = canvas/OESElementIndexUint.cpp; sourceTree = "<group>"; };
                7E5D7A74161D3F8F00896C34 /* OESElementIndexUint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OESElementIndexUint.h; path = canvas/OESElementIndexUint.h; sourceTree = "<group>"; };
                7E66E23116D6EB6C00F7E7FF /* WebGLCompressedTextureATC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLCompressedTextureATC.cpp; path = canvas/WebGLCompressedTextureATC.cpp; sourceTree = "<group>"; };
+               7E66E23117E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLCompressedTexturePVRTC.cpp; path = canvas/WebGLCompressedTexturePVRTC.cpp; sourceTree = "<group>"; };
                7E66E23216D6EB6C00F7E7FF /* WebGLCompressedTextureATC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLCompressedTextureATC.h; path = canvas/WebGLCompressedTextureATC.h; sourceTree = "<group>"; };
+               7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLCompressedTexturePVRTC.h; path = canvas/WebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; };
                7E99AF520B13846468FB01A5 /* WindowFocusAllowedIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowFocusAllowedIndicator.cpp; sourceTree = "<group>"; };
                7E99AF540B13846468FB01A5 /* WindowFocusAllowedIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowFocusAllowedIndicator.h; sourceTree = "<group>"; };
                7EA30F6216DFD62700257D0B /* WebGLCompressedTextureATC.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebGLCompressedTextureATC.idl; path = canvas/WebGLCompressedTextureATC.idl; sourceTree = "<group>"; };
-               7EA30F6716DFFE7500257D0B /* JSWebGLCompressedTextureATC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLCompressedTextureATC.cpp; sourceTree = "<group>"; };
-               7EA30F6816DFFE7500257D0B /* JSWebGLCompressedTextureATC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLCompressedTextureATC.h; sourceTree = "<group>"; };
-               7E66E23117E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebGLCompressedTexturePVRTC.cpp; path = canvas/WebGLCompressedTexturePVRTC.cpp; sourceTree = "<group>"; };
-               7E66E23217E6EB6C00F7E7FF /* WebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebGLCompressedTexturePVRTC.h; path = canvas/WebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; };
                7EA30F6217EFD62700257D0B /* WebGLCompressedTexturePVRTC.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebGLCompressedTexturePVRTC.idl; path = canvas/WebGLCompressedTexturePVRTC.idl; sourceTree = "<group>"; };
+               7EA30F6716DFFE7500257D0B /* JSWebGLCompressedTextureATC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLCompressedTextureATC.cpp; sourceTree = "<group>"; };
                7EA30F6717EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLCompressedTexturePVRTC.cpp; sourceTree = "<group>"; };
+               7EA30F6816DFFE7500257D0B /* JSWebGLCompressedTextureATC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLCompressedTextureATC.h; sourceTree = "<group>"; };
                7EA30F6817EFFE7500257D0B /* JSWebGLCompressedTexturePVRTC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLCompressedTexturePVRTC.h; sourceTree = "<group>"; };
                7EE6844C12D26E3800E79415 /* AuthenticationCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthenticationCF.cpp; sourceTree = "<group>"; };
                7EE6844D12D26E3800E79415 /* AuthenticationCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationCF.h; sourceTree = "<group>"; };
                                BCB16C010979C3BD00467741 /* CachedCSSStyleSheet.h */,
                                BC64B4C90CB4295D005F2B62 /* CachedFont.cpp */,
                                BC64B4CA0CB4295D005F2B62 /* CachedFont.h */,
+                               1AEF4E66170E160300AB2799 /* CachedFontClient.h */,
                                BCB16C020979C3BD00467741 /* CachedImage.cpp */,
                                BCB16C030979C3BD00467741 /* CachedImage.h */,
                                319FBD5D15D2F444009640A6 /* CachedImageClient.h */,
                                D0BC54481443AC4A00E105DA /* CachedStyleSheetClient.h */,
                                A104F24114C71F7A009E2C23 /* CachedSVGDocument.cpp */,
                                A104F24214C71F7A009E2C23 /* CachedSVGDocument.h */,
+                               1AEF4E68170E174800AB2799 /* CachedSVGDocumentClient.h */,
                                FB2C15C2165D64900039C9F8 /* CachedSVGDocumentReference.h */,
                                0753860014489E9800B78452 /* CachedTextTrack.cpp */,
                                0753860114489E9800B78452 /* CachedTextTrack.h */,
                                B275356B0B053814002CE64F /* FloatRect.h in Headers */,
                                B275356D0B053814002CE64F /* FloatSize.h in Headers */,
                                D72F6D7A153159A3001EE44E /* FlowThreadController.h in Headers */,
+                               1AEF4E69170E174800AB2799 /* CachedSVGDocumentClient.h in Headers */,
                                14993BE60B2F2B1C0050497F /* FocusController.h in Headers */,
                                062287840B4DB322000C34DF /* FocusDirection.h in Headers */,
                                B6D9D23514EABD260090D75E /* FocusEvent.h in Headers */,
                                B2FA3D410AB75A6F000E5AC4 /* JSSVGAnimatedLength.h in Headers */,
                                B2FA3D430AB75A6F000E5AC4 /* JSSVGAnimatedLengthList.h in Headers */,
                                B2FA3D450AB75A6F000E5AC4 /* JSSVGAnimatedNumber.h in Headers */,
+                               1AEF4E67170E160300AB2799 /* CachedFontClient.h in Headers */,
                                B2FA3D470AB75A6F000E5AC4 /* JSSVGAnimatedNumberList.h in Headers */,
                                B2FA3D4B0AB75A6F000E5AC4 /* JSSVGAnimatedPreserveAspectRatio.h in Headers */,
                                B2FA3D4D0AB75A6F000E5AC4 /* JSSVGAnimatedRect.h in Headers */,
index f2d92b4..34e58bd 100644 (file)
 #include "Frame.h"
 #include "HTMLCollection.h"
 #include "HTMLDocument.h"
-#include "History.h"
-#include "JSArrayBuffer.h"
-#include "JSDataView.h"
 #include "JSEvent.h"
 #include "JSEventListener.h"
-#include "JSEventSource.h"
-#include "JSFloat32Array.h"
-#include "JSFloat64Array.h"
 #include "JSHTMLAudioElement.h"
 #include "JSHTMLCollection.h"
 #include "JSHTMLOptionElement.h"
-#include "JSHistory.h"
 #include "JSImageConstructor.h"
-#include "JSInt16Array.h"
-#include "JSInt32Array.h"
-#include "JSInt8Array.h"
-#include "JSLocation.h"
-#include "JSMessageChannel.h"
 #include "JSMessagePortCustom.h"
-#include "JSUint16Array.h"
-#include "JSUint32Array.h"
-#include "JSUint8Array.h"
-#include "JSUint8ClampedArray.h"
-#include "JSWebKitCSSMatrix.h"
-#include "JSWebKitPoint.h"
-#include "JSXMLHttpRequest.h"
-#include "JSXSLTProcessor.h"
 #include "Location.h"
-#include "MediaPlayer.h"
 #include "ScheduledAction.h"
 #include "Settings.h"
 #include "SharedWorkerRepository.h"
-#include <runtime/JSFunction.h>
 
 #if ENABLE(WORKERS)
 #include "JSWorker.h"
index f090695..1154373 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CSSFontFaceSource_h
 #define CSSFontFaceSource_h
 
-#include "CachedFont.h"
+#include "CachedFontClient.h"
 #include "CachedResourceHandle.h"
 #include "Timer.h"
 #include <wtf/HashMap.h>
@@ -44,7 +44,6 @@ class SVGFontElement;
 class SVGFontFaceElement;
 #endif
 
-
 class CSSFontFaceSource : public CachedFontClient {
 public:
     CSSFontFaceSource(const String&, CachedFont* = 0);
index 9252a2a..a455741 100644 (file)
 #include "CanvasPattern.h"
 
 #include "ExceptionCode.h"
+#include "Image.h"
+#include "Pattern.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
+PassRefPtr<CanvasPattern> CanvasPattern::create(PassRefPtr<Image> image, bool repeatX, bool repeatY, bool originClean)
+{
+    return adoptRef(new CanvasPattern(image, repeatX, repeatY, originClean));
+}
+
+CanvasPattern::CanvasPattern(PassRefPtr<Image> image, bool repeatX, bool repeatY, bool originClean)
+    : m_pattern(Pattern::create(image, repeatX, repeatY))
+    , m_originClean(originClean)
+{
+}
+
+CanvasPattern::~CanvasPattern()
+{
+}
+
 void CanvasPattern::parseRepetitionType(const String& type, bool& repeatX, bool& repeatY, ExceptionCode& ec)
 {
     ec = 0;
@@ -57,10 +74,4 @@ void CanvasPattern::parseRepetitionType(const String& type, bool& repeatX, bool&
     ec = SYNTAX_ERR;
 }
 
-CanvasPattern::CanvasPattern(PassRefPtr<Image> image, bool repeatX, bool repeatY, bool originClean)
-    : m_pattern(Pattern::create(image, repeatX, repeatY))
-    , m_originClean(originClean)
-{
-}
-
-}
+} // namespace WebCore
index 58848a9..9fed575 100644 (file)
 #ifndef CanvasPattern_h
 #define CanvasPattern_h
 
-#include "Pattern.h"
 #include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
 
 namespace WebCore {
 
-    class Image;
+class Image;
+class Pattern;
 
-    typedef int ExceptionCode;
+typedef int ExceptionCode;
 
-    class CanvasPattern : public RefCounted<CanvasPattern> {
-    public:
-        static void parseRepetitionType(const String&, bool& repeatX, bool& repeatY, ExceptionCode&);
+class CanvasPattern : public RefCounted<CanvasPattern> {
+public:
+    static PassRefPtr<CanvasPattern> create(PassRefPtr<Image>, bool repeatX, bool repeatY, bool originClean);
+    ~CanvasPattern();
 
-        static PassRefPtr<CanvasPattern> create(PassRefPtr<Image> image, bool repeatX, bool repeatY, bool originClean)
-        {
-            return adoptRef(new CanvasPattern(image, repeatX, repeatY, originClean));
-        }
+    static void parseRepetitionType(const String&, bool& repeatX, bool& repeatY, ExceptionCode&);
 
-        Pattern* pattern() const { return m_pattern.get(); }
+    Pattern* pattern() const { return m_pattern.get(); }
 
-        bool originClean() const { return m_originClean; }
+    bool originClean() const { return m_originClean; }
 
-    private:
-        CanvasPattern(PassRefPtr<Image>, bool repeatX, bool repeatY, bool originClean);
+private:
+    CanvasPattern(PassRefPtr<Image>, bool repeatX, bool repeatY, bool originClean);
 
-        RefPtr<Pattern> m_pattern;
-        bool m_originClean;
-    };
+    RefPtr<Pattern> m_pattern;
+    bool m_originClean;
+};
 
 } // namespace WebCore
 
index a7226dc..a566936 100644 (file)
@@ -28,8 +28,8 @@
 
 #include "PendingScript.h"
 #include <wtf/Deque.h>
+#include <wtf/PassOwnPtr.h>
 #include <wtf/text/TextPosition.h>
-#include <wtf/PassRefPtr.h>
 
 namespace WebCore {
 
index d691c81..b34b705 100644 (file)
@@ -23,9 +23,9 @@
 #ifndef ImageLoader_h
 #define ImageLoader_h
 
-#include "CachedImage.h"
 #include "CachedImageClient.h"
 #include "CachedResourceHandle.h"
+#include "Timer.h"
 #include <wtf/text/AtomicString.h>
 
 namespace WebCore {
index 4c853da..8b87d82 100644 (file)
 
 namespace WebCore {
 
+class Document;
+class KURL;
 struct LinkRelAttribute;
+
 #if ENABLE(LINK_PRERENDER)
 class PrerenderHandle;
 #endif
index a5ad03f..36f3ef0 100644 (file)
 
 #include "CachedResourceClient.h"
 #include "CachedResourceHandle.h"
-#include "CachedTextTrack.h"
 #include "Timer.h"
 #include "WebVTTParser.h"
 #include <wtf/OwnPtr.h>
 
 namespace WebCore {
 
+class CachedTextTrack;
 class Document;
 class TextTrackLoader;
 class ScriptExecutionContext;
index 0d4e912..002f828 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "CachedFont.h"
 
-#include "CachedResourceClient.h"
+#include "CachedFontClient.h"
 #include "CachedResourceClientWalker.h"
 #include "CachedResourceLoader.h"
 #include "FontCustomPlatformData.h"
index 5c28e2d..0c4d7cb 100644 (file)
@@ -76,14 +76,6 @@ private:
     friend class MemoryCache;
 };
 
-class CachedFontClient : public CachedResourceClient {
-public:
-    virtual ~CachedFontClient() { }
-    static CachedResourceClientType expectedType() { return FontType; }
-    virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
-    virtual void fontLoaded(CachedFont*) { }
-};
+} // namespace WebCore
 
-}
-
-#endif
+#endif // CachedFont_h
diff --git a/Source/WebCore/loader/cache/CachedFontClient.h b/Source/WebCore/loader/cache/CachedFontClient.h
new file mode 100644 (file)
index 0000000..0ae6418
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CachedFontClient_h
+#define CachedFontClient_h
+
+#include "CachedResourceClient.h"
+
+namespace WebCore {
+
+class CachedFont;
+
+class CachedFontClient : public CachedResourceClient {
+public:
+    virtual ~CachedFontClient() { }
+    static CachedResourceClientType expectedType() { return FontType; }
+    virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
+    virtual void fontLoaded(CachedFont*) { }
+};
+
+} // namespace WebCore
+
+#endif // CachedFontClient_h
index 0df7693..9fa627c 100644 (file)
 #include "config.h"
 #include "CachedResourceHandle.h"
 
+#include "CachedResource.h"
 #include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
-void CachedResourceHandleBase::setResource(CachedResource* resource) 
+CachedResourceHandleBase::CachedResourceHandleBase()
+    : m_resource(0)
+{
+}
+
+CachedResourceHandleBase::CachedResourceHandleBase(CachedResource* resource)
+    : m_resource(resource)
+{
+    if (m_resource)
+        m_resource->registerHandle(this);
+}
+
+CachedResourceHandleBase::CachedResourceHandleBase(const CachedResourceHandleBase& other)
+    : m_resource(other.m_resource)
+{
+    if (m_resource)
+        m_resource->registerHandle(this);
+}
+
+CachedResourceHandleBase::~CachedResourceHandleBase()
+{
+    if (m_resource)
+        m_resource->unregisterHandle(this);
+}
+
+void CachedResourceHandleBase::setResource(CachedResource* resource)
 {
     if (resource == m_resource)
         return;
index 4a13920..f9e5115 100644 (file)
 #ifndef CachedResourceHandle_h
 #define CachedResourceHandle_h
 
-#include "CachedResource.h"
+#include <wtf/Forward.h>
 
 namespace WebCore {
 
-    class CachedResourceHandleBase {
-    public:
-        ~CachedResourceHandleBase() { if (m_resource) m_resource->unregisterHandle(this); }
-        CachedResource* get() const { return m_resource; }
-        
-        bool operator!() const { return !m_resource; }
-        
-        // This conversion operator allows implicit conversion to bool but not to other integer types.
-        typedef CachedResource* CachedResourceHandleBase::*UnspecifiedBoolType;
-        operator UnspecifiedBoolType() const { return m_resource ? &CachedResourceHandleBase::m_resource : 0; }
-
-        void reportMemoryUsage(MemoryObjectInfo*) const;
-
-    protected:
-        CachedResourceHandleBase() : m_resource(0) {}
-        CachedResourceHandleBase(CachedResource* res) { m_resource = res; if (m_resource) m_resource->registerHandle(this); }
-        CachedResourceHandleBase(const CachedResourceHandleBase& o) : m_resource(o.m_resource) { if (m_resource) m_resource->registerHandle(this); }
-
-        void setResource(CachedResource*);
-        
-    private:
-        CachedResourceHandleBase& operator=(const CachedResourceHandleBase&) { return *this; } 
-        
-        friend class CachedResource;
-
-        CachedResource* m_resource;
-    };
-        
-    template <class R> class CachedResourceHandle : public CachedResourceHandleBase {
-    public: 
-        CachedResourceHandle() { }
-        CachedResourceHandle(R* res) : CachedResourceHandleBase(res) { }
-        CachedResourceHandle(const CachedResourceHandle<R>& o) : CachedResourceHandleBase(o) { }
-        template<typename U> CachedResourceHandle(const CachedResourceHandle<U>& o) : CachedResourceHandleBase(o.get()) { }
-
-        R* get() const { return reinterpret_cast<R*>(CachedResourceHandleBase::get()); }
-        R* operator->() const { return get(); }
-               
-        CachedResourceHandle& operator=(R* res) { setResource(res); return *this; } 
-        CachedResourceHandle& operator=(const CachedResourceHandle& o) { setResource(o.get()); return *this; }
-        template<typename U> CachedResourceHandle& operator=(const CachedResourceHandle<U>& o) { setResource(o.get()); return *this; }
-
-        bool operator==(const CachedResourceHandleBase& o) const { return get() == o.get(); }
-        bool operator!=(const CachedResourceHandleBase& o) const { return get() != o.get(); }
-    };
-
-    template <class R, class RR> bool operator==(const CachedResourceHandle<R>& h, const RR* res) 
-    { 
-        return h.get() == res; 
-    }
-    template <class R, class RR> bool operator==(const RR* res, const CachedResourceHandle<R>& h) 
-    { 
-        return h.get() == res; 
-    }
-    template <class R, class RR> bool operator!=(const CachedResourceHandle<R>& h, const RR* res) 
-    { 
-        return h.get() != res; 
-    }
-    template <class R, class RR> bool operator!=(const RR* res, const CachedResourceHandle<R>& h) 
-    { 
-        return h.get() != res; 
-    }
+class CachedResource;
+
+class CachedResourceHandleBase {
+public:
+    ~CachedResourceHandleBase();
+
+    CachedResource* get() const { return m_resource; }
+    
+    bool operator!() const { return !m_resource; }
+    
+    // This conversion operator allows implicit conversion to bool but not to other integer types.
+    typedef CachedResource* CachedResourceHandleBase::*UnspecifiedBoolType;
+    operator UnspecifiedBoolType() const { return m_resource ? &CachedResourceHandleBase::m_resource : 0; }
+
+    void reportMemoryUsage(MemoryObjectInfo*) const;
+
+protected:
+    CachedResourceHandleBase();
+    CachedResourceHandleBase(CachedResource*);
+    CachedResourceHandleBase(const CachedResourceHandleBase&);
+
+    void setResource(CachedResource*);
+    
+private:
+    CachedResourceHandleBase& operator=(const CachedResourceHandleBase&) { return *this; } 
+    
+    friend class CachedResource;
+
+    CachedResource* m_resource;
+};
+    
+template <class R> class CachedResourceHandle : public CachedResourceHandleBase {
+public: 
+    CachedResourceHandle() { }
+    CachedResourceHandle(R* res) : CachedResourceHandleBase(res) { }
+    CachedResourceHandle(const CachedResourceHandle<R>& o) : CachedResourceHandleBase(o) { }
+    template<typename U> CachedResourceHandle(const CachedResourceHandle<U>& o) : CachedResourceHandleBase(o.get()) { }
+
+    R* get() const { return reinterpret_cast<R*>(CachedResourceHandleBase::get()); }
+    R* operator->() const { return get(); }
+
+    CachedResourceHandle& operator=(R* res) { setResource(res); return *this; } 
+    CachedResourceHandle& operator=(const CachedResourceHandle& o) { setResource(o.get()); return *this; }
+    template<typename U> CachedResourceHandle& operator=(const CachedResourceHandle<U>& o) { setResource(o.get()); return *this; }
+
+    bool operator==(const CachedResourceHandleBase& o) const { return get() == o.get(); }
+    bool operator!=(const CachedResourceHandleBase& o) const { return get() != o.get(); }
+};
+
+template <class R, class RR> bool operator==(const CachedResourceHandle<R>& h, const RR* res) 
+{ 
+    return h.get() == res; 
+}
+template <class R, class RR> bool operator==(const RR* res, const CachedResourceHandle<R>& h) 
+{ 
+    return h.get() == res; 
 }
+template <class R, class RR> bool operator!=(const CachedResourceHandle<R>& h, const RR* res) 
+{ 
+    return h.get() != res; 
+}
+template <class R, class RR> bool operator!=(const RR* res, const CachedResourceHandle<R>& h) 
+{ 
+    return h.get() != res; 
+}
+
+} // namespace WebCore
 
-#endif
+#endif // CachedResourceHandle
index 83e59c4..56cbe28 100644 (file)
@@ -25,7 +25,6 @@
 
 #if ENABLE(SVG)
 #include "CachedResource.h"
-#include "CachedResourceClient.h"
 #include "CachedResourceHandle.h"
 #include "SVGDocument.h"
 #include "TextResourceDecoder.h"
@@ -50,15 +49,8 @@ protected:
     RefPtr<TextResourceDecoder> m_decoder;
 };
 
-class CachedSVGDocumentClient : public CachedResourceClient {
-public:
-    virtual ~CachedSVGDocumentClient() { }
-    static CachedResourceClientType expectedType() { return SVGDocumentType; }
-    virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
-};
-
-}
+} // namespace WebCore
 
-#endif
+#endif // USE(SVG)
 
 #endif // CachedSVGDocument_h
diff --git a/Source/WebCore/loader/cache/CachedSVGDocumentClient.h b/Source/WebCore/loader/cache/CachedSVGDocumentClient.h
new file mode 100644 (file)
index 0000000..b0eb5a9
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+    Copyright (C) 2010 Rob Buis <rwlbuis@gmail.com>
+    Copyright (C) 2011 Cosmin Truta <ctruta@gmail.com>
+    Copyright (C) 2012 University of Szeged
+    Copyright (C) 2012 Renata Hodovan <reni@webkit.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef CachedSVGDocumentClient_h
+#define CachedSVGDocumentClient_h
+
+#if ENABLE(SVG)
+
+#include "CachedResourceClient.h"
+
+namespace WebCore {
+
+class CachedSVGDocument;
+
+class CachedSVGDocumentClient : public CachedResourceClient {
+public:
+    virtual ~CachedSVGDocumentClient() { }
+    static CachedResourceClientType expectedType() { return SVGDocumentType; }
+    virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(SVG)
+
+#endif // CachedSVGDocumentClient_h
index 468030f..cda2eca 100644 (file)
 #define CachedSVGDocumentReference_h
 
 #if ENABLE(SVG) && ENABLE(CSS_FILTERS)
+
 #include "CachedResourceHandle.h"
 #include "CachedSVGDocument.h"
+#include "CachedSVGDocumentClient.h"
 
 namespace WebCore {
 
@@ -43,6 +45,6 @@ private:
 
 };
 
-#endif
+#endif // ENABLE(SVG) && ENABLE(CSS_FILTERS)
 
-#endif
+#endif // CachedSVGDocumentReference_h
index 4c87530..a488af0 100644 (file)
@@ -30,7 +30,9 @@
 #include <wtf/Forward.h>
 
 namespace WebCore {
+
 class CachedCSSStyleSheet;
+class KURL;
 
 class CachedStyleSheetClient : public CachedResourceClient {
 public:
@@ -40,6 +42,7 @@ public:
     virtual void setCSSStyleSheet(const String& /* href */, const KURL& /* baseURL */, const String& /* charset */, const CachedCSSStyleSheet*) { }
     virtual void setXSLStyleSheet(const String& /* href */, const KURL& /* baseURL */, const String& /* sheet */) { }
 };
-}
+
+} // namespace WebCore
 
 #endif // CachedStyleSheetClient_h
index 4fac54a..9336c7f 100644 (file)
 #ifndef PlatformScreen_h
 #define PlatformScreen_h
 
-#include "FloatRect.h"
-#include <wtf/Forward.h>
-#include <wtf/RefPtr.h>
+#include <wtf/Vector.h>
 
 #if PLATFORM(MAC)
 OBJC_CLASS NSScreen;
 OBJC_CLASS NSWindow;
+#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+typedef struct CGRect NSRect;
+typedef struct CGPoint NSPoint;
+#else
+typedef struct _NSRect NSRect;
+typedef struct _NSPoint NSPoint;
+#endif
 #endif
 
 typedef uint32_t PlatformDisplayID;
index b501010..e68927d 100644 (file)
@@ -36,6 +36,7 @@
 #include "AudioFileReader.h"
 #include "Biquad.h"
 #include "FFTFrame.h"
+#include "HRTFDatabaseLoader.h"
 #include "HRTFPanner.h"
 #include "PlatformMemoryInstrumentation.h"
 #include <algorithm>
index affa5f4..50a4a40 100644 (file)
@@ -99,6 +99,11 @@ HRTFKernel::HRTFKernel(AudioChannel* channel, size_t fftSize, float sampleRate)
     m_fftFrame->doPaddedFFT(impulseResponse, truncatedResponseLength);
 }
 
+size_t HRTFKernel::fftSize() const
+{
+    return m_fftFrame->fftSize();
+}
+
 PassOwnPtr<AudioChannel> HRTFKernel::createImpulseResponse()
 {
     OwnPtr<AudioChannel> channel = adoptPtr(new AudioChannel(fftSize()));
index d407a31..897b35d 100644 (file)
@@ -66,7 +66,7 @@ public:
   
     FFTFrame* fftFrame() { return m_fftFrame.get(); }
     
-    size_t fftSize() const { return m_fftFrame->fftSize(); }
+    size_t fftSize() const;
     float frameDelay() const { return m_frameDelay; }
 
     float sampleRate() const { return m_sampleRate; }
index 41f76ba..7d85da2 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "ReverbConvolverStage.h"
 
+#include "FFTFrame.h"
 #include "VectorMath.h"
 #include "ReverbAccumulationBuffer.h"
 #include "ReverbConvolver.h"
@@ -91,6 +92,10 @@ ReverbConvolverStage::ReverbConvolverStage(const float* impulseResponse, size_t,
     m_preDelayBuffer.allocate(delayBufferSize);
 }
 
+ReverbConvolverStage::~ReverbConvolverStage()
+{
+}
+
 void ReverbConvolverStage::processInBackground(ReverbConvolver* convolver, size_t framesToProcess)
 {
     ReverbInputBuffer* inputBuffer = convolver->inputBuffer();
index a8a9f47..c8e68f6 100644 (file)
 #define ReverbConvolverStage_h
 
 #include "AudioArray.h"
-#include "FFTFrame.h"
 #include <wtf/OwnPtr.h>
 
 namespace WebCore {
 
+class FFTFrame;
 class ReverbAccumulationBuffer;
 class ReverbConvolver;
 class FFTConvolver;
@@ -47,6 +47,7 @@ public:
     // renderPhase is useful to know so that we can manipulate the pre versus post delay so that stages will perform
     // their heavy work (FFT processing) on different slices to balance the load in a real-time thread.
     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);
+    ~ReverbConvolverStage();
 
     // WARNING: framesToProcess must be such that it evenly divides the delay buffer size (stage_offset).
     void process(const float* source, size_t framesToProcess);
index 28841e7..c926225 100644 (file)
@@ -55,9 +55,6 @@ OBJC_CLASS NSFont;
 
 typedef struct CGFont* CGFontRef;
 typedef const struct __CTFont* CTFontRef;
-
-#include <CoreFoundation/CFBase.h>
-#include <objc/objc-auto.h>
 #endif
 
 #include <wtf/Forward.h>
index 5da2964..3a384b3 100644 (file)
@@ -52,7 +52,6 @@
 #endif
 
 #if PLATFORM(MAC)
-#include <OpenGL/OpenGL.h>
 #include <wtf/RetainPtr.h>
 OBJC_CLASS CALayer;
 OBJC_CLASS WebGLLayer;
@@ -70,6 +69,8 @@ typedef unsigned int GLuint;
 #endif
 
 #if PLATFORM(MAC)
+typedef struct _CGLContextObject *CGLContextObj;
+
 typedef CGLContextObj PlatformGraphicsContext3D;
 #elif PLATFORM(QT)
 typedef QOpenGLContext* PlatformGraphicsContext3D;
@@ -87,10 +88,6 @@ class GrContext;
 const PlatformGraphicsContext3D NullPlatformGraphicsContext3D = 0;
 const Platform3DObject NullPlatform3DObject = 0;
 
-#if USE(CG)
-#include <CoreGraphics/CGContext.h>
-#endif
-
 namespace WebCore {
 class DrawingBuffer;
 class Extensions3D;
index e3bee07..fae0e76 100644 (file)
@@ -32,6 +32,7 @@
 #include "FloatPoint.h"
 #include "FloatRect.h"
 #include "PathTraversalState.h"
+#include "RoundedRect.h"
 #include <math.h>
 #include <wtf/MathExtras.h>
 
index 0e58d33..7e0a454 100644 (file)
@@ -28,7 +28,6 @@
 #ifndef Path_h
 #define Path_h
 
-#include "RoundedRect.h"
 #include "WindRule.h"
 #include <wtf/FastAllocBase.h>
 #include <wtf/Forward.h>
@@ -77,6 +76,7 @@ namespace WebCore {
     class FloatRect;
     class FloatSize;
     class GraphicsContext;
+    class RoundedRect;
     class StrokeStyleApplier;
 
     enum PathElementType {
index 43f1507..8d94d1f 100644 (file)
 
 namespace WebCore {
 
+PassRefPtr<Pattern> Pattern::create(PassRefPtr<Image> tileImage, bool repeatX, bool repeatY)
+{
+    return adoptRef(new Pattern(tileImage, repeatX, repeatY));
+}
+
 Pattern::Pattern(PassRefPtr<Image> image, bool repeatX, bool repeatY)
     : m_tileImage(image)
     , m_repeatX(repeatX)
index 3d53005..e76bb01 100644 (file)
@@ -29,7 +29,6 @@
 #define Pattern_h
 
 #include "AffineTransform.h"
-#include "Image.h"
 
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -62,13 +61,11 @@ typedef void* PlatformPatternPtr;
 namespace WebCore {
 
 class AffineTransform;
+class Image;
 
 class Pattern : public RefCounted<Pattern> {
 public:
-    static PassRefPtr<Pattern> create(PassRefPtr<Image> tileImage, bool repeatX, bool repeatY)
-    {
-        return adoptRef(new Pattern(tileImage, repeatX, repeatY));
-    }
+    static PassRefPtr<Pattern> create(PassRefPtr<Image> tileImage, bool repeatX, bool repeatY);
     virtual ~Pattern();
 
     Image* tileImage() const { return m_tileImage.get(); }
index 656926e..8bc7914 100644 (file)
 
 #include "AnimationUtilities.h"
 
+#if ENABLE(SVG)
+#include "CachedSVGDocumentReference.h"
+#endif
+
 namespace WebCore {
 
+ReferenceFilterOperation::ReferenceFilterOperation(const String& url, const String& fragment, OperationType type)
+    : FilterOperation(type)
+    , m_url(url)
+    , m_fragment(fragment)
+{
+}
+
+ReferenceFilterOperation::~ReferenceFilterOperation()
+{
+}
+
+#if ENABLE(SVG)
+void ReferenceFilterOperation::setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference> cachedSVGDocumentReference)
+{
+    m_cachedSVGDocumentReference = cachedSVGDocumentReference;
+}
+#endif
+
 PassRefPtr<FilterOperation> BasicColorMatrixFilterOperation::blend(const FilterOperation* from, double progress, bool blendToPassthrough)
 {
     if (from && !from->isSameType(*this))
index fb9b676..5f61f8d 100644 (file)
 #include <wtf/ThreadSafeRefCounted.h>
 #endif
 
-#if ENABLE(SVG)
-#include "CachedSVGDocumentReference.h"
-#endif
-
 // Annoyingly, wingdi.h #defines this.
 #ifdef PASSTHROUGH
 #undef PASSTHROUGH
@@ -54,6 +50,10 @@ namespace WebCore {
 
 // CSS Filters
 
+#if ENABLE(SVG)
+class CachedSVGDocumentReference;
+#endif
+
 #if PLATFORM(BLACKBERRY)
 class FilterOperation : public ThreadSafeRefCounted<FilterOperation> {
 #else
@@ -166,6 +166,7 @@ public:
     {
         return adoptRef(new ReferenceFilterOperation(url, fragment, type));
     }
+    ~ReferenceFilterOperation();
 
     virtual bool affectsOpacity() const { return true; }
     virtual bool movesPixels() const { return true; }
@@ -175,13 +176,14 @@ public:
 
 #if ENABLE(SVG)
     CachedSVGDocumentReference* cachedSVGDocumentReference() const { return m_cachedSVGDocumentReference.get(); }
-    void setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference> cachedSVGDocumentReference) { m_cachedSVGDocumentReference = cachedSVGDocumentReference; }
+    void setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference>);
 #endif
 
     FilterEffect* filterEffect() const { return m_filterEffect.get(); }
     void setFilterEffect(PassRefPtr<FilterEffect> filterEffect) { m_filterEffect = filterEffect; }
 
 private:
+    ReferenceFilterOperation(const String& url, const String& fragment, OperationType);
 
     virtual bool operator==(const FilterOperation& o) const
     {
@@ -191,13 +193,6 @@ private:
         return m_url == other->m_url;
     }
 
-    ReferenceFilterOperation(const String& url, const String& fragment, OperationType type)
-        : FilterOperation(type)
-        , m_url(url)
-        , m_fragment(fragment)
-    {
-    }
-
     String m_url;
     String m_fragment;
 #if ENABLE(SVG)
index 7d83f59..7ae8b4f 100644 (file)
@@ -33,7 +33,7 @@
 #include <wtf/FastAllocBase.h>
 
 #if USE(CG)
-#include <CoreGraphics/CGAffineTransform.h>
+typedef struct CGAffineTransform CGAffineTransform;
 #elif USE(CAIRO)
 #include <cairo.h>
 #elif PLATFORM(OPENVG)
index 12c7882..1edb251 100644 (file)
@@ -31,6 +31,7 @@
 #include "config.h"
 #include "PlatformScreen.h"
 
+#include "FloatRect.h"
 #include "GtkVersioning.h"
 #include "HostWindow.h"
 #include "NotImplemented.h"
index 1906484..d3cf0a5 100644 (file)
@@ -20,7 +20,6 @@
 #ifndef DOMMimeType_h
 #define DOMMimeType_h
 
-#include "Frame.h"
 #include "FrameDestructionObserver.h"
 #include "PluginData.h"
 
index 15b57ae..8a4d1dc 100644 (file)
@@ -32,6 +32,7 @@
 
 #if ENABLE(CSS_FILTERS)
 
+#include "CachedResourceHandle.h"
 #include "FilterOperation.h"
 #include "LayoutRect.h"
 #include <wtf/HashMap.h>
@@ -43,7 +44,7 @@
 #endif
 
 #if ENABLE(SVG)
-#include "CachedSVGDocument.h"
+#include "CachedSVGDocumentClient.h"
 #include "Element.h"
 #endif
 
index c2e0077..1523429 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "CachedResourceHandle.h"
 #include "StyleShader.h"
+#include <wtf/PassRefPtr.h>
 
 namespace WebCore {
 
index edb4157..7c6d3e0 100644 (file)
@@ -22,7 +22,7 @@
 #define SVGFEImageElement_h
 
 #if ENABLE(SVG) && ENABLE(FILTERS)
-#include "CachedImage.h"
+#include "CachedImageClient.h"
 #include "CachedResourceHandle.h"
 #include "ImageBuffer.h"
 #include "SVGAnimatedBoolean.h"
index 2c7b512..6d003c7 100644 (file)
@@ -21,7 +21,7 @@
 #define SVGFontFaceUriElement_h
 
 #if ENABLE(SVG_FONTS)
-#include "CachedFont.h"
+#include "CachedFontClient.h"
 #include "CachedResourceHandle.h"
 #include "SVGElement.h"
 
@@ -52,6 +52,5 @@ private:
 } // namespace WebCore
 
 #endif // ENABLE(SVG_FONTS)
-#endif
 
-// vim:ts=4:noet
+#endif // SVGFontFaceUriElement_h
index a7a1eaf..4046ef6 100644 (file)
@@ -22,7 +22,8 @@
 #define SVGUseElement_h
 
 #if ENABLE(SVG)
-#include "CachedSVGDocument.h"
+#include "CachedResourceHandle.h"
+#include "CachedSVGDocumentClient.h"
 #include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedLength.h"
 #include "SVGExternalResourcesRequired.h"
index aa464e0..149ad6e 100644 (file)
@@ -33,8 +33,8 @@
 #include "XMLErrors.h"
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
+#include <wtf/text/AtomicStringHash.h>
 #include <wtf/text/CString.h>
-#include <wtf/text/StringHash.h>
 
 #if USE(QXMLSTREAM)
 #include <qxmlstream.h>