Fix OverdrawFilter not set on first call to SkDebugCanvas::drawTo()

src/utils/debugger/SkDebugCanvas.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkColorPriv.h"
@@ skipping 135 matching lines @@
             canvas->restore();
         }
         i = 0;
         canvas->clear(SK_ColorTRANSPARENT);
         canvas->resetMatrix();
         SkRect rect = SkRect::MakeWH(SkIntToScalar(fWidth),
                                      SkIntToScalar(fHeight));
         canvas->clipRect(rect, SkRegion::kReplace_Op );
         applyUserTransform(canvas);
         fOutstandingSaveCount = 0;
+    }
 
-        // The setting of the draw filter has to go here (rather than in
-        // SkRasterWidget) due to the canvas restores this class performs.
-        // Since the draw filter is stored in the layer stack if we
-        // call setDrawFilter on anything but the root layer odd things happen
-        if (fOverdrawViz) {
-            if (NULL == fOverdrawFilter) {
-                fOverdrawFilter = new OverdrawFilter;
-            }
+    // The setting of the draw filter has to go here (rather than in
+    // SkRasterWidget) due to the canvas restores this class performs.
+    // Since the draw filter is stored in the layer stack if we
+    // call setDrawFilter on anything but the root layer odd things happen.
+    if (fOverdrawViz) {
+        if (NULL == fOverdrawFilter) {
+            fOverdrawFilter = new OverdrawFilter;
+        }
 
-            if (fOverdrawFilter != canvas->getDrawFilter()) {
-                canvas->setDrawFilter(fOverdrawFilter);
-            }
-        } else {
-            canvas->setDrawFilter(NULL);
+        if (fOverdrawFilter != canvas->getDrawFilter()) {
+            canvas->setDrawFilter(fOverdrawFilter);
         }
+    } else {
+        canvas->setDrawFilter(NULL);
     }
 
     for (; i <= index; i++) {
         if (i == index && fFilter) {
             SkPaint p;
             p.setColor(0xAAFFFFFF);
             canvas->save();
             canvas->resetMatrix();
             SkRect mask;
             mask.set(SkIntToScalar(0), SkIntToScalar(0),
@@ skipping 230 matching lines @@
 
 bool SkDebugCanvas::translate(SkScalar dx, SkScalar dy) {
     addDrawCommand(new SkTranslateCommand(dx, dy));
     return true;
 }
 
 void SkDebugCanvas::toggleCommand(int index, bool toggle) {
     SkASSERT(index < fCommandVector.count());
     fCommandVector[index]->setVisible(toggle);
 }