summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-03-09 16:19:07 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-09 16:19:07 -0800
commit296d05c7bd54360261dedc8d387a7bf9f52ca41b (patch)
tree97dd9769169f55bd5ff1ea66bd6d729376344633 /Source/WebKit
parent1b54fe32a2615bc9df11de78e35f5adb730d0824 (diff)
parentdf1b448056d65c28220fe303d82847094a215838 (diff)
downloadexternal_webkit-296d05c7bd54360261dedc8d387a7bf9f52ca41b.zip
external_webkit-296d05c7bd54360261dedc8d387a7bf9f52ca41b.tar.gz
external_webkit-296d05c7bd54360261dedc8d387a7bf9f52ca41b.tar.bz2
Merge "Delete nativeSubtractLayers"
Diffstat (limited to 'Source/WebKit')
-rw-r--r--Source/WebKit/android/nav/WebView.cpp22
1 files changed, 0 insertions, 22 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index fadf1f0..5f5ff62 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -874,26 +874,6 @@ static jobject nativeLayerBounds(JNIEnv* env, jobject obj, jint jlayer)
return rect;
}
-static jobject nativeSubtractLayers(JNIEnv* env, jobject obj, jobject jrect)
-{
- SkIRect irect = jrect_to_webrect(env, jrect);
-#if USE(ACCELERATED_COMPOSITING)
- LayerAndroid* root = GET_NATIVE_VIEW(env, obj)->compositeRoot();
- if (root) {
- SkRect rect;
- rect.set(irect);
- rect = root->subtractLayers(rect);
- rect.round(&irect);
- }
-#endif
- jclass rectClass = env->FindClass("android/graphics/Rect");
- jmethodID init = env->GetMethodID(rectClass, "<init>", "(IIII)V");
- jobject rect = env->NewObject(rectClass, init, irect.fLeft, irect.fTop,
- irect.fRight, irect.fBottom);
- env->DeleteLocalRef(rectClass);
- return rect;
-}
-
static void nativeSetHeightCanMeasure(JNIEnv *env, jobject obj, bool measure)
{
WebView* view = GET_NATIVE_VIEW(env, obj);
@@ -1235,8 +1215,6 @@ static JNINativeMethod gJavaWebViewMethods[] = {
(void*) nativeTileProfilingGetFloat },
{ "nativeStopGL", "()V",
(void*) nativeStopGL },
- { "nativeSubtractLayers", "(Landroid/graphics/Rect;)Landroid/graphics/Rect;",
- (void*) nativeSubtractLayers },
{ "nativeScrollableLayer", "(IILandroid/graphics/Rect;Landroid/graphics/Rect;)I",
(void*) nativeScrollableLayer },
{ "nativeScrollLayer", "(III)Z",