diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 09:55:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 09:55:28 -0800 |
| commit | 4dd98cc27e25e6c3104672f50749132d2236461b (patch) | |
| tree | 01f4412526c81ec62e02d71d128ec45827a12fdc /WebCore/platform/network/ResourceHandleInternal.h | |
| parent | fadf964da75468c2c995316cea8d82d32705a7e1 (diff) | |
| parent | aad6f24e036b3740071bb995b955b18b572067b2 (diff) | |
| download | external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.zip external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.tar.gz external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.tar.bz2 | |
am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit 'aad6f24e036b3740071bb995b955b18b572067b2' into eclair-mr2-plus-aosp
* commit 'aad6f24e036b3740071bb995b955b18b572067b2':
Merge webkit.org at r51976 : Fix general conflicts.
Diffstat (limited to 'WebCore/platform/network/ResourceHandleInternal.h')
| -rw-r--r-- | WebCore/platform/network/ResourceHandleInternal.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/platform/network/ResourceHandleInternal.h b/WebCore/platform/network/ResourceHandleInternal.h index 8313560..f7135ee 100644 --- a/WebCore/platform/network/ResourceHandleInternal.h +++ b/WebCore/platform/network/ResourceHandleInternal.h @@ -218,15 +218,9 @@ namespace WebCore { // It is almost identical to m_currentWebChallenge.nsURLAuthenticationChallenge(), but has a different sender. NSURLAuthenticationChallenge *m_currentMacChallenge; #endif -<<<<<<< HEAD:WebCore/platform/network/ResourceHandleInternal.h -#if USE(CFNETWORK) - CFURLAuthChallengeRef m_currentCFChallenge; -#endif #if PLATFORM(ANDROID) RefPtr<ResourceLoaderAndroid> m_loader; #endif -======= ->>>>>>> webkit.org at r51976:WebCore/platform/network/ResourceHandleInternal.h AuthenticationChallenge m_currentWebChallenge; ResourceHandle::FailureType m_failureType; |