diff options
| author | Chris Craik <ccraik@google.com> | 2012-05-08 13:44:33 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2012-05-08 14:00:32 -0700 |
| commit | b5dc215a190eddaa622f6fe641ed5e511b347736 (patch) | |
| tree | 6fb71f4d46d892116d6ecd877907d4bc903a3aab /core/java | |
| parent | 87156c96f5f2a761b8d05318f8ae82ce26aa16b4 (diff) | |
Pass webview instance when getting base layer / color, and prevent null value
Depends on external/webkit change: https://android-git.corp.google.com/g/#/c/188470/
bug:6429897
Change-Id: Ic948f102034dbe57c61d7fc6de73a4ddd062f686
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 921432031f76..ed99e7e2b825 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -3299,7 +3299,8 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc } public int getPageBackgroundColor() { - return nativeGetBackgroundColor(); + if (mNativeClass == 0) return Color.WHITE; + return nativeGetBackgroundColor(mNativeClass); } /** @@ -4456,7 +4457,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc if (mNativeClass == 0) { return 0; } - return nativeGetBaseLayer(); + return nativeGetBaseLayer(mNativeClass); } private void onZoomAnimationStart() { @@ -8593,7 +8594,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc private native void nativeSetHeightCanMeasure(boolean measure); private native boolean nativeSetBaseLayer(int nativeInstance, int layer, boolean showVisualIndicator, boolean isPictureAfterFirstLayout); - private native int nativeGetBaseLayer(); + private native int nativeGetBaseLayer(int nativeInstance); private native void nativeCopyBaseContentToPicture(Picture pict); private native boolean nativeHasContent(); private native void nativeStopGL(); @@ -8621,7 +8622,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc */ private native boolean nativeScrollLayer(int nativeInstance, int layer, int newX, int newY); private native void nativeSetIsScrolling(boolean isScrolling); - private native int nativeGetBackgroundColor(); + private native int nativeGetBackgroundColor(int nativeInstance); native boolean nativeSetProperty(String key, String value); native String nativeGetProperty(String key); /** |