Merge change 21490 into master-webkit-merge

* changes:
  Fix WebCoreFrameBridge.cpp

6 files changed, 16 insertions, 13 deletions

diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 4f38ce8..30b208b 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -147,7 +147,7 @@ void ChromeClientAndroid::setResizable(bool) { notImplemented(); }
 // This function is called by the JavaScript bindings to print usually an error to
 // a message console. Pass the message to the java side so that the client can
 // handle it as it sees fit.
-void ChromeClientAndroid::addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned int lineNumber, const String& sourceID) {
+void ChromeClientAndroid::addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned int lineNumber, const String& sourceID) {
     android::WebViewCore::getWebViewCore(m_webFrame->page()->mainFrame()->view())->addMessageToConsole(message, lineNumber, sourceID);
 }
 
@@ -267,7 +267,7 @@ void ChromeClientAndroid::formStateDidChange(const Node*)
 }
 
 void ChromeClientAndroid::mouseDidMoveOverElement(const HitTestResult&, unsigned int) {}
-void ChromeClientAndroid::setToolTip(const String&) {}
+void ChromeClientAndroid::setToolTip(const String&, TextDirection) {}
 void ChromeClientAndroid::print(Frame*) {}
 
 /*
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index ded1ea9..07496ce 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -82,8 +82,8 @@ namespace android {
         virtual bool menubarVisible();
         
         virtual void setResizable(bool);
-        
-        virtual void addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned int lineNumber, const String& sourceID);
+
+        virtual void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message, unsigned int lineNumber, const String& sourceID);
         
         virtual bool canRunBeforeUnloadConfirmPanel();
         virtual bool runBeforeUnloadConfirmPanel(const String& message, Frame* frame);
@@ -110,8 +110,8 @@ namespace android {
         // End methods used by HostWindow.
 
         virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned int);
-        
-        virtual void setToolTip(const String&);
+
+        virtual void setToolTip(const String&, TextDirection);
         
         virtual void print(Frame*);
 #if ENABLE(DATABASE)
diff --git a/WebKit/android/WebCoreSupport/ContextMenuClientAndroid.cpp b/WebKit/android/WebCoreSupport/ContextMenuClientAndroid.cpp
index 7aabfc9..e6ad0a6 100644
--- a/WebKit/android/WebCoreSupport/ContextMenuClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ContextMenuClientAndroid.cpp
@@ -42,5 +42,10 @@ void ContextMenuClientAndroid::searchWithGoogle(const Frame*) { notImplemented()
 void ContextMenuClientAndroid::lookUpInDictionary(Frame*) { notImplemented(); }
 void ContextMenuClientAndroid::speak(const String&) { notImplemented(); }
 void ContextMenuClientAndroid::stopSpeaking() { notImplemented(); }
+bool ContextMenuClientAndroid::isSpeaking()
+{
+    notImplemented();
+    return false;
+}
 
 }
diff --git a/WebKit/android/WebCoreSupport/ContextMenuClientAndroid.h b/WebKit/android/WebCoreSupport/ContextMenuClientAndroid.h
index 1860e4e..ab4e445 100644
--- a/WebKit/android/WebCoreSupport/ContextMenuClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ContextMenuClientAndroid.h
@@ -43,6 +43,7 @@ public:
     virtual void lookUpInDictionary(Frame*);
     virtual void speak(const String&);
     virtual void stopSpeaking();
+    virtual bool isSpeaking();
 };
 
 } // namespace WebCore
diff --git a/WebKit/android/WebCoreSupport/InspectorClientAndroid.h b/WebKit/android/WebCoreSupport/InspectorClientAndroid.h
index 2fb3d2a..54d15cb 100644
--- a/WebKit/android/WebCoreSupport/InspectorClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/InspectorClientAndroid.h
@@ -57,7 +57,8 @@ public:
     virtual void populateSetting(const String&, InspectorController::Setting&) {}
  	virtual void storeSetting(const String&, const InspectorController::Setting&) {}
  	virtual void removeSetting(const String&) {}
-  virtual String hiddenPanels() { return String(); }
+    virtual String hiddenPanels() { return String(); }
+    virtual void inspectorWindowObjectCleared() {}
 };
 
 }
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index f47603b..6048c98 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 <runtime/InitializeThreading.h>
 #include <wtf/Platform.h>
 
 #include "android_graphics.h"
@@ -62,10 +63,8 @@
 #if USE(JSC)
 #include "GCController.h"
 #include "JSDOMWindow.h"
-#include <runtime/InitializeThreading.h>
 #include <runtime/JSLock.h>
 #elif USE(V8)
-#include "V8InitializeThreading.h"
 #include "jni_npobject.h"
 #include "jni_instance.h"
 #endif  // USE(JSC)
@@ -717,11 +716,8 @@ static void CallPolicyFunction(JNIEnv* env, jobject obj, jint func, jint decisio
 
 static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAssetManager, jobject historyList)
 {
-#if USE(JSC)
+    // TODO(andreip): Where did the V8InitializeThreading.h disappear?
     JSC::initializeThreading();
-#elif USE(V8)
-    V8::initializeThreading();
-#endif
 
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::NativeCallbackTimeCounter);