diff options
| author | Huahui Wu <hwu@google.com> | 2011-06-28 09:38:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-28 09:38:35 -0700 |
| commit | d9c043f5b157fbcaeb9d1b8981993e184df0e3ed (patch) | |
| tree | 0c47a9b25ce6ed8538d930b2f82f0e7d9047af50 /Source/WebKit/android/jni/WebCoreFrameBridge.cpp | |
| parent | d43ff08c4af52461322b7ae56d491cd0d4b8cd37 (diff) | |
| parent | f072ccf633e8c2c2812289f0e65f18320f2147c8 (diff) | |
| download | external_webkit-d9c043f5b157fbcaeb9d1b8981993e184df0e3ed.zip external_webkit-d9c043f5b157fbcaeb9d1b8981993e184df0e3ed.tar.gz external_webkit-d9c043f5b157fbcaeb9d1b8981993e184df0e3ed.tar.bz2 | |
Merge "Bubbles up the url that has the invalid certificate."
Diffstat (limited to 'Source/WebKit/android/jni/WebCoreFrameBridge.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index cd9cdba..9d78a40 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[B)V"); + mJavaFrame->mReportSslCertError = env->GetMethodID(clazz, "reportSslCertError", "(II[BLjava/lang/String;)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) +WebFrame::reportSslCertError(WebUrlLoaderClient* client, int cert_error, const std::string& cert, const std::string& url) { #ifdef ANDROID_INSTRUMENT TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter); @@ -982,8 +982,11 @@ WebFrame::reportSslCertError(WebUrlLoaderClient* client, int cert_error, const s jbyte* bytes = env->GetByteArrayElements(jCert, NULL); cert.copy(reinterpret_cast<char*>(bytes), len); - env->CallVoidMethod(javaFrame.get(), mJavaFrame->mReportSslCertError, jHandle, cert_error, jCert); + jstring jUrl = stdStringToJstring(env, url, true); + + env->CallVoidMethod(javaFrame.get(), mJavaFrame->mReportSslCertError, jHandle, cert_error, jCert, jUrl); env->DeleteLocalRef(jCert); + env->DeleteLocalRef(jUrl); checkException(env); } |