diff options
| author | Iain Merrick <husky@google.com> | 2010-09-13 17:10:07 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:43 +0100 |
| commit | 92451d3c3cebc17dfa2908de5836d2dae50d4a42 (patch) | |
| tree | a1928379089f64399420a8e6f2cc4a9c52b08337 /WebCore/platform | |
| parent | 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 (diff) | |
| download | external_webkit-92451d3c3cebc17dfa2908de5836d2dae50d4a42.zip external_webkit-92451d3c3cebc17dfa2908de5836d2dae50d4a42.tar.gz external_webkit-92451d3c3cebc17dfa2908de5836d2dae50d4a42.tar.bz2 | |
Merge WebKit at r67178 : Fix conflicts.
V8DOMWindowShell::initContextIfNeeded now has a return value:
http://trac.webkit.org/changeset/66840
DocLoader renamed to CachedResourceLoader. This affects
loader/*, ResourceHandleAndroid.cpp and WebSettings.cpp
http://trac.webkit.org/changeset/66963
Change-Id: I3ea74336a4a0236f7487b794982b9d19e08c1c45
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/network/android/ResourceHandleAndroid.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/WebCore/platform/network/android/ResourceHandleAndroid.cpp index 2a2ea74..c684da3 100644 --- a/WebCore/platform/network/android/ResourceHandleAndroid.cpp +++ b/WebCore/platform/network/android/ResourceHandleAndroid.cpp @@ -51,7 +51,6 @@ ResourceHandle::~ResourceHandle() bool ResourceHandle::start(Frame* frame) { -<<<<<<< HEAD DocumentLoader* docLoader = frame->loader()->activeDocumentLoader(); MainResourceLoader* mainLoader = docLoader->mainResourceLoader(); bool isMainResource = @@ -59,11 +58,6 @@ bool ResourceHandle::start(Frame* frame) bool isPrivateBrowsing = false; if (frame->settings()) isPrivateBrowsing = frame->settings()->privateBrowsingEnabled(); -======= - DocumentLoader* documentLoader = frame->loader()->activeDocumentLoader(); - MainResourceLoader* mainLoader = documentLoader->mainResourceLoader(); - bool isMainResource = mainLoader && (mainLoader->handle() == this); ->>>>>>> webkit.org at r67178 PassRefPtr<ResourceLoaderAndroid> loader = ResourceLoaderAndroid::start(this, d->m_firstRequest, frame->loader()->client(), isMainResource, false, isPrivateBrowsing); |