// 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);
}
}
void ChromeClientAndroid::mouseDidMoveOverElement(const HitTestResult&, unsigned int) {}
-void ChromeClientAndroid::setToolTip(const String&) {}
+void ChromeClientAndroid::setToolTip(const String&, TextDirection) {}
void ChromeClientAndroid::print(Frame*) {}
/*
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);
// 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)
void ContextMenuClientAndroid::lookUpInDictionary(Frame*) { notImplemented(); }
void ContextMenuClientAndroid::speak(const String&) { notImplemented(); }
void ContextMenuClientAndroid::stopSpeaking() { notImplemented(); }
+bool ContextMenuClientAndroid::isSpeaking()
+{
+ notImplemented();
+ return false;
+}
}
virtual void lookUpInDictionary(Frame*);
virtual void speak(const String&);
virtual void stopSpeaking();
+ virtual bool isSpeaking();
};
} // namespace WebCore
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() {}
};
}
#define LOG_TAG "webcoreglue"
#include <config.h>
+#include <runtime/InitializeThreading.h>
#include <wtf/Platform.h>
#include "android_graphics.h"
#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)
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);