commit 1df26b1ed285e4503ccfc579cb575d7f6affae85
author Mike Reed <reed@google.com> Fri Jan 08 13:34:54 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 08 13:34:54 2010 -0800
tree 43983aabd1fe7c7b9dc3b8781f25ed6f41e48e69
parent 046dd0111c834a16d812ef41f9f12b6e127e6c0c
parent fdc5424b1c152507a3def57aecad134b47908d74

Merge "optional flag to enable tracker debugging"

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 2c716b3..b7346309 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -203,6 +203,8 @@
         implements ViewTreeObserver.OnGlobalFocusChangeListener,
         ViewGroup.OnHierarchyChangeListener {
 
+    // enable debug output for drag trackers
+    private static final boolean DEBUG_DRAG_TRACKER;
     // if AUTO_REDRAW_HACK is true, then the CALL key will toggle redrawing
     // the screen all-the-time. Good for profiling our drawing code
     static private final boolean AUTO_REDRAW_HACK = false;
@@ -3967,7 +3969,7 @@
             mMinDY = -viewTop;
             mMaxDY = docBottom - viewBottom;
 
-            if (DebugFlags.DRAG_TRACKER) {
+            if (DebugFlags.DRAG_TRACKER || DEBUG_DRAG_TRACKER) {
                 Log.d(DebugFlags.DRAG_TRACKER_LOGTAG, " dragtracker y= " + y +
                       " up/down= " + mMinDY + " " + mMaxDY);
             }
@@ -4004,7 +4006,7 @@
             if (mCurrStretchX != sx || mCurrStretchY != sy) {
                 mCurrStretchX = sx;
                 mCurrStretchY = sy;
-                if (DebugFlags.DRAG_TRACKER) {
+                if (DebugFlags.DRAG_TRACKER || DEBUG_DRAG_TRACKER) {
                     Log.d(DebugFlags.DRAG_TRACKER_LOGTAG, "---- stretch " + sx +
                           " " + sy);
                 }
@@ -4015,7 +4017,7 @@
         }
 
         public void stopDrag() {
-            if (DebugFlags.DRAG_TRACKER) {
+            if (DebugFlags.DRAG_TRACKER || DEBUG_DRAG_TRACKER) {
                 Log.d(DebugFlags.DRAG_TRACKER_LOGTAG, "----- stopDrag");
             }
             mProxy.onStopDrag();
@@ -4052,7 +4054,7 @@
                 canvas.restoreToCount(count);
                 return true;
             }
-            if (DebugFlags.DRAG_TRACKER) {
+            if (DebugFlags.DRAG_TRACKER || DEBUG_DRAG_TRACKER) {
                 Log.d(DebugFlags.DRAG_TRACKER_LOGTAG, " -- draw false " +
                       mCurrStretchX + " " + mCurrStretchY);
             }
@@ -4067,7 +4069,7 @@
             canvas.translate(-sx, -sy);
             drawContent(canvas);
 
-            if (DebugFlags.DRAG_TRACKER) {
+            if (DebugFlags.DRAG_TRACKER || DEBUG_DRAG_TRACKER) {
                 Log.d(DebugFlags.DRAG_TRACKER_LOGTAG, "--- buildBitmap " + sx +
                       " " + sy + " " + w + " " + h);
             }