Diff
Modified: trunk/Source/WebCore/ChangeLog (148264 => 148265)
--- trunk/Source/WebCore/ChangeLog 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/ChangeLog 2013-04-12 07:15:57 UTC (rev 148265)
@@ -1,3 +1,26 @@
+2013-04-11 Alexey Proskuryakov <a...@apple.com>
+
+ Move CachedRawResourceClient into a separate file
+ https://bugs.webkit.org/show_bug.cgi?id=114491
+
+ Reviewed by Mark Rowe.
+
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * loader/DocumentLoader.cpp:
+ * loader/DocumentLoader.h:
+ * loader/DocumentThreadableLoader.h:
+ * loader/archive/cf/LegacyWebArchive.cpp:
+ * loader/cache/CachedRawResource.cpp:
+ * loader/cache/CachedRawResource.h:
+ * loader/cache/CachedRawResourceClient.h: Added.
+ * loader/icon/IconLoader.h:
+ * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h:
+
2013-04-12 Commit Queue <rn...@webkit.org>
Unreviewed, rolling out r148262.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (148264 => 148265)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-04-12 07:15:57 UTC (rev 148265)
@@ -4007,6 +4007,7 @@
Source/WebCore/loader/cache/CachedResourceClientWalker.h \
Source/WebCore/loader/cache/CachedRawResource.cpp \
Source/WebCore/loader/cache/CachedRawResource.h \
+ Source/WebCore/loader/cache/CachedRawResourceClient.h \
Source/WebCore/loader/cache/CachedResource.cpp \
Source/WebCore/loader/cache/CachedResource.h \
Source/WebCore/loader/cache/CachedResourceHandle.cpp \
Modified: trunk/Source/WebCore/Target.pri (148264 => 148265)
--- trunk/Source/WebCore/Target.pri 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/Target.pri 2013-04-12 07:15:57 UTC (rev 148265)
@@ -2035,6 +2035,8 @@
loader/cache/CachedCSSStyleSheet.h \
loader/cache/CachedFont.h \
loader/cache/CachedImage.h \
+ loader/cache/CachedRawResource.h \
+ loader/cache/CachedRawResourceClient.h \
loader/cache/CachedResourceClientWalker.h \
loader/cache/CachedResource.h \
loader/cache/CachedResourceHandle.h \
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (148264 => 148265)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-04-12 07:15:57 UTC (rev 148265)
@@ -28686,6 +28686,10 @@
>
</File>
<File
+ RelativePath="..\loader\cache\CachedRawResourceClient.h"
+ >
+ </File>
+ <File
RelativePath="..\loader\cache\CachedResource.cpp"
>
</File>
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (148264 => 148265)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-04-12 07:15:57 UTC (rev 148265)
@@ -11531,6 +11531,7 @@
<ClInclude Include="..\loader\cache\CachedFont.h" />
<ClInclude Include="..\loader\cache\CachedImage.h" />
<ClInclude Include="..\loader\cache\CachedRawResource.h" />
+ <ClInclude Include="..\loader\cache\CachedRawResourceClient.h" />
<ClInclude Include="..\loader\cache\CachedResource.h" />
<ClInclude Include="..\loader\cache\CachedResourceClient.h" />
<ClInclude Include="..\loader\cache\CachedResourceClientWalker.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (148264 => 148265)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-04-12 07:15:57 UTC (rev 148265)
@@ -2412,6 +2412,9 @@
<ClCompile Include="..\loader\cache\CachedRawResource.cpp">
<Filter>loader\cache</Filter>
</ClCompile>
+ <ClCompile Include="..\loader\cache\CachedRawResourceClient.cpp">
+ <Filter>loader\cache</Filter>
+ </ClCompile>
<ClCompile Include="..\loader\cache\CachedResource.cpp">
<Filter>loader\cache</Filter>
</ClCompile>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (148264 => 148265)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-04-12 07:15:57 UTC (rev 148265)
@@ -5455,6 +5455,7 @@
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 */; };
+ E1B533491717DEE300F205F9 /* CachedRawResourceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B533481717DEE300F205F9 /* CachedRawResourceClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
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 */; };
@@ -12260,6 +12261,7 @@
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>"; };
+ E1B533481717DEE300F205F9 /* CachedRawResourceClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedRawResourceClient.h; 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>"; };
@@ -17560,6 +17562,7 @@
319FBD5D15D2F444009640A6 /* CachedImageClient.h */,
D0EDA772143E303C0028E383 /* CachedRawResource.cpp */,
D0EDA773143E303C0028E383 /* CachedRawResource.h */,
+ E1B533481717DEE300F205F9 /* CachedRawResourceClient.h */,
BCB16C060979C3BD00467741 /* CachedResource.cpp */,
BCB16C070979C3BD00467741 /* CachedResource.h */,
BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */,
@@ -24056,6 +24059,7 @@
E180810F16FCECDF00B80D07 /* WebCoreResourceHandleAsDelegate.h in Headers */,
E180811716FCF9CB00B80D07 /* SynchronousLoaderClient.h in Headers */,
E152551516FD2350003D7ADB /* WebCoreResourceHandleAsOperationQueueDelegate.h in Headers */,
+ E1B533491717DEE300F205F9 /* CachedRawResourceClient.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (148264 => 148265)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-04-12 07:15:57 UTC (rev 148265)
@@ -33,6 +33,7 @@
#include "ApplicationCacheHost.h"
#include "ArchiveResourceCollection.h"
#include "CachedPage.h"
+#include "CachedRawResource.h"
#include "CachedResourceLoader.h"
#include "DOMWindow.h"
#include "Document.h"
Modified: trunk/Source/WebCore/loader/DocumentLoader.h (148264 => 148265)
--- trunk/Source/WebCore/loader/DocumentLoader.h 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/loader/DocumentLoader.h 2013-04-12 07:15:57 UTC (rev 148265)
@@ -30,7 +30,7 @@
#ifndef DocumentLoader_h
#define DocumentLoader_h
-#include "CachedRawResource.h"
+#include "CachedRawResourceClient.h"
#include "CachedResourceHandle.h"
#include "DocumentLoadTiming.h"
#include "DocumentWriter.h"
@@ -62,6 +62,7 @@
#endif
class ArchiveResource;
class ArchiveResourceCollection;
+ class CachedRawResource;
class CachedResourceLoader;
class ContentFilter;
class FormState;
Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.h (148264 => 148265)
--- trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.h 2013-04-12 07:15:57 UTC (rev 148265)
@@ -31,7 +31,7 @@
#ifndef DocumentThreadableLoader_h
#define DocumentThreadableLoader_h
-#include "CachedRawResource.h"
+#include "CachedRawResourceClient.h"
#include "CachedResourceHandle.h"
#include "FrameLoaderTypes.h"
#include "ThreadableLoader.h"
@@ -43,6 +43,7 @@
#include <wtf/text/WTFString.h>
namespace WebCore {
+ class CachedRawResource;
class Document;
class KURL;
class ResourceRequest;
Modified: trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp (148264 => 148265)
--- trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp 2013-04-12 07:15:57 UTC (rev 148265)
@@ -29,7 +29,7 @@
#include "config.h"
#include "LegacyWebArchive.h"
-#include "MemoryCache.h"
+#include "CachedResource.h"
#include "Document.h"
#include "DocumentLoader.h"
#include "Frame.h"
@@ -42,14 +42,12 @@
#include "Image.h"
#include "KURLHash.h"
#include "Logging.h"
-#include "markup.h"
-#include "Node.h"
+#include "MemoryCache.h"
#include "Page.h"
#include "Range.h"
#include "ResourceBuffer.h"
#include "Settings.h"
-#include <wtf/text/CString.h>
-#include <wtf/text/WTFString.h>
+#include "markup.h"
#include <wtf/ListHashSet.h>
#include <wtf/RetainPtr.h>
Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (148264 => 148265)
--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2013-04-12 07:15:57 UTC (rev 148265)
@@ -26,7 +26,7 @@
#include "config.h"
#include "CachedRawResource.h"
-#include "CachedResourceClient.h"
+#include "CachedRawResourceClient.h"
#include "CachedResourceClientWalker.h"
#include "CachedResourceLoader.h"
#include "ResourceBuffer.h"
Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.h (148264 => 148265)
--- trunk/Source/WebCore/loader/cache/CachedRawResource.h 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.h 2013-04-12 07:15:57 UTC (rev 148265)
@@ -24,11 +24,10 @@
#define CachedRawResource_h
#include "CachedResource.h"
-#include "CachedResourceClient.h"
namespace WebCore {
-class CachedRawResourceCallback;
-class CachedRawResourceClient;
+
+class CachedResourceClient;
class SubresourceLoader;
class CachedRawResource : public CachedResource {
@@ -82,19 +81,6 @@
Vector<RedirectPair> m_redirectChain;
};
-
-class CachedRawResourceClient : public CachedResourceClient {
-public:
- virtual ~CachedRawResourceClient() { }
- static CachedResourceClientType expectedType() { return RawResourceType; }
- virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
-
- virtual void dataSent(CachedResource*, unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }
- virtual void responseReceived(CachedResource*, const ResourceResponse&) { }
- virtual void dataReceived(CachedResource*, const char* /* data */, int /* length */) { }
- virtual void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) { }
-};
-
}
#endif // CachedRawResource_h
Added: trunk/Source/WebCore/loader/cache/CachedRawResourceClient.h (0 => 148265)
--- trunk/Source/WebCore/loader/cache/CachedRawResourceClient.h (rev 0)
+++ trunk/Source/WebCore/loader/cache/CachedRawResourceClient.h 2013-04-12 07:15:57 UTC (rev 148265)
@@ -0,0 +1,48 @@
+/*
+ Copyright (C) 1998 Lars Knoll (kn...@mpi-hd.mpg.de)
+ Copyright (C) 2001 Dirk Mueller <muel...@kde.org>
+ Copyright (C) 2006 Samuel Weinig (sam.wei...@gmail.com)
+ Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
+
+ 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 CachedRawResourceClient_h
+#define CachedRawResourceClient_h
+
+#include "CachedResourceClient.h"
+
+namespace WebCore {
+
+class CachedResource;
+class ResourceRequest;
+class ResourceResponse;
+
+class CachedRawResourceClient : public CachedResourceClient {
+public:
+ virtual ~CachedRawResourceClient() { }
+ static CachedResourceClientType expectedType() { return RawResourceType; }
+ virtual CachedResourceClientType resourceClientType() const OVERRIDE { return expectedType(); }
+
+ virtual void dataSent(CachedResource*, unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }
+ virtual void responseReceived(CachedResource*, const ResourceResponse&) { }
+ virtual void dataReceived(CachedResource*, const char* /* data */, int /* length */) { }
+ virtual void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) { }
+};
+
+}
+
+#endif // CachedRawResourceClient_h
Property changes on: trunk/Source/WebCore/loader/cache/CachedRawResourceClient.h
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Source/WebCore/loader/icon/IconLoader.h (148264 => 148265)
--- trunk/Source/WebCore/loader/icon/IconLoader.h 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/loader/icon/IconLoader.h 2013-04-12 07:15:57 UTC (rev 148265)
@@ -26,7 +26,7 @@
#ifndef IconLoader_h
#define IconLoader_h
-#include "CachedRawResource.h"
+#include "CachedRawResourceClient.h"
#include "CachedResourceHandle.h"
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h (148264 => 148265)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h 2013-04-12 07:14:02 UTC (rev 148264)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h 2013-04-12 07:15:57 UTC (rev 148265)
@@ -28,7 +28,7 @@
#if ENABLE(VIDEO) && USE(AVFOUNDATION) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-#include "CachedRawResource.h"
+#include "CachedRawResourceClient.h"
#include "CachedResourceHandle.h"
#include <wtf/PassOwnPtr.h>
#include <wtf/RetainPtr.h>
