commit c03e1c55a79f00d02ab528945425ff50cb700402
author Ben Wagner <bungeman@google.com> Mon Oct 17 15:20:02 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 17 21:10:38 2016 +0000
tree 4b9ab4bb4baa827bc6f28725cd5e19a97cd42d09
parent 6bff1573c1a1c27fa09b2ddb13ffd46f94e57750

Re-enable overdraw mode in debugger.

Debugger is the last user of the deprecated SkPaintFilterCanvas
constructor. Stop using it and remove the constructor.

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3268

Change-Id: I3e9180d48abdf86cb2c05bd8d95acabcdaa70427
Reviewed-on: https://skia-review.googlesource.com/3268
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Reed <reed@google.com>

src/gpu/GrProcessor.cpp

diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp
index 5ca9935..7d7ce9b 100644
--- a/src/gpu/GrProcessor.cpp
+++ b/src/gpu/GrProcessor.cpp
@@ -48,13 +48,15 @@
  * we verify the count is as expected.  If a new factory is added, then these numbers must be
  * manually adjusted.
  */
-static const int kFPFactoryCount = 41;
+static const int kFPFactoryCount = 40;
 static const int kGPFactoryCount = 14;
-static const int kXPFactoryCount = 6;
+static const int kXPFactoryCount = 5;
 
 template<>
 void GrProcessorTestFactory<GrFragmentProcessor>::VerifyFactoryCount() {
     if (kFPFactoryCount != GetFactories()->count()) {
+        SkDebugf("\nExpected %d fragment processor factories, found %d.\n",
+                 kFPFactoryCount, GetFactories()->count());
         SkFAIL("Wrong number of fragment processor factories!");
     }
 }
@@ -62,6 +64,8 @@
 template<>
 void GrProcessorTestFactory<GrGeometryProcessor>::VerifyFactoryCount() {
     if (kGPFactoryCount != GetFactories()->count()) {
+        SkDebugf("\nExpected %d geometry processor factories, found %d.\n",
+                 kGPFactoryCount, GetFactories()->count());
         SkFAIL("Wrong number of geometry processor factories!");
     }
 }
@@ -69,6 +73,8 @@
 template<>
 void GrProcessorTestFactory<GrXPFactory>::VerifyFactoryCount() {
     if (kXPFactoryCount != GetFactories()->count()) {
+        SkDebugf("\nExpected %d xp factory factories, found %d.\n",
+                 kXPFactoryCount, GetFactories()->count());
         SkFAIL("Wrong number of xp factory factories!");
     }
 }

src/utils/SkPaintFilterCanvas.cpp

diff --git a/src/utils/SkPaintFilterCanvas.cpp b/src/utils/SkPaintFilterCanvas.cpp
index 15d76d6..910647d 100644
--- a/src/utils/SkPaintFilterCanvas.cpp
+++ b/src/utils/SkPaintFilterCanvas.cpp
@@ -29,8 +29,6 @@
     bool                         fShouldDraw;
 };
 
-SkPaintFilterCanvas::SkPaintFilterCanvas(int width, int height) : INHERITED(width, height) { }
-
 SkPaintFilterCanvas::SkPaintFilterCanvas(SkCanvas *canvas)
     : INHERITED(canvas->imageInfo().width(), canvas->imageInfo().height()) {