drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass webview instance when getting base layer / color, and prevent null value" into jb-dev

Browse Source
This commit is contained in:
Chris Craik
2012-05-08 16:40:20 -07:00
committed by Android (Google) Code Review
parent 5602d02389 b5dc215a19
commit b010601c41
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/webkit/WebViewClassic.java
View File

@ -3298,7 +3298,8 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
} }
public int getPageBackgroundColor() { public int getPageBackgroundColor() {
return nativeGetBackgroundColor(); if (mNativeClass == 0) return Color.WHITE;
return nativeGetBackgroundColor(mNativeClass);
} }
/** /**
@ -4455,7 +4456,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
if (mNativeClass == 0) { if (mNativeClass == 0) {
return 0; return 0;
} }
return nativeGetBaseLayer(); return nativeGetBaseLayer(mNativeClass);
} }
private void onZoomAnimationStart() { private void onZoomAnimationStart() {
@ -8657,7 +8658,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
private native void nativeSetHeightCanMeasure(boolean measure); private native void nativeSetHeightCanMeasure(boolean measure);
private native boolean nativeSetBaseLayer(int nativeInstance, private native boolean nativeSetBaseLayer(int nativeInstance,
int layer, boolean showVisualIndicator, boolean isPictureAfterFirstLayout); int layer, boolean showVisualIndicator, boolean isPictureAfterFirstLayout);
private native int nativeGetBaseLayer(); private native int nativeGetBaseLayer(int nativeInstance);
private native void nativeCopyBaseContentToPicture(Picture pict); private native void nativeCopyBaseContentToPicture(Picture pict);
private native boolean nativeHasContent(); private native boolean nativeHasContent();
private native void nativeStopGL(); private native void nativeStopGL();
@ -8685,7 +8686,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
*/ */
private native boolean nativeScrollLayer(int nativeInstance, int layer, int newX, int newY); private native boolean nativeScrollLayer(int nativeInstance, int layer, int newX, int newY);
private native void nativeSetIsScrolling(boolean isScrolling); private native void nativeSetIsScrolling(boolean isScrolling);
private native int nativeGetBackgroundColor(); private native int nativeGetBackgroundColor(int nativeInstance);
native boolean nativeSetProperty(String key, String value); native boolean nativeSetProperty(String key, String value);
native String nativeGetProperty(String key); native String nativeGetProperty(String key);
/** /**