Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f986d496: Merge "Partial invalidation of the browser textures" into honeycomb-mr1

Browse Source 
* commit 'f986d496c56fc8ae44b03f982e3e1ed437cdb996':
  Partial invalidation of the browser textures
This commit is contained in:
Nicolas Roard
2011-03-08 19:06:17 -08:00
committed by Android Git Automerger
parent ae850caf94 f986d496c5
commit acafb26d34
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/webkit/WebView.java
View File

@@ -4036,15 +4036,10 @@ public class WebView extends AbsoluteLayout
}
}
void setBaseLayer(int layer, Rect invalRect, boolean showVisualIndciator) {
void setBaseLayer(int layer, Region invalRegion, boolean showVisualIndicator) {
if (mNativeClass == 0)
return;
if (invalRect == null) {
Rect rect = new Rect(0, 0, mContentWidth, mContentHeight);
nativeSetBaseLayer(layer, rect, showVisualIndciator);
} else {
nativeSetBaseLayer(layer, invalRect, showVisualIndciator);
}
nativeSetBaseLayer(layer, invalRegion, showVisualIndicator);
}
private void onZoomAnimationStart() {
@@ -7571,7 +7566,7 @@ public class WebView extends AbsoluteLayout
case NEW_PICTURE_MSG_ID: {
// called for new content
final WebViewCore.DrawData draw = (WebViewCore.DrawData) msg.obj;
setBaseLayer(draw.mBaseLayer, draw.mInvalRegion.getBounds(),
setBaseLayer(draw.mBaseLayer, draw.mInvalRegion,
getSettings().getShowVisualIndicator());
final Point viewSize = draw.mViewSize;
WebViewCore.ViewState viewState = draw.mViewState;
@@ -8613,7 +8608,7 @@ public class WebView extends AbsoluteLayout
private native void nativeSetFindIsEmpty();
private native void nativeSetFindIsUp(boolean isUp);
private native void nativeSetHeightCanMeasure(boolean measure);
private native void nativeSetBaseLayer(int layer, Rect invalRect,
private native void nativeSetBaseLayer(int layer, Region invalRegion,
boolean showVisualIndicator);
private native void nativeShowCursorTimed();
private native void nativeReplaceBaseContent(int content);