diff options
| -rw-r--r-- | Android.v8.mk | 2 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Android.v8.mk b/Android.v8.mk index 3edcc36..d0da67d 100644 --- a/Android.v8.mk +++ b/Android.v8.mk @@ -209,7 +209,7 @@ LOCAL_SHARED_LIBRARIES += libdl endif # Build the list of static libraries -LOCAL_STATIC_LIBRARIES += libv8 libxml2 +LOCAL_STATIC_LIBRARIES += libxml2 libv8 # Redefine LOCAL_SRC_FILES to be all the WebKit source files LOCAL_SRC_FILES := $(WEBKIT_SRC_FILES) diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index a879b6f..10b34ad 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -2390,10 +2390,6 @@ static void DumpNavTree(JNIEnv *env, jobject obj) static void SetJsFlags(JNIEnv *env, jobject obj, jstring flags) { #if USE(V8) - // This code is called from UI thread, but it is safe to call setFlags - // on ScriptController since it initializes global variables only. - // As long as the WebCore thread does not change the default JS flags, - // it is safe to call it here. WebCore::String flagsString = to_string(env, flags); WebCore::CString utf8String = flagsString.utf8(); WebCore::ScriptController::setFlags(utf8String.data(), utf8String.length()); |