diff options
| author | Steve Block <steveblock@google.com> | 2011-10-12 09:53:09 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-10-12 09:53:09 +0100 |
| commit | 6cf7e07ab895af6265850c3df2da05a09977e9a0 (patch) | |
| tree | 6e7b3f823720dfbe4dc87faef424dff4e7fd4579 /Source/WebKit/android/jni/WebCoreFrameBridge.h | |
| parent | 8242049005e7219ea9846eff8eff3cead8e2461e (diff) | |
| download | external_webkit-6cf7e07ab895af6265850c3df2da05a09977e9a0.zip external_webkit-6cf7e07ab895af6265850c3df2da05a09977e9a0.tar.gz external_webkit-6cf7e07ab895af6265850c3df2da05a09977e9a0.tar.bz2 | |
Modify BrowserFrame.requestClientCert() to take the host and port as a String
Currently we get the host and port from Chromium as a std::string, convert to a
jbyte array to pass over JNI, then convert to String. It's simpler to convert
directly to jstring and to pass that over JNI.
This also fixes the fact that WebFrame::requestClientCert() fails to call
ReleaseByteArrayElements().
Requires https://android-git.corp.google.com/g/141238
in frameworks/base.
Bug: 5442710
Change-Id: If81fdef338ecdf2debeece0ebb9926bd261ae219
Diffstat (limited to 'Source/WebKit/android/jni/WebCoreFrameBridge.h')
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.h b/Source/WebKit/android/jni/WebCoreFrameBridge.h index e49bf35..2b3f5bd 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.h +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.h @@ -121,7 +121,7 @@ class WebFrame : public WebCoreRefObject { void reportSslCertError(WebUrlLoaderClient* client, int cert_error, const std::string& cert, const std::string& url); - void requestClientCert(WebUrlLoaderClient* client, const std::string& host_and_port); + 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); |