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

am 804e822c: Merge "Fix logspam" into jb-dev

Browse Source 
* commit '804e822c56473ce71d1f912c617ff05b474a7af6':
  Fix logspam
This commit is contained in:
John Reck
2012-06-05 16:52:41 -07:00
committed by Android Git Automerger
parent 2b57c8e0ba 804e822c56
commit f671e43015
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/ZoomManager.java
View File

@ -429,13 +429,12 @@ class ZoomManager {
scale = getReadingLevelScale(); scale = getReadingLevelScale();
} }
if (mHardwareAccelerated) {
mInHWAcceleratedZoom = true;
}
setZoomScale(scale, reflowText); setZoomScale(scale, reflowText);
if (oldScale != mActualScale) { if (oldScale != mActualScale) {
if (mHardwareAccelerated) {
mInHWAcceleratedZoom = true;
}
// use mZoomPickerScale to see zoom preview first // use mZoomPickerScale to see zoom preview first
mZoomStart = SystemClock.uptimeMillis(); mZoomStart = SystemClock.uptimeMillis();
mInvInitialZoomScale = 1.0f / oldScale; mInvInitialZoomScale = 1.0f / oldScale;
@ -467,6 +466,8 @@ class ZoomManager {
if (mZoomScale == 0) { if (mZoomScale == 0) {
Log.w(LOGTAG, "A WebView is attempting to perform a fixed length " Log.w(LOGTAG, "A WebView is attempting to perform a fixed length "
+ "zoom animation when no zoom is in progress"); + "zoom animation when no zoom is in progress");
// Now that we've logged about it, go ahead and just recover
mInHWAcceleratedZoom = false;
return; return;
} }