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

Merge "Pass the version down to native"

Browse Source
This commit is contained in:
Nicolas Roard
2012-03-06 14:13:54 -08:00
committed by Android (Google) Code Review
parent 957c800ac0 18e9886342
commit b4827c089f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/ViewStateSerializer.java
View File

@@ -52,12 +52,12 @@ class ViewStateSerializer {
throws IOException {
DataInputStream dis = new DataInputStream(stream);
int version = dis.readInt();
if (version != VERSION) {
if (version > VERSION) {
throw new IOException("Unexpected version: " + version);
}
int contentWidth = dis.readInt();
int contentHeight = dis.readInt();
int baseLayer = nativeDeserializeViewState(dis,
int baseLayer = nativeDeserializeViewState(version, dis,
new byte[WORKING_STREAM_STORAGE]);
final WebViewCore.DrawData draw = new WebViewCore.DrawData();
@@ -76,7 +76,7 @@ class ViewStateSerializer {
OutputStream stream, byte[] storage);
// Returns a pointer to the BaseLayer
private static native int nativeDeserializeViewState(
private static native int nativeDeserializeViewState(int version,
InputStream stream, byte[] storage);
private ViewStateSerializer() {}