diff options
Diffstat (limited to 'WebKit/android/jni')
| -rw-r--r-- | WebKit/android/jni/JavaBridge.cpp | 8 | ||||
| -rw-r--r-- | WebKit/android/jni/WebCoreResourceLoader.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
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; |