4 files changed, 6 insertions, 14 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 4672427..17b908d 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -26,6 +26,7 @@
 #define LOG_TAG "webcoreglue"
 
 #include <config.h>
+
 #include <wtf/Platform.h>
 
 #include "android_graphics.h"
@@ -65,7 +66,7 @@
 #include <runtime/InitializeThreading.h>
 #include <runtime/JSLock.h>
 #elif USE(V8)
-#include "V8InitializeThreading.h"
+#include "InitializeThreading.h"
 #include "jni_npobject.h"
 #include "jni_instance.h"
 #endif  // USE(JSC)
@@ -1091,7 +1092,7 @@ static void AddJavascriptInterface(JNIEnv *env, jobject obj, jint nativeFramePoi
         // the ref count when the object is not reachable from JavaScript
         // side. Code here must release the reference count increased by
         // JavaInstanceToNPObject.
-        NPN_ReleaseObject(obj);
+        _NPN_ReleaseObject(obj);
         JSC::Bindings::releaseCharactersForJString(interfaceName, name);
     }
 #endif
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp
index aa80bf0..d7aacfb 100644
--- a/WebKit/android/jni/WebHistory.cpp
+++ b/WebKit/android/jni/WebHistory.cpp
@@ -302,7 +302,7 @@ void WebHistoryItem::updateHistoryItem(WebCore::HistoryItem* item) {
     // item, try to get the icon using the url without the ref.
     jobject favicon = NULL;
     WebCore::String url = item->urlString();
-    if (item->url().hasRef()) {
+    if (item->url().hasFragmentIdentifier()) {
         int refIndex = url.reverseFind('#');
         url = url.substring(0, refIndex);
     }
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp
index b6728fa..eca03cc 100644
--- a/WebKit/android/jni/WebSettings.cpp
+++ b/WebKit/android/jni/WebSettings.cpp
@@ -318,15 +318,6 @@ public:
         WebCore::cacheStorage().setMaximumSize(maxsize);
 #endif
 
-#if ENABLE(WORKERS)
-#if USE(V8)
-        // This flag is only needed if we use V8. JSC doesn't yet have
-        // a setting for enabling workers.
-        flag = env->GetBooleanField(obj, gFieldIds->mWorkersEnabled);
-        WebCore::WorkerContextExecutionProxy::setIsWebWorkersEnabled(flag);
-#endif
-#endif
-
         flag = env->GetBooleanField(obj, gFieldIds->mJavaScriptCanOpenWindowsAutomatically);
         s->setJavaScriptCanOpenWindowsAutomatically(flag);
 
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index aa96b18..3ede30a 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -1659,7 +1659,7 @@ public:
         // listToOptionIndex is public.
         SelectElement* selectElement = m_select;
         int optionIndex = selectElement->listToOptionIndex(index);
-        m_select->setSelectedIndex(optionIndex, true, false);
+        m_select->setSelectedIndex(optionIndex, true);
         m_select->dispatchFormControlChangeEvent();
         m_viewImpl->contentInvalidate(m_select->getRect());
     }
@@ -2617,7 +2617,7 @@ static void RegisterURLSchemeAsLocal(JNIEnv* env, jobject obj, jstring scheme) {
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::WebViewCoreTimeCounter);
 #endif
-    WebCore::FrameLoader::registerURLSchemeAsLocal(to_string(env, scheme));
+    WebCore::SecurityOrigin::registerURLSchemeAsLocal(to_string(env, scheme));
 }
 
 static void ClearContent(JNIEnv *env, jobject obj)