diff options
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebCache.cpp | 17 | ||||
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebCache.h | 3 | ||||
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 10 | 
3 files changed, 2 insertions, 28 deletions
| diff --git a/Source/WebKit/android/WebCoreSupport/WebCache.cpp b/Source/WebKit/android/WebCoreSupport/WebCache.cpp index 82e3b27..9b505ee 100644 --- a/Source/WebKit/android/WebCoreSupport/WebCache.cpp +++ b/Source/WebKit/android/WebCoreSupport/WebCache.cpp @@ -30,7 +30,7 @@  #include "WebCoreJni.h"  #include "WebRequestContext.h"  #include "WebUrlLoaderClient.h" -#include "net/http/http_network_session.h" +  #include <wtf/text/CString.h>  using namespace WTF; @@ -131,21 +131,6 @@ void WebCache::clear()          thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(this, &WebCache::clearImpl));  } -void WebCache::certTrustChanged() -{ -    base::Thread* thread = WebUrlLoaderClient::ioThread(); -    if (thread) -        thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(this, &WebCache::certTrustChangedImpl)); -} - -void WebCache::certTrustChangedImpl() -{ -    net::HttpNetworkSession* session = m_cache->GetSession(); -    if (session) -        session->cert_verifier()->ClearCache(); -    m_cache->CloseAllConnections(); -} -  void WebCache::closeIdleConnections()  {      base::Thread* thread = WebUrlLoaderClient::ioThread(); diff --git a/Source/WebKit/android/WebCoreSupport/WebCache.h b/Source/WebKit/android/WebCoreSupport/WebCache.h index ad57d88..c3b623d 100644 --- a/Source/WebKit/android/WebCoreSupport/WebCache.h +++ b/Source/WebKit/android/WebCoreSupport/WebCache.h @@ -48,7 +48,7 @@ public:      net::HttpCache* cache() { return m_cache.get(); }      net::ProxyConfigServiceAndroid* proxy() { return m_proxyConfigService; }      void closeIdleConnections(); -    void certTrustChanged(); +  private:      WebCache(bool isPrivateBrowsing); @@ -60,7 +60,6 @@ private:      // For closeIdleConnections      void closeIdleImpl(); -    void certTrustChangedImpl();      // For getEntry()      void getEntryImpl(); diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 6fbabec..fd1a833 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -4961,14 +4961,6 @@ static void CloseIdleConnections(JNIEnv* env, jobject obj, jint nativeClass)  #endif  } -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,          jint layer, jobject jRect)  { @@ -5155,8 +5147,6 @@ static JNINativeMethod gJavaWebViewCoreMethods[] = {          (void*) SelectWordAt },      { "nativeSelectAll", "(I)V",          (void*) SelectAll }, -    { "nativeCertTrustChanged","()V", -        (void*) nativeCertTrustChanged },  };  int registerWebViewCore(JNIEnv* env) | 
