diff options
| author | Steve Block <steveblock@google.com> | 2011-10-12 12:00:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-12 12:00:46 -0700 |
| commit | 8c475c81ff9177af4476ff43acd35a3a2ba6781b (patch) | |
| tree | b9b781d02bd0cdf37c253080ab4b32316b77dc99 /Source/WebKit | |
| parent | 51906f7ca6e74b591c6057f0446dc16ee7dcb6f2 (diff) | |
| parent | 4ac060268c9283c7c27657f97929fbe99712a14c (diff) | |
| download | external_webkit-8c475c81ff9177af4476ff43acd35a3a2ba6781b.zip external_webkit-8c475c81ff9177af4476ff43acd35a3a2ba6781b.tar.gz external_webkit-8c475c81ff9177af4476ff43acd35a3a2ba6781b.tar.bz2 | |
am 4ac06026: Merge "Correctly guard WebFrame methods needed only with the Chromium HTTP stack" into ics-mr0
* commit '4ac060268c9283c7c27657f97929fbe99712a14c':
Correctly guard WebFrame methods needed only with the Chromium HTTP stack
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 7 | ||||
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.h | 9 |
2 files changed, 4 insertions, 12 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index 4350eb6..7f791ea 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -981,7 +981,6 @@ WebFrame::didReceiveAuthenticationChallenge(WebUrlLoaderClient* client, const st env->DeleteLocalRef(jRealm); checkException(env); } -#endif void WebFrame::reportSslCertError(WebUrlLoaderClient* client, int cert_error, const std::string& cert, const std::string& url) @@ -1024,7 +1023,6 @@ WebFrame::requestClientCert(WebUrlLoaderClient* client, const std::string& hostA checkException(env); } -#if USE(CHROME_NETWORK_STACK) void WebFrame::downloadStart(const std::string& url, const std::string& userAgent, const std::string& contentDisposition, const std::string& mimetype, long long contentLength) { @@ -1082,9 +1080,6 @@ WebFrame::didFinishLoading() { checkException(env); } -#endif - -#if USE(CHROME_NETWORK_STACK) void WebFrame::setCertificate(const std::string& cert) { #ifdef ANDROID_INSTRUMENT @@ -1105,7 +1100,7 @@ void WebFrame::setCertificate(const std::string& cert) env->DeleteLocalRef(jCert); checkException(env); } -#endif +#endif // USE(CHROME_NETWORK_STACK) void WebFrame::autoLogin(const std::string& loginHeader) { diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.h b/Source/WebKit/android/jni/WebCoreFrameBridge.h index 2b3f5bd..eaee63c 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.h +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.h @@ -117,21 +117,18 @@ class WebFrame : public WebCoreRefObject { float density() const; +#if USE(CHROME_NETWORK_STACK) void didReceiveAuthenticationChallenge(WebUrlLoaderClient*, const std::string& host, const std::string& realm, bool useCachedCredentials, bool suppressDialog); - void reportSslCertError(WebUrlLoaderClient* client, int cert_error, const std::string& cert, const std::string& url); - void requestClientCert(WebUrlLoaderClient* client, const std::string& hostAndPort); - void downloadStart(const std::string& url, const std::string& userAgent, const std::string& contentDisposition, const std::string& mimetype, long long contentLength); - void didReceiveData(const char* data, int size); - void didFinishLoading(); + void setCertificate(const std::string& cert); +#endif void maybeSavePassword(WebCore::Frame* frame, const WebCore::ResourceRequest& request); - void setCertificate(const std::string& cert); // Parse the x-auto-login header and propagate the parameters to the // application. |