From 86e39ed5e93bcfd8d2868a0fcb955eb1e465bcae Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 12 Oct 2011 18:44:42 +0100 Subject: Correctly guard WebFrame methods needed only with the Chromium HTTP stack This fixes the break in builds which use the Android HTTP stack. Change-Id: I0feb885754c34e96216c8e0c28390808f424534e --- Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 7 +------ Source/WebKit/android/jni/WebCoreFrameBridge.h | 9 +++------ 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'Source/WebKit/android') 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. -- cgit v1.1