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

am d1019a99: Merge "DO NOT MERGE" into eclair

Browse Source 
Merge commit 'd1019a99f9b458a4129e047c96de7192a61e5e99' into eclair-plus-aosp

* commit 'd1019a99f9b458a4129e047c96de7192a61e5e99':
  DO NOT MERGE
This commit is contained in:
Grace Kloba
2010-01-14 19:32:39 -08:00
committed by Android Git Automerger
parent 20cc557033 d1019a99f9
commit c8cab72521
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/WebViewCore.java
View File

@@ -1518,7 +1518,7 @@ final class WebViewCore {
} else if (mViewportWidth > 0) { } else if (mViewportWidth > 0) {
width = Math.max(w, mViewportWidth); width = Math.max(w, mViewportWidth);
} else { } else {
width = Math.max(w, textwrapWidth); width = textwrapWidth;
} }
} }
nativeSetSize(width, width == w ? h : Math.round((float) width * h / w), nativeSetSize(width, width == w ? h : Math.round((float) width * h / w),