Modified: trunk/Source/WebCore/loader/MainResourceLoader.h (131491 => 131492)
--- trunk/Source/WebCore/loader/MainResourceLoader.h 2012-10-16 20:20:01 UTC (rev 131491)
+++ trunk/Source/WebCore/loader/MainResourceLoader.h 2012-10-16 20:22:18 UTC (rev 131492)
@@ -46,78 +46,78 @@
namespace WebCore {
- class FormState;
- class ResourceRequest;
+class FormState;
+class ResourceRequest;
- class MainResourceLoader : public ResourceLoader {
- public:
- static PassRefPtr<MainResourceLoader> create(Frame*);
- virtual ~MainResourceLoader();
+class MainResourceLoader : public ResourceLoader {
+public:
+ static PassRefPtr<MainResourceLoader> create(Frame*);
+ virtual ~MainResourceLoader();
- void load(const ResourceRequest&, const SubstituteData&);
- virtual void addData(const char*, int, bool allAtOnce) OVERRIDE;
+ void load(const ResourceRequest&, const SubstituteData&);
+ virtual void addData(const char*, int, bool allAtOnce) OVERRIDE;
- virtual void setDefersLoading(bool) OVERRIDE;
+ virtual void setDefersLoading(bool) OVERRIDE;
- virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse) OVERRIDE;
- virtual void didReceiveResponse(const ResourceResponse&) OVERRIDE;
- virtual void didReceiveData(const char*, int, long long encodedDataLength, bool allAtOnce) OVERRIDE;
- virtual void didFinishLoading(double finishTime) OVERRIDE;
- virtual void didFail(const ResourceError&) OVERRIDE;
+ virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse) OVERRIDE;
+ virtual void didReceiveResponse(const ResourceResponse&) OVERRIDE;
+ virtual void didReceiveData(const char*, int, long long encodedDataLength, bool allAtOnce) OVERRIDE;
+ virtual void didFinishLoading(double finishTime) OVERRIDE;
+ virtual void didFail(const ResourceError&) OVERRIDE;
#if HAVE(RUNLOOP_TIMER)
- typedef RunLoopTimer<MainResourceLoader> MainResourceLoaderTimer;
+ typedef RunLoopTimer<MainResourceLoader> MainResourceLoaderTimer;
#else
- typedef Timer<MainResourceLoader> MainResourceLoaderTimer;
+ typedef Timer<MainResourceLoader> MainResourceLoaderTimer;
#endif
- bool isLoadingMultipartContent() const { return m_loadingMultipartContent; }
+ bool isLoadingMultipartContent() const { return m_loadingMultipartContent; }
- virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
+ virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
- private:
- explicit MainResourceLoader(Frame*);
+private:
+ explicit MainResourceLoader(Frame*);
- virtual void willCancel(const ResourceError&) OVERRIDE;
- virtual void didCancel(const ResourceError&) OVERRIDE;
+ virtual void willCancel(const ResourceError&) OVERRIDE;
+ virtual void didCancel(const ResourceError&) OVERRIDE;
- bool loadNow(ResourceRequest&);
+ bool loadNow(ResourceRequest&);
- void handleEmptyLoad(const KURL&, bool forURLScheme);
- void handleSubstituteDataLoadSoon(const ResourceRequest&);
- void handleSubstituteDataLoadNow(MainResourceLoaderTimer*);
+ void handleEmptyLoad(const KURL&, bool forURLScheme);
+ void handleSubstituteDataLoadSoon(const ResourceRequest&);
+ void handleSubstituteDataLoadNow(MainResourceLoaderTimer*);
- void startDataLoadTimer();
+ void startDataLoadTimer();
- void receivedError(const ResourceError&);
- ResourceError interruptedForPolicyChangeError() const;
- void stopLoadingForPolicyChange();
- bool isPostOrRedirectAfterPost(const ResourceRequest& newRequest, const ResourceResponse& redirectResponse);
+ void receivedError(const ResourceError&);
+ ResourceError interruptedForPolicyChangeError() const;
+ void stopLoadingForPolicyChange();
+ bool isPostOrRedirectAfterPost(const ResourceRequest& newRequest, const ResourceResponse& redirectResponse);
- static void callContinueAfterNavigationPolicy(void*, const ResourceRequest&, PassRefPtr<FormState>, bool shouldContinue);
- void continueAfterNavigationPolicy(const ResourceRequest&, bool shouldContinue);
+ static void callContinueAfterNavigationPolicy(void*, const ResourceRequest&, PassRefPtr<FormState>, bool shouldContinue);
+ void continueAfterNavigationPolicy(const ResourceRequest&, bool shouldContinue);
- static void callContinueAfterContentPolicy(void*, PolicyAction);
- void continueAfterContentPolicy(PolicyAction);
- void continueAfterContentPolicy(PolicyAction, const ResourceResponse&);
-
+ static void callContinueAfterContentPolicy(void*, PolicyAction);
+ void continueAfterContentPolicy(PolicyAction);
+ void continueAfterContentPolicy(PolicyAction, const ResourceResponse&);
+
#if PLATFORM(QT)
- void substituteMIMETypeFromPluginDatabase(const ResourceResponse&);
+ void substituteMIMETypeFromPluginDatabase(const ResourceResponse&);
#endif
- ResourceRequest m_initialRequest;
- SubstituteData m_substituteData;
+ ResourceRequest m_initialRequest;
+ SubstituteData m_substituteData;
- MainResourceLoaderTimer m_dataLoadTimer;
+ MainResourceLoaderTimer m_dataLoadTimer;
- bool m_loadingMultipartContent;
- bool m_waitingForContentPolicy;
- double m_timeOfLastDataReceived;
+ bool m_loadingMultipartContent;
+ bool m_waitingForContentPolicy;
+ double m_timeOfLastDataReceived;
#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
- WebFilterEvaluator *m_filter;
+ WebFilterEvaluator *m_filter;
#endif
- };
+};
}
Modified: trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h (131491 => 131492)
--- trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h 2012-10-16 20:20:01 UTC (rev 131491)
+++ trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h 2012-10-16 20:22:18 UTC (rev 131492)
@@ -34,42 +34,42 @@
namespace WebCore {
- class NetscapePlugInStreamLoader;
+class NetscapePlugInStreamLoader;
- class NetscapePlugInStreamLoaderClient {
- public:
- virtual void didReceiveResponse(NetscapePlugInStreamLoader*, const ResourceResponse&) = 0;
- virtual void didReceiveData(NetscapePlugInStreamLoader*, const char*, int) = 0;
- virtual void didFail(NetscapePlugInStreamLoader*, const ResourceError&) = 0;
- virtual void didFinishLoading(NetscapePlugInStreamLoader*) { }
- virtual bool wantsAllStreams() const { return false; }
+class NetscapePlugInStreamLoaderClient {
+public:
+ virtual void didReceiveResponse(NetscapePlugInStreamLoader*, const ResourceResponse&) = 0;
+ virtual void didReceiveData(NetscapePlugInStreamLoader*, const char*, int) = 0;
+ virtual void didFail(NetscapePlugInStreamLoader*, const ResourceError&) = 0;
+ virtual void didFinishLoading(NetscapePlugInStreamLoader*) { }
+ virtual bool wantsAllStreams() const { return false; }
- protected:
- virtual ~NetscapePlugInStreamLoaderClient() { }
- };
+protected:
+ virtual ~NetscapePlugInStreamLoaderClient() { }
+};
- class NetscapePlugInStreamLoader : public ResourceLoader {
- public:
- static PassRefPtr<NetscapePlugInStreamLoader> create(Frame*, NetscapePlugInStreamLoaderClient*, const ResourceRequest&);
- virtual ~NetscapePlugInStreamLoader();
+class NetscapePlugInStreamLoader : public ResourceLoader {
+public:
+ static PassRefPtr<NetscapePlugInStreamLoader> create(Frame*, NetscapePlugInStreamLoaderClient*, const ResourceRequest&);
+ virtual ~NetscapePlugInStreamLoader();
- bool isDone() const;
+ bool isDone() const;
- private:
- virtual void didReceiveResponse(const ResourceResponse&);
- virtual void didReceiveData(const char*, int, long long encodedDataLength, bool allAtOnce);
- virtual void didFinishLoading(double finishTime);
- virtual void didFail(const ResourceError&);
+private:
+ virtual void didReceiveResponse(const ResourceResponse&);
+ virtual void didReceiveData(const char*, int, long long encodedDataLength, bool allAtOnce);
+ virtual void didFinishLoading(double finishTime);
+ virtual void didFail(const ResourceError&);
- virtual void releaseResources();
+ virtual void releaseResources();
- NetscapePlugInStreamLoader(Frame*, NetscapePlugInStreamLoaderClient*);
+ NetscapePlugInStreamLoader(Frame*, NetscapePlugInStreamLoaderClient*);
- virtual void willCancel(const ResourceError&);
- virtual void didCancel(const ResourceError&);
+ virtual void willCancel(const ResourceError&);
+ virtual void didCancel(const ResourceError&);
- NetscapePlugInStreamLoaderClient* m_client;
- };
+ NetscapePlugInStreamLoaderClient* m_client;
+};
}
Modified: trunk/Source/WebCore/loader/ResourceLoader.h (131491 => 131492)
--- trunk/Source/WebCore/loader/ResourceLoader.h 2012-10-16 20:20:01 UTC (rev 131491)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2012-10-16 20:22:18 UTC (rev 131492)
@@ -39,153 +39,153 @@
namespace WebCore {
- class AuthenticationChallenge;
- class DocumentLoader;
- class Frame;
- class FrameLoader;
- class KURL;
- class ResourceBuffer;
- class ResourceHandle;
-
- class ResourceLoader : public RefCounted<ResourceLoader>, protected ResourceHandleClient {
- public:
- virtual ~ResourceLoader();
+class AuthenticationChallenge;
+class DocumentLoader;
+class Frame;
+class FrameLoader;
+class KURL;
+class ResourceBuffer;
+class ResourceHandle;
- void cancel();
+class ResourceLoader : public RefCounted<ResourceLoader>, protected ResourceHandleClient {
+public:
+ virtual ~ResourceLoader();
- virtual bool init(const ResourceRequest&);
+ void cancel();
- FrameLoader* frameLoader() const;
- DocumentLoader* documentLoader() const { return m_documentLoader.get(); }
- const ResourceRequest& originalRequest() const { return m_originalRequest; }
-
- virtual void cancel(const ResourceError&);
- ResourceError cancelledError();
- ResourceError blockedError();
- ResourceError cannotShowURLError();
-
- virtual void setDefersLoading(bool);
+ virtual bool init(const ResourceRequest&);
- unsigned long identifier() const { return m_identifier; }
+ FrameLoader* frameLoader() const;
+ DocumentLoader* documentLoader() const { return m_documentLoader.get(); }
+ const ResourceRequest& originalRequest() const { return m_originalRequest; }
+
+ virtual void cancel(const ResourceError&);
+ ResourceError cancelledError();
+ ResourceError blockedError();
+ ResourceError cannotShowURLError();
+
+ virtual void setDefersLoading(bool);
- virtual void releaseResources();
- const ResourceResponse& response() const;
+ unsigned long identifier() const { return m_identifier; }
- virtual void addData(const char*, int, bool allAtOnce);
- virtual PassRefPtr<ResourceBuffer> resourceData();
- void clearResourceData();
- virtual bool isSubresourceLoader();
-
- virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse);
- virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
- virtual void didReceiveResponse(const ResourceResponse&);
- virtual void didReceiveData(const char*, int, long long encodedDataLength, bool allAtOnce);
- virtual void didReceiveCachedMetadata(const char*, int) { }
- void willStopBufferingData(const char*, int);
- virtual void didFinishLoading(double finishTime);
- virtual void didFail(const ResourceError&);
+ virtual void releaseResources();
+ const ResourceResponse& response() const;
+
+ virtual void addData(const char*, int, bool allAtOnce);
+ virtual PassRefPtr<ResourceBuffer> resourceData();
+ void clearResourceData();
+ virtual bool isSubresourceLoader();
+
+ virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse);
+ virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
+ virtual void didReceiveResponse(const ResourceResponse&);
+ virtual void didReceiveData(const char*, int, long long encodedDataLength, bool allAtOnce);
+ virtual void didReceiveCachedMetadata(const char*, int) { }
+ void willStopBufferingData(const char*, int);
+ virtual void didFinishLoading(double finishTime);
+ virtual void didFail(const ResourceError&);
#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
- virtual void didReceiveDataArray(CFArrayRef dataArray);
+ virtual void didReceiveDataArray(CFArrayRef dataArray);
#endif
- virtual bool shouldUseCredentialStorage();
- virtual void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
- void didCancelAuthenticationChallenge(const AuthenticationChallenge&);
+ virtual bool shouldUseCredentialStorage();
+ virtual void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
+ void didCancelAuthenticationChallenge(const AuthenticationChallenge&);
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
- virtual bool canAuthenticateAgainstProtectionSpace(const ProtectionSpace&);
+ virtual bool canAuthenticateAgainstProtectionSpace(const ProtectionSpace&);
#endif
- virtual void receivedCancellation(const AuthenticationChallenge&);
+ virtual void receivedCancellation(const AuthenticationChallenge&);
- // ResourceHandleClient
- virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse& redirectResponse);
- virtual void didSendData(ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
- virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
- virtual void didReceiveData(ResourceHandle*, const char*, int, int encodedDataLength);
- virtual void didReceiveCachedMetadata(ResourceHandle*, const char* data, int length) { didReceiveCachedMetadata(data, length); }
- virtual void didFinishLoading(ResourceHandle*, double finishTime);
- virtual void didFail(ResourceHandle*, const ResourceError&);
- virtual void wasBlocked(ResourceHandle*);
- virtual void cannotShowURL(ResourceHandle*);
- virtual void willStopBufferingData(ResourceHandle*, const char* data, int length) { willStopBufferingData(data, length); }
- virtual bool shouldUseCredentialStorage(ResourceHandle*) { return shouldUseCredentialStorage(); }
- virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) { didReceiveAuthenticationChallenge(challenge); }
- virtual void didCancelAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) { didCancelAuthenticationChallenge(challenge); }
+ // ResourceHandleClient
+ virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse& redirectResponse);
+ virtual void didSendData(ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
+ virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
+ virtual void didReceiveData(ResourceHandle*, const char*, int, int encodedDataLength);
+ virtual void didReceiveCachedMetadata(ResourceHandle*, const char* data, int length) { didReceiveCachedMetadata(data, length); }
+ virtual void didFinishLoading(ResourceHandle*, double finishTime);
+ virtual void didFail(ResourceHandle*, const ResourceError&);
+ virtual void wasBlocked(ResourceHandle*);
+ virtual void cannotShowURL(ResourceHandle*);
+ virtual void willStopBufferingData(ResourceHandle*, const char* data, int length) { willStopBufferingData(data, length); }
+ virtual bool shouldUseCredentialStorage(ResourceHandle*) { return shouldUseCredentialStorage(); }
+ virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) { didReceiveAuthenticationChallenge(challenge); }
+ virtual void didCancelAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) { didCancelAuthenticationChallenge(challenge); }
#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
- virtual void didReceiveDataArray(ResourceHandle*, CFArrayRef dataArray);
+ virtual void didReceiveDataArray(ResourceHandle*, CFArrayRef dataArray);
#endif
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
- virtual bool canAuthenticateAgainstProtectionSpace(ResourceHandle*, const ProtectionSpace& protectionSpace) { return canAuthenticateAgainstProtectionSpace(protectionSpace); }
+ virtual bool canAuthenticateAgainstProtectionSpace(ResourceHandle*, const ProtectionSpace& protectionSpace) { return canAuthenticateAgainstProtectionSpace(protectionSpace); }
#endif
- virtual void receivedCancellation(ResourceHandle*, const AuthenticationChallenge& challenge) { receivedCancellation(challenge); }
- virtual void willCacheResponse(ResourceHandle*, CacheStoragePolicy&);
+ virtual void receivedCancellation(ResourceHandle*, const AuthenticationChallenge& challenge) { receivedCancellation(challenge); }
+ virtual void willCacheResponse(ResourceHandle*, CacheStoragePolicy&);
#if PLATFORM(MAC)
#if USE(CFNETWORK)
- virtual CFCachedURLResponseRef willCacheResponse(ResourceHandle*, CFCachedURLResponseRef);
+ virtual CFCachedURLResponseRef willCacheResponse(ResourceHandle*, CFCachedURLResponseRef);
#else
- virtual NSCachedURLResponse* willCacheResponse(ResourceHandle*, NSCachedURLResponse*);
+ virtual NSCachedURLResponse* willCacheResponse(ResourceHandle*, NSCachedURLResponse*);
#endif
#endif // PLATFORM(MAC)
#if PLATFORM(WIN) && USE(CFNETWORK)
- // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
- virtual bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef);
+ // FIXME: Windows should use willCacheResponse - <https://bugs.webkit.org/show_bug.cgi?id=57257>.
+ virtual bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef);
#endif
#if PLATFORM(CHROMIUM)
- virtual void didDownloadData(ResourceHandle*, int);
- virtual void didDownloadData(int);
+ virtual void didDownloadData(ResourceHandle*, int);
+ virtual void didDownloadData(int);
#endif
#if ENABLE(BLOB)
- virtual AsyncFileStream* createAsyncFileStream(FileStreamClient*);
+ virtual AsyncFileStream* createAsyncFileStream(FileStreamClient*);
#endif
- const KURL& url() const { return m_request.url(); }
- ResourceHandle* handle() const { return m_handle.get(); }
- bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; }
+ const KURL& url() const { return m_request.url(); }
+ ResourceHandle* handle() const { return m_handle.get(); }
+ bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; }
- bool reachedTerminalState() const { return m_reachedTerminalState; }
+ bool reachedTerminalState() const { return m_reachedTerminalState; }
- void setShouldBufferData(DataBufferingPolicy);
+ void setShouldBufferData(DataBufferingPolicy);
- virtual void reportMemoryUsage(MemoryObjectInfo*) const;
+ virtual void reportMemoryUsage(MemoryObjectInfo*) const;
- protected:
- ResourceLoader(Frame*, ResourceLoaderOptions);
+protected:
+ ResourceLoader(Frame*, ResourceLoaderOptions);
- friend class ApplicationCacheHost; // for access to request()
- friend class ResourceLoadScheduler; // for access to start()
- // start() actually sends the load to the network (unless the load is being
- // deferred) and should only be called by ResourceLoadScheduler or setDefersLoading().
- void start();
-
- void didFinishLoadingOnePart(double finishTime);
+ friend class ApplicationCacheHost; // for access to request()
+ friend class ResourceLoadScheduler; // for access to start()
+ // start() actually sends the load to the network (unless the load is being
+ // deferred) and should only be called by ResourceLoadScheduler or setDefersLoading().
+ void start();
+
+ void didFinishLoadingOnePart(double finishTime);
- const ResourceRequest& request() const { return m_request; }
- bool cancelled() const { return m_cancelled; }
- bool defersLoading() const { return m_defersLoading; }
+ const ResourceRequest& request() const { return m_request; }
+ bool cancelled() const { return m_cancelled; }
+ bool defersLoading() const { return m_defersLoading; }
- RefPtr<ResourceHandle> m_handle;
- RefPtr<Frame> m_frame;
- RefPtr<DocumentLoader> m_documentLoader;
- ResourceResponse m_response;
-
- private:
- virtual void willCancel(const ResourceError&) = 0;
- virtual void didCancel(const ResourceError&) = 0;
+ RefPtr<ResourceHandle> m_handle;
+ RefPtr<Frame> m_frame;
+ RefPtr<DocumentLoader> m_documentLoader;
+ ResourceResponse m_response;
+
+private:
+ virtual void willCancel(const ResourceError&) = 0;
+ virtual void didCancel(const ResourceError&) = 0;
- ResourceRequest m_request;
- ResourceRequest m_originalRequest; // Before redirects.
- RefPtr<ResourceBuffer> m_resourceData;
-
- unsigned long m_identifier;
+ ResourceRequest m_request;
+ ResourceRequest m_originalRequest; // Before redirects.
+ RefPtr<ResourceBuffer> m_resourceData;
+
+ unsigned long m_identifier;
- bool m_reachedTerminalState;
- bool m_calledWillCancel;
- bool m_cancelled;
- bool m_notifiedLoadComplete;
+ bool m_reachedTerminalState;
+ bool m_calledWillCancel;
+ bool m_cancelled;
+ bool m_notifiedLoadComplete;
- bool m_defersLoading;
- ResourceRequest m_deferredRequest;
- ResourceLoaderOptions m_options;
- };
+ bool m_defersLoading;
+ ResourceRequest m_deferredRequest;
+ ResourceLoaderOptions m_options;
+};
inline const ResourceResponse& ResourceLoader::response() const
{
