diff options
| author | Steve Block <steveblock@google.com> | 2011-06-08 15:18:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 16:12:16 +0100 |
| commit | 6bb74b669eb547680cf7a2938ae392b488bf7c31 (patch) | |
| tree | 274fbf09df92cb15f166022ee452ad3712166e7b /Source/WebKit/android | |
| parent | f9e2d1c1e36096aa7721f4ce753d0a90c25826bc (diff) | |
| download | external_webkit-6bb74b669eb547680cf7a2938ae392b488bf7c31.zip external_webkit-6bb74b669eb547680cf7a2938ae392b488bf7c31.tar.gz external_webkit-6bb74b669eb547680cf7a2938ae392b488bf7c31.tar.bz2 | |
Merge WebKit at r82507: Work around a V8 bug
Change-Id: Ia1b847a20bc16091075630655fef79cd90cd8297
Diffstat (limited to 'Source/WebKit/android')
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 80fdd8d..a2db69d 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -160,6 +160,10 @@ FILE* gRenderTreeFile = 0; #include "RenderLayerCompositor.h" #endif +#if USE(V8) +#include <v8.h> +#endif + /* We pass this flag when recording the actual content, so that we don't spend time actually regionizing complex path clips, when all we really want to do is record them. @@ -428,6 +432,12 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m #if USE(CHROME_NETWORK_STACK) AndroidNetworkLibraryImpl::InitWithApplicationContext(env, 0); #endif + +#if USE(V8) + // FIXME: This is a work-around for a V8 bug regarding initializing the + // default isolate and should be removed when it is fixed. + v8::V8::Initialize(); +#endif } WebViewCore::~WebViewCore() |