diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-19 13:40:28 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-22 10:12:28 +0000 |
| commit | d092aa01bda0438a170f0587bbb99b9970e6d27d (patch) | |
| tree | 044c334fd11ffdccfc55fda018050b866b981464 /WebKit | |
| parent | 773b60fc73d12638ccaf718eeec88ec891c015a8 (diff) | |
| download | external_webkit-d092aa01bda0438a170f0587bbb99b9970e6d27d.zip external_webkit-d092aa01bda0438a170f0587bbb99b9970e6d27d.tar.gz external_webkit-d092aa01bda0438a170f0587bbb99b9970e6d27d.tar.bz2 | |
Merge Chromium at r65505: Initiliase the OpenSSL library.
See https://chromereview.prom.corp.google.com/2010002/
Change-Id: I16754f6f18a54350671a2226d4c8c69615c63812
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromiumIncludes.h | 1 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromiumIncludes.h b/WebKit/android/WebCoreSupport/ChromiumIncludes.h index 89d1a90..32966a4 100644 --- a/WebKit/android/WebCoreSupport/ChromiumIncludes.h +++ b/WebKit/android/WebCoreSupport/ChromiumIncludes.h @@ -45,6 +45,7 @@ #undef LOG_ASSERT #endif +#include <android/net/android_network_library_impl.h> #include <base/callback.h> #include <base/condition_variable.h> #include <base/lock.h> diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index f63f043..d9f2836 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -34,6 +34,7 @@ #include "CachedRoot.h" #include "Chrome.h" #include "ChromeClientAndroid.h" +#include "ChromiumIncludes.h" #include "Color.h" #include "DatabaseTracker.h" #include "Document.h" @@ -393,6 +394,10 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m reset(true); WebViewCore::addInstance(this); + +#if USE(CHROME_NETWORK_STACK) + AndroidNetworkLibraryImpl::InitWithApplicationContext(env, 0); +#endif } WebViewCore::~WebViewCore() |