diff options
| author | Selim Gurun <sgurun@google.com> | 2012-06-07 10:10:38 -0700 |
|---|---|---|
| committer | Selim Gurun <sgurun@google.com> | 2012-06-07 11:14:19 -0700 |
| commit | 4abfd08f9d4431a78170d32f642abeaa21046146 (patch) | |
| tree | 1029f9a6125cd23a5ab69322d71c7cf2fa8b9dba /Source/WebKit | |
| parent | 150a26fa5442a5fc931e5df05808e33aac1a7dea (diff) | |
| download | external_webkit-4abfd08f9d4431a78170d32f642abeaa21046146.zip external_webkit-4abfd08f9d4431a78170d32f642abeaa21046146.tar.gz external_webkit-4abfd08f9d4431a78170d32f642abeaa21046146.tar.bz2 | |
DO NOT MERGE Use scoped_refptr's rather than naked ptrs.
Bug: 6508448
Cherry pick from master, sha:
6c9f55f6f57bd4da36053c76a1cfce8a15a00a97
This is to make sure webkit usage of scoped refptrs are compatible
with chromium changes, see bug for more details.
Change-Id: Ib8aa3e29409bfe6fd94ef56376bd2ff2297ec868
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index 829c21c..4ce3d8e 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1824,7 +1824,7 @@ static void SslCertErrorCancel(JNIEnv *env, jobject obj, int handle, int cert_er client->cancelSslCertError(cert_error); } -static net::X509Certificate* getX509Cert(JNIEnv *env, jobjectArray chain) +static scoped_refptr<net::X509Certificate> getX509Cert(JNIEnv *env, jobjectArray chain) { // Based on Android's NativeCrypto_SSL_use_certificate int length = env->GetArrayLength(chain); @@ -1862,8 +1862,8 @@ static net::X509Certificate* getX509Cert(JNIEnv *env, jobjectArray chain) certChain[i] = rest[i]->get(); } return net::X509Certificate::CreateFromHandle(first.get(), - net::X509Certificate::SOURCE_FROM_NETWORK, - certChain); + net::X509Certificate::SOURCE_FROM_NETWORK, + certChain); } static void SslClientCertPKCS8(JNIEnv *env, jobject obj, int handle, jbyteArray pkey, jobjectArray chain) @@ -1893,7 +1893,7 @@ static void SslClientCertPKCS8(JNIEnv *env, jobject obj, int handle, jbyteArray client->sslClientCert(NULL, NULL); return; } - net::X509Certificate* certificate = getX509Cert(env, chain); + scoped_refptr<net::X509Certificate> certificate = getX509Cert(env, chain); if (certificate == NULL) { client->sslClientCert(NULL, NULL); return; @@ -1909,7 +1909,7 @@ static void SslClientCertCtx(JNIEnv *env, jobject obj, int handle, jint ctx, job client->sslClientCert(NULL, NULL); return; } - net::X509Certificate* certificate = getX509Cert(env, chain); + scoped_refptr<net::X509Certificate> certificate = getX509Cert(env, chain); if (certificate == NULL) { client->sslClientCert(NULL, NULL); return; |