summaryrefslogtreecommitdiffstats
path: root/WebKit/android
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/android')
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp3
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.h2
-rw-r--r--WebKit/android/WebCoreSupport/EditorClientAndroid.cpp4
-rw-r--r--WebKit/android/WebCoreSupport/EditorClientAndroid.h1
-rw-r--r--WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp15
-rw-r--r--WebKit/android/jni/JavaBridge.cpp8
-rw-r--r--WebKit/android/jni/WebCoreResourceLoader.cpp2
-rw-r--r--WebKit/android/jni/WebViewCore.cpp2
-rw-r--r--WebKit/android/nav/CacheBuilder.cpp2
9 files changed, 24 insertions, 15 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 6495bb4..2de83f6 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -488,10 +488,9 @@ void ChromeClientAndroid::chooseIconForFiles(const Vector<WebCore::String>&, Fil
notImplemented();
}
-bool ChromeClientAndroid::setCursor(PlatformCursorHandle)
+void ChromeClientAndroid::setCursor(const Cursor&)
{
notImplemented();
- return false;
}
void ChromeClientAndroid::wakeUpMainThreadWithNewQuota(long newQuota) {
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index b3b9335..65dcd81 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -147,7 +147,7 @@ namespace android {
void onMainFrameLoadStarted();
virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
- virtual bool setCursor(PlatformCursorHandle);
+ virtual void setCursor(const Cursor&);
virtual void chooseIconForFiles(const WTF::Vector<WebCore::String>&, FileChooser*);
// Notification that the given form element has changed. This function
diff --git a/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp b/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp
index 718a30c..45498c0 100644
--- a/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp
@@ -257,4 +257,8 @@ void EditorClientAndroid::setInputMethodState(bool) {}
// functions new to Feb-19 tip of tree merge:
void EditorClientAndroid::handleInputMethodKeydown(KeyboardEvent*) {}
+void EditorClientAndroid::willSetInputMethodState()
+{
+ notImplemented();
+}
}
diff --git a/WebKit/android/WebCoreSupport/EditorClientAndroid.h b/WebKit/android/WebCoreSupport/EditorClientAndroid.h
index 614926a..6d49f48 100644
--- a/WebKit/android/WebCoreSupport/EditorClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/EditorClientAndroid.h
@@ -104,6 +104,7 @@ public:
virtual void showSpellingUI(bool show);
virtual bool spellingUIIsShowing();
virtual void getGuessesForWord(const String&, WTF::Vector<String>& guesses);
+ virtual void willSetInputMethodState();
virtual void setInputMethodState(bool);
// Android specific:
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 9278bf8..e77dde8 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -54,7 +54,7 @@
#include "PlatformString.h"
#include "PluginDatabase.h"
#include "PluginView.h"
-#include "PluginWidget.h"
+#include "PluginViewBase.h"
#include "ProgressTracker.h"
#include "RenderPart.h"
#include "RenderView.h"
@@ -1014,15 +1014,18 @@ static bool isYouTubeInstalled() {
return WebCore::packageNotifier().isPackageInstalled("com.google.android.youtube");
}
-// Use PluginWidget as it is not used by Android for real plugins.
-class PluginToggleWidget : public PluginWidget {
+// Use PluginViewBase rather than an Android specific sub class as we do not require any
+// Android specific functionality; this just renders a placeholder which will later
+// activate the real plugin.
+class PluginToggleWidget : public PluginViewBase {
public:
PluginToggleWidget(Frame* parent, const IntSize& size,
HTMLPlugInElement* elem, const KURL& url,
const WTF::Vector<String>& paramNames,
const WTF::Vector<String>& paramValues, const String& mimeType,
bool loadManually)
- : m_parent(parent)
+ : PluginViewBase(0)
+ , m_parent(parent)
, m_size(size)
, m_element(elem)
, m_url(url)
@@ -1093,7 +1096,7 @@ public:
for (; it != end; ++it) {
Widget* widget = (*it)->widget();
// PluginWidget is used only with PluginToggleWidget
- if (widget->isPluginWidget()) {
+ if (widget->isPluginViewBase()) {
PluginToggleWidget* ptw =
static_cast<PluginToggleWidget*>(widget);
ptw->swapPlugin(*it);
@@ -1122,6 +1125,8 @@ public:
}
private:
+ void invalidateRect(const IntRect& rect) { }
+
RefPtr<Frame> m_parent;
IntSize m_size;
HTMLPlugInElement* m_element;
diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp
index 6aceb1c..f44bd0f 100644
--- a/WebKit/android/jni/JavaBridge.cpp
+++ b/WebKit/android/jni/JavaBridge.cpp
@@ -380,14 +380,14 @@ void JavaBridge::SetNetworkType(JNIEnv* env, jobject obj, jstring javatype, jstr
String type = to_string(env, javatype);
String subtype = to_string(env, javasubtype);
- Connection::ConnectionType connectionType = Connection::Unknown;
+ Connection::ConnectionType connectionType = Connection::UNKNOWN;
if (type == wifi)
- connectionType = Connection::WiFi;
+ connectionType = Connection::WIFI;
else if (type == mobile || type == mobileSupl) {
if (subtype == edge || subtype == gprs)
- connectionType = Connection::Cell_2G;
+ connectionType = Connection::CELL_2G;
else if (subtype == umts)
- connectionType = Connection::Cell_3G;
+ connectionType = Connection::CELL_3G;
}
WebCore::networkStateNotifier().networkTypeChange(connectionType);
}
diff --git a/WebKit/android/jni/WebCoreResourceLoader.cpp b/WebKit/android/jni/WebCoreResourceLoader.cpp
index 32e8cd8..74f59a5 100644
--- a/WebKit/android/jni/WebCoreResourceLoader.cpp
+++ b/WebKit/android/jni/WebCoreResourceLoader.cpp
@@ -250,7 +250,7 @@ jstring WebCoreResourceLoader::RedirectedToUrl(JNIEnv* env, jobject obj,
return NULL;
LOG_ASSERT(handle->client(), "Why do we not have a client?");
- WebCore::ResourceRequest r = handle->request();
+ WebCore::ResourceRequest r = handle->firstRequest();
WebCore::KURL url(WebCore::KURL(WebCore::ParsedURLString, to_string(env, baseUrl)),
to_string(env, redirectTo));
WebCore::ResourceResponse* response = (WebCore::ResourceResponse*)nativeResponse;
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index d3e32d3..2b66a8e 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -1393,7 +1393,7 @@ Vector<IntRect> WebViewCore::getTouchHighlightRects(int x, int y, int slop)
m_mousePos = IntPoint(x - m_scrollOffsetX, y - m_scrollOffsetY);
#ifdef ANDROID_HITTEST_WITHSIZE
HitTestResult hitTestResult = m_mainFrame->eventHandler()->hitTestResultAtPoint(IntPoint(x, y),
- false, false, DontHitTestScrollbars, IntSize(slop, slop));
+ false, false, DontHitTestScrollbars, HitTestRequest::Active | HitTestRequest::ReadOnly, IntSize(slop, slop));
if (!hitTestResult.innerNode() || !hitTestResult.innerNode()->inDocument()) {
LOGE("Should not happen: no in document Node found");
return rects;
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index 1c8af5e..5fddc48 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -905,7 +905,7 @@ static Node* OneAfter(Node* node)
static bool checkForPluginViewThatWantsFocus(RenderObject* renderer) {
if (renderer->isWidget()) {
Widget* widget = static_cast<RenderWidget*>(renderer)->widget();
- if (widget && (widget->isPluginView() || widget->isPluginWidget())) {
+ if (widget && (widget->isPluginView() || widget->isPluginViewBase())) {
// check if this plugin really wants key events (TODO)
return true;
}
generated by cgit v1.1 at 2025-09-17 02:11:16 +0000