Fix some WebKit/ compilation errors.

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index c69d5e7..14e34fd 100644 (file)
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -647,7 +647,7 @@ bool FrameLoaderClientAndroid::shouldFallBack(const ResourceError&) {
 bool FrameLoaderClientAndroid::canHandleRequest(const ResourceRequest& request) const {
     ASSERT(m_frame);
     // Don't allow hijacking of intrapage navigation
-    if (WebCore::equalIgnoringRef(request.url(), m_frame->loader()->url())) 
+    if (WebCore::equalIgnoringFragmentIdentifier(request.url(), m_frame->loader()->url())) 
         return true;
 
     // Don't allow hijacking of iframe urls that are http or https
@@ -1056,7 +1056,7 @@ void FrameLoaderClientAndroid::didAddIconForPageUrl(const String& pageUrl) {
     // to be read from disk.
     registerForIconNotification(false);
     KURL u(pageUrl);
-    if (equalIgnoringRef(u, m_frame->loader()->url())) {
+    if (equalIgnoringFragmentIdentifier(u, m_frame->loader()->url())) {
         dispatchDidReceiveIcon();
     }
 }

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
index 1db3d70..c04a28f 100644 (file)
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
@@ -182,6 +182,13 @@ namespace android {
         virtual void windowObjectCleared();
         virtual void documentElementAvailable();
         virtual void didPerformFirstNavigation() const;
+
+#if USE(V8)
+        // TODO(benm): Implement
+        virtual void didCreateScriptContextForFrame() { }
+        virtual void didDestroyScriptContextForFrame() { }
+        virtual void didCreateIsolatedScriptContext() { }
+#endif
         
         virtual void registerForIconNotification(bool listen = true);
 

diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp
index aa80bf0..d7aacfb 100644 (file)
--- 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 (file)
--- 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);