diff options
author | Selim Gurun <sgurun@google.com> | 2012-06-11 10:02:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-11 10:02:31 -0700 |
commit | 5cf8878e68992fc29187cacbba3d3a28372bf17d (patch) | |
tree | f39ac29fae3fae6dcda46ab2bdbcf1504282b3a5 /Source/WebKit/android/jni/WebViewCore.cpp | |
parent | 7a005094917887e608816ecc7eaab7a7e037d5b4 (diff) | |
parent | f8b2a5a3e2f83bee801a2d19fc1073f37e95fb1f (diff) | |
download | external_webkit-5cf8878e68992fc29187cacbba3d3a28372bf17d.zip external_webkit-5cf8878e68992fc29187cacbba3d3a28372bf17d.tar.gz external_webkit-5cf8878e68992fc29187cacbba3d3a28372bf17d.tar.bz2 |
am f8b2a5a3: am 7fc1c095: Merge "Remove forgotten CHROME_NETWORK_STACK macros" into jb-dev
* commit 'f8b2a5a3e2f83bee801a2d19fc1073f37e95fb1f':
Remove forgotten CHROME_NETWORK_STACK macros
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
-rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 9ef20f1..550c95d 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -4922,10 +4922,8 @@ static void CloseIdleConnections(JNIEnv* env, jobject obj, jint nativeClass) static void nativeCertTrustChanged(JNIEnv *env, jobject obj) { -#if USE(CHROME_NETWORK_STACK) WebCache::get(true)->certTrustChanged(); WebCache::get(false)->certTrustChanged(); -#endif } static void ScrollRenderLayer(JNIEnv* env, jobject obj, jint nativeClass, |