From c63158835c5027aa7245f331dc23f77cda96e192 Mon Sep 17 00:00:00 2001 From: George Mount Date: Tue, 12 Jun 2012 11:47:51 -0700 Subject: Revert "Add layer clip check to hide handles when not visible." This reverts commit 40369ea6114f406fef50d4241335dd8613372748 --- Source/WebKit/android/nav/WebView.cpp | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'Source') diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 9cbdca5..5e2354b 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 @@ -1317,13 +1303,6 @@ static bool nativeIsHandleLeft(JNIEnv *env, jobject obj, jint nativeView, return webview->isHandleLeft(static_cast(handleId)); } -static bool nativeIsPointVisible(JNIEnv *env, jobject obj, jint nativeView, - jint layerId, jint contentX, jint contentY) -{ - WebView* webview = reinterpret_cast(nativeView); - return webview->isPointVisible(layerId, contentX, contentY); -} - /* * JNI registration */ @@ -1404,8 +1383,6 @@ static JNINativeMethod gJavaWebViewMethods[] = { (void*) nativeFindMaxVisibleRect }, { "nativeIsHandleLeft", "(II)Z", (void*) nativeIsHandleLeft }, - { "nativeIsPointVisible", "(IIII)Z", - (void*) nativeIsPointVisible }, }; int registerWebView(JNIEnv* env) -- cgit v1.1