diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-30 19:28:40 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 7b3d71e01ef2779f8b8939f812921d0f9b1a00a8 (patch) | |
| tree | da9360b494b879387ce0923e01907c189f2ea971 /WebCore/platform/network/android | |
| parent | 5981f58abbce556536da16dc85544f53b5bbe817 (diff) | |
| download | external_webkit-7b3d71e01ef2779f8b8939f812921d0f9b1a00a8.zip external_webkit-7b3d71e01ef2779f8b8939f812921d0f9b1a00a8.tar.gz external_webkit-7b3d71e01ef2779f8b8939f812921d0f9b1a00a8.tar.bz2 | |
Merge WebKit at r61871: Fix conflicts
V8Proxy.cpp
http://trac.webkit.org/changeset/61499
npapi.h:
http://trac.webkit.org/changeset/61277
Document.cpp
http://trac.webkit.org/changeset/61787
XMLDocumentParser.h:
http://trac.webkit.org/changeset/61663
HTMLLinkElement.*:
http://trac.webkit.org/changeset/61424
HTMLTableCellElement.cpp
http://trac.webkit.org/changeset/61630
ResourceHandleAndroid.cpp:
http://trac.webkit.org/changeset/61768
Change-Id: If991d3c112eeefd3098aa68b862c65798d505e1f
Diffstat (limited to 'WebCore/platform/network/android')
| -rw-r--r-- | WebCore/platform/network/android/ResourceHandleAndroid.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/WebCore/platform/network/android/ResourceHandleAndroid.cpp index ba01e6a..81b75b0 100644 --- a/WebCore/platform/network/android/ResourceHandleAndroid.cpp +++ b/WebCore/platform/network/android/ResourceHandleAndroid.cpp @@ -84,7 +84,6 @@ bool ResourceHandle::supportsBufferedData() return false; } -<<<<<<< HEAD #if PLATFORM(ANDROID) // TODO: this needs upstreaming. void ResourceHandle::pauseLoad(bool pause) @@ -94,10 +93,7 @@ void ResourceHandle::pauseLoad(bool pause) } #endif -void ResourceHandle::setDefersLoading(bool defers) -======= void ResourceHandle::platformSetDefersLoading(bool) ->>>>>>> webkit.org at r61871 { notImplemented(); } |