summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-03-09 16:19:09 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-09 16:19:09 -0800
commitc419610477a1e8ff4d83c47b049a127f99ffec14 (patch)
tree0d04abbed5a2e2fd138d7764da8ceb978b001489 /core
parentb202fd96765f11547c74ac9f5c28b580505ab0e4 (diff)
parentd09666cbf0ae52043a8d41938526a726d69207bf (diff)
downloadframeworks_base-c419610477a1e8ff4d83c47b049a127f99ffec14.zip
frameworks_base-c419610477a1e8ff4d83c47b049a127f99ffec14.tar.gz
frameworks_base-c419610477a1e8ff4d83c47b049a127f99ffec14.tar.bz2
Merge "Remove wrong nativeSubtractLayers"
Diffstat (limited to 'core')
-rw-r--r--core/java/android/webkit/WebViewClassic.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 5db2431..856f787 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -7239,7 +7239,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
viewToContentX(getScrollX() + getWidth()
- mWebView.getVerticalScrollbarWidth()),
viewToContentY(getScrollY() + getViewHeightWithTitle()));
- content = nativeSubtractLayers(content);
int screenTop = contentToViewY(content.top);
int screenBottom = contentToViewY(content.bottom);
int height = screenBottom - screenTop;
@@ -9135,7 +9134,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
private native void nativeCopyBaseContentToPicture(Picture pict);
private native boolean nativeHasContent();
private native void nativeStopGL();
- private native Rect nativeSubtractLayers(Rect content);
private native void nativeDiscardAllTextures();
private native void nativeTileProfilingStart();
private native float nativeTileProfilingStop();