diff options
author | George Mount <mount@google.com> | 2012-06-12 11:48:54 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-12 11:48:54 -0700 |
commit | 94e6f9cda3c33584f4671f40f0652d7414d8dfc0 (patch) | |
tree | 5aede662479028a9f310d81ed356ff0415d1593f /Source/WebKit/android/nav | |
parent | 3e82ffbbe13d0e0f35e6603973b9a217def98183 (diff) | |
parent | c63158835c5027aa7245f331dc23f77cda96e192 (diff) | |
download | external_webkit-94e6f9cda3c33584f4671f40f0652d7414d8dfc0.zip external_webkit-94e6f9cda3c33584f4671f40f0652d7414d8dfc0.tar.gz external_webkit-94e6f9cda3c33584f4671f40f0652d7414d8dfc0.tar.bz2 |
Merge "Revert "Add layer clip check to hide handles when not visible.""
Diffstat (limited to 'Source/WebKit/android/nav')
-rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 7fa3eae..8b6d5f0 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -740,20 +740,6 @@ bool isHandleLeft(SelectText::HandleId handleId) return (selectText->getHandleType(handleId) == SelectText::LeftHandle); } -bool isPointVisible(int layerId, int contentX, int contentY) -{ - bool isVisible = true; - const TransformationMatrix* transform = getLayerTransform(layerId); - if (transform) { - // layer is guaranteed to be non-NULL because of getLayerTransform - LayerAndroid* layer = m_baseLayer->findById(layerId); - IntRect rect = layer->visibleContentArea(); - rect = transform->mapRect(rect); - isVisible = rect.contains(contentX, contentY); - } - return isVisible; -} - private: // local state for WebView bool m_isDrawingPaused; // private to getFrameCache(); other functions operate in a different thread @@ -1318,13 +1304,6 @@ static bool nativeIsHandleLeft(JNIEnv *env, jobject obj, jint nativeView, return webview->isHandleLeft(static_cast<SelectText::HandleId>(handleId)); } -static bool nativeIsPointVisible(JNIEnv *env, jobject obj, jint nativeView, - jint layerId, jint contentX, jint contentY) -{ - WebView* webview = reinterpret_cast<WebView*>(nativeView); - return webview->isPointVisible(layerId, contentX, contentY); -} - /* * JNI registration */ @@ -1405,8 +1384,6 @@ static JNINativeMethod gJavaWebViewMethods[] = { (void*) nativeFindMaxVisibleRect }, { "nativeIsHandleLeft", "(II)Z", (void*) nativeIsHandleLeft }, - { "nativeIsPointVisible", "(IIII)Z", - (void*) nativeIsPointVisible }, }; int registerWebView(JNIEnv* env) |