diff options
Diffstat (limited to 'WebCore/platform/network/ResourceHandle.h')
| -rw-r--r-- | WebCore/platform/network/ResourceHandle.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/WebCore/platform/network/ResourceHandle.h b/WebCore/platform/network/ResourceHandle.h index 867e974..3dc38f8 100644 --- a/WebCore/platform/network/ResourceHandle.h +++ b/WebCore/platform/network/ResourceHandle.h @@ -197,17 +197,12 @@ public: void setClient(ResourceHandleClient*); void setDefersLoading(bool); -<<<<<<< HEAD:WebCore/platform/network/ResourceHandle.h #if PLATFORM(ANDROID) // TODO: this needs upstreaming. void pauseLoad(bool); #endif - - const ResourceRequest& request() const; -======= ResourceRequest& firstRequest(); ->>>>>>> webkit.org at r63859:WebCore/platform/network/ResourceHandle.h const String& lastHTTPMethod() const; void fireFailure(Timer<ResourceHandle>*); |