diff options
author | Huahui Wu <hwu@google.com> | 2011-06-28 10:13:10 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-28 10:13:10 -0700 |
commit | e452be1935a2ad2683fb2dc3de631ec063e38dc6 (patch) | |
tree | 89889b55cf62ee48076c6f95f085cba43f579380 | |
parent | d9c043f5b157fbcaeb9d1b8981993e184df0e3ed (diff) | |
parent | 971c7e8e6733abf2ec5f7effb2c1e64c2d1a7bcb (diff) | |
download | external_webkit-e452be1935a2ad2683fb2dc3de631ec063e38dc6.zip external_webkit-e452be1935a2ad2683fb2dc3de631ec063e38dc6.tar.gz external_webkit-e452be1935a2ad2683fb2dc3de631ec063e38dc6.tar.bz2 |
Merge "Revert "Bubbles up the url that has the invalid certificate.""
-rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp | 2 | ||||
-rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 9 | ||||
-rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.h | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp index 9ee0de2..e293e97 100644 --- a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp @@ -488,7 +488,7 @@ void WebUrlLoaderClient::reportSslCertError(int cert_error, net::X509Certificate std::vector<std::string> chain_bytes; cert->GetChainDEREncodedBytes(&chain_bytes); this->AddRef(); - m_webFrame->reportSslCertError(this, cert_error, chain_bytes[0], m_request->getUrl()); + m_webFrame->reportSslCertError(this, cert_error, chain_bytes[0]); } void WebUrlLoaderClient::requestClientCert(net::SSLCertRequestInfo* cert_request_info) diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index 9d78a40..cd9cdba 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -288,7 +288,7 @@ WebFrame::WebFrame(JNIEnv* env, jobject obj, jobject historyList, WebCore::Page* mJavaFrame->mGetFile = env->GetMethodID(clazz, "getFile", "(Ljava/lang/String;[BII)I"); mJavaFrame->mDidReceiveAuthenticationChallenge = env->GetMethodID(clazz, "didReceiveAuthenticationChallenge", "(ILjava/lang/String;Ljava/lang/String;Z)V"); - mJavaFrame->mReportSslCertError = env->GetMethodID(clazz, "reportSslCertError", "(II[BLjava/lang/String;)V"); + mJavaFrame->mReportSslCertError = env->GetMethodID(clazz, "reportSslCertError", "(II[B)V"); mJavaFrame->mRequestClientCert = env->GetMethodID(clazz, "requestClientCert", "(I[B)V"); mJavaFrame->mDownloadStart = env->GetMethodID(clazz, "downloadStart", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V"); @@ -966,7 +966,7 @@ WebFrame::didReceiveAuthenticationChallenge(WebUrlLoaderClient* client, const st #endif void -WebFrame::reportSslCertError(WebUrlLoaderClient* client, int cert_error, const std::string& cert, const std::string& url) +WebFrame::reportSslCertError(WebUrlLoaderClient* client, int cert_error, const std::string& cert) { #ifdef ANDROID_INSTRUMENT TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter); @@ -982,11 +982,8 @@ WebFrame::reportSslCertError(WebUrlLoaderClient* client, int cert_error, const s jbyte* bytes = env->GetByteArrayElements(jCert, NULL); cert.copy(reinterpret_cast<char*>(bytes), len); - jstring jUrl = stdStringToJstring(env, url, true); - - env->CallVoidMethod(javaFrame.get(), mJavaFrame->mReportSslCertError, jHandle, cert_error, jCert, jUrl); + env->CallVoidMethod(javaFrame.get(), mJavaFrame->mReportSslCertError, jHandle, cert_error, jCert); env->DeleteLocalRef(jCert); - env->DeleteLocalRef(jUrl); checkException(env); } diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.h b/Source/WebKit/android/jni/WebCoreFrameBridge.h index acf4eb4..d74948f 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.h +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.h @@ -117,7 +117,7 @@ class WebFrame : public WebCoreRefObject { void didReceiveAuthenticationChallenge(WebUrlLoaderClient*, const std::string& host, const std::string& realm, bool useCachedCredentials); - void reportSslCertError(WebUrlLoaderClient* client, int cert_error, const std::string& cert, const std::string& url); + void reportSslCertError(WebUrlLoaderClient* client, int cert_error, const std::string& cert); void requestClientCert(WebUrlLoaderClient* client, const std::string& host_and_port); |