diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/loader/DocumentThreadableLoader.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/loader/DocumentThreadableLoader.h')
| -rw-r--r-- | Source/WebCore/loader/DocumentThreadableLoader.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/loader/DocumentThreadableLoader.h b/Source/WebCore/loader/DocumentThreadableLoader.h index 3a3cc64..94884ce 100644 --- a/Source/WebCore/loader/DocumentThreadableLoader.h +++ b/Source/WebCore/loader/DocumentThreadableLoader.h @@ -54,6 +54,7 @@ namespace WebCore { virtual ~DocumentThreadableLoader(); virtual void cancel(); + virtual void setDefersLoading(bool); using RefCounted<DocumentThreadableLoader>::ref; using RefCounted<DocumentThreadableLoader>::deref; @@ -75,14 +76,15 @@ namespace WebCore { virtual void didReceiveResponse(SubresourceLoader*, const ResourceResponse&); virtual void didReceiveData(SubresourceLoader*, const char*, int lengthReceived); - virtual void didFinishLoading(SubresourceLoader*); + virtual void didReceiveCachedMetadata(SubresourceLoader*, const char*, int lengthReceived); + virtual void didFinishLoading(SubresourceLoader*, double); virtual void didFail(SubresourceLoader*, const ResourceError&); virtual bool getShouldUseCredentialStorage(SubresourceLoader*, bool& shouldUseCredentialStorage); virtual void didReceiveAuthenticationChallenge(SubresourceLoader*, const AuthenticationChallenge&); virtual void receivedCancellation(SubresourceLoader*, const AuthenticationChallenge&); - void didFinishLoading(unsigned long identifier); + void didFinishLoading(unsigned long identifier, double finishTime); void makeSimpleCrossOriginAccessRequest(const ResourceRequest& request); void makeCrossOriginAccessRequestWithPreflight(const ResourceRequest& request); void preflightSuccess(); |