Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (148262 => 148263)
--- trunk/Source/WebCore/CMakeLists.txt 2013-04-12 06:04:40 UTC (rev 148262)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-04-12 06:11:46 UTC (rev 148263)
@@ -1738,6 +1738,7 @@
loader/cache/CachedScript.cpp
loader/cache/CachedShader.cpp
loader/cache/CachedSVGDocument.cpp
+ loader/cache/CachedSVGDocumentReference.cpp
loader/cache/CachedTextTrack.cpp
loader/cache/CachedXSLStyleSheet.cpp
loader/cache/MemoryCache.cpp
Modified: trunk/Source/WebCore/ChangeLog (148262 => 148263)
--- trunk/Source/WebCore/ChangeLog 2013-04-12 06:04:40 UTC (rev 148262)
+++ trunk/Source/WebCore/ChangeLog 2013-04-12 06:11:46 UTC (rev 148263)
@@ -1,3 +1,25 @@
+2013-04-11 Alexey Proskuryakov <[email protected]>
+
+ Reduce includes of CachedSVGDocument.h
+ https://bugs.webkit.org/show_bug.cgi?id=114489
+
+ Reviewed by Jon Honeycutt.
+
+ * loader/cache/CachedSVGDocumentReference.cpp: Added.
+ * loader/cache/CachedSVGDocumentReference.h:
+ Moved function implementations to newly added .cpp file, and removed an include
+ of CachedSVGDocument.h.
+
+ * css/WebKitCSSSVGDocumentValue.h: Just removed an unnecessary include.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+
2013-04-11 Commit Queue <[email protected]>
Unreviewed, rolling out r148247.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (148262 => 148263)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-04-12 06:04:40 UTC (rev 148262)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-04-12 06:11:46 UTC (rev 148263)
@@ -4856,6 +4856,7 @@
Source/WebCore/loader/cache/CachedSVGDocument.cpp \
Source/WebCore/loader/cache/CachedSVGDocument.h \
Source/WebCore/loader/cache/CachedSVGDocumentClient.h \
+ Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp \
Source/WebCore/loader/cache/CachedSVGDocumentReference.h \
Source/WebCore/platform/graphics/SVGGlyph.cpp \
Source/WebCore/platform/graphics/SVGGlyph.h \
Modified: trunk/Source/WebCore/Target.pri (148262 => 148263)
--- trunk/Source/WebCore/Target.pri 2013-04-12 06:04:40 UTC (rev 148262)
+++ trunk/Source/WebCore/Target.pri 2013-04-12 06:11:46 UTC (rev 148263)
@@ -858,7 +858,7 @@
loader/cache/CachedScript.cpp \
loader/cache/CachedShader.cpp \
loader/cache/CachedSVGDocument.cpp \
- loader/cache/CachedSVGDocument.h \
+ loader/cache/CachedSVGDocumentReference.cpp \
loader/cache/CachedXSLStyleSheet.cpp \
loader/CookieJar.cpp \
loader/CrossOriginAccessControl.cpp \
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (148262 => 148263)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-04-12 06:04:40 UTC (rev 148262)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-04-12 06:11:46 UTC (rev 148263)
@@ -28762,6 +28762,10 @@
>
</File>
<File
+ RelativePath="..\loader\cache\CachedSVGDocumentReference.cpp"
+ >
+ </File>
+ <File
RelativePath="..\loader\cache\CachedSVGDocumentReference.h"
>
</File>
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (148262 => 148263)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-04-12 06:04:40 UTC (rev 148262)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-04-12 06:11:46 UTC (rev 148263)
@@ -4074,6 +4074,7 @@
<ClCompile Include="..\loader\cache\CachedScript.cpp" />
<ClCompile Include="..\loader\cache\CachedShader.cpp" />
<ClCompile Include="..\loader\cache\CachedSVGDocument.cpp" />
+ <ClCompile Include="..\loader\cache\CachedSVGDocumentReference.cpp" />
<ClCompile Include="..\loader\cache\CachedTextTrack.cpp" />
<ClCompile Include="..\loader\cache\CachedXSLStyleSheet.cpp" />
<ClCompile Include="..\loader\cache\MemoryCache.cpp" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (148262 => 148263)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-04-12 06:04:40 UTC (rev 148262)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-04-12 06:11:46 UTC (rev 148263)
@@ -2436,6 +2436,9 @@
<ClCompile Include="..\loader\cache\CachedSVGDocument.cpp">
<Filter>loader\cache</Filter>
</ClCompile>
+ <ClCompile Include="..\loader\cache\CachedSVGDocumentReference.cpp">
+ <Filter>loader\cache</Filter>
+ </ClCompile>
<ClCompile Include="..\loader\cache\CachedTextTrack.cpp">
<Filter>loader\cache</Filter>
</ClCompile>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (148262 => 148263)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-04-12 06:04:40 UTC (rev 148262)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-04-12 06:11:46 UTC (rev 148263)
@@ -5454,6 +5454,7 @@
E1B25106152A0BAF0069B779 /* StylePropertyShorthand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B25104152A0BAF0069B779 /* StylePropertyShorthand.cpp */; };
E1B25107152A0BB00069B779 /* StylePropertyShorthand.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B25105152A0BAF0069B779 /* StylePropertyShorthand.h */; };
E1B4CD2510B322E200BFFD7E /* CredentialStorageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B4CD2410B322E200BFFD7E /* CredentialStorageMac.mm */; };
+ E1B533471717D0A100F205F9 /* CachedSVGDocumentReference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B533461717D0A000F205F9 /* CachedSVGDocumentReference.cpp */; };
E1B7839C163740A70007B692 /* SharedWorkerStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B7839B163740A70007B692 /* SharedWorkerStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
E1B784201639CBBE0007B692 /* SharedWorkerRepository.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1B7841F1639CBBE0007B692 /* SharedWorkerRepository.cpp */; };
E1BA003116FB92AC00BA7A35 /* ResourceHandleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1BA003016FB92AC00BA7A35 /* ResourceHandleClient.cpp */; };
@@ -12258,6 +12259,7 @@
E1B25104152A0BAF0069B779 /* StylePropertyShorthand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StylePropertyShorthand.cpp; sourceTree = "<group>"; };
E1B25105152A0BAF0069B779 /* StylePropertyShorthand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StylePropertyShorthand.h; sourceTree = "<group>"; };
E1B4CD2410B322E200BFFD7E /* CredentialStorageMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CredentialStorageMac.mm; sourceTree = "<group>"; };
+ E1B533461717D0A000F205F9 /* CachedSVGDocumentReference.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedSVGDocumentReference.cpp; sourceTree = "<group>"; };
E1B7839B163740A70007B692 /* SharedWorkerStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedWorkerStrategy.h; path = workers/SharedWorkerStrategy.h; sourceTree = "<group>"; };
E1B7841F1639CBBE0007B692 /* SharedWorkerRepository.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SharedWorkerRepository.cpp; path = workers/SharedWorkerRepository.cpp; sourceTree = "<group>"; };
E1BA003016FB92AC00BA7A35 /* ResourceHandleClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceHandleClient.cpp; sourceTree = "<group>"; };
@@ -17578,6 +17580,7 @@
A104F24114C71F7A009E2C23 /* CachedSVGDocument.cpp */,
A104F24214C71F7A009E2C23 /* CachedSVGDocument.h */,
1AEF4E68170E174800AB2799 /* CachedSVGDocumentClient.h */,
+ E1B533461717D0A000F205F9 /* CachedSVGDocumentReference.cpp */,
FB2C15C2165D64900039C9F8 /* CachedSVGDocumentReference.h */,
0753860014489E9800B78452 /* CachedTextTrack.cpp */,
0753860114489E9800B78452 /* CachedTextTrack.h */,
@@ -26998,6 +27001,7 @@
E180811216FCF42F00B80D07 /* SynchronousLoaderClient.cpp in Sources */,
E180811616FCF9CB00B80D07 /* SynchronousLoaderClient.mm in Sources */,
E152551616FD2350003D7ADB /* WebCoreResourceHandleAsOperationQueueDelegate.mm in Sources */,
+ E1B533471717D0A100F205F9 /* CachedSVGDocumentReference.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h (148262 => 148263)
--- trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h 2013-04-12 06:04:40 UTC (rev 148262)
+++ trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h 2013-04-12 06:11:46 UTC (rev 148263)
@@ -27,11 +27,11 @@
#include "CSSValue.h"
#include "CachedResourceHandle.h"
-#include "CachedSVGDocument.h"
namespace WebCore {
class CachedResourceLoader;
+class CachedSVGDocument;
class WebKitCSSSVGDocumentValue : public CSSValue {
public:
Added: trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp (0 => 148263)
--- trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp (rev 0)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp 2013-04-12 06:11:46 UTC (rev 148263)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2012 Google 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 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 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.
+ */
+
+#include "config.h"
+#include "CachedSVGDocumentReference.h"
+
+#if ENABLE(SVG) && ENABLE(CSS_FILTERS)
+
+#include "CachedSVGDocument.h"
+
+namespace WebCore {
+
+CachedSVGDocumentReference::CachedSVGDocumentReference(CachedSVGDocument* document)
+ : m_document(document)
+{
+ m_document->addClient(this);
+}
+
+CachedSVGDocumentReference::~CachedSVGDocumentReference()
+{
+ m_document->removeClient(this);
+}
+
+}
+
+#endif
Property changes on: trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h (148262 => 148263)
--- trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h 2013-04-12 06:04:40 UTC (rev 148262)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h 2013-04-12 06:11:46 UTC (rev 148263)
@@ -29,16 +29,18 @@
#if ENABLE(SVG) && ENABLE(CSS_FILTERS)
#include "CachedResourceHandle.h"
-#include "CachedSVGDocument.h"
#include "CachedSVGDocumentClient.h"
namespace WebCore {
+class CachedSVGDocument;
+
class CachedSVGDocumentReference : public CachedSVGDocumentClient {
public:
- CachedSVGDocumentReference(CachedSVGDocument* document) : m_document(document) { m_document->addClient(this); }
- virtual ~CachedSVGDocumentReference() { m_document->removeClient(this); }
+ CachedSVGDocumentReference(CachedSVGDocument*);
+ virtual ~CachedSVGDocumentReference();
CachedSVGDocument* document() { return m_document.get(); }
+
private:
CachedResourceHandle<CachedSVGDocument> m_document;
};
