commit 07f6cf372dc003694c79cfb313923fef9eaf8dc8
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Sep 18 20:15:12 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Sep 18 20:15:12 2013 +0000
tree 52149746fb0fe2f0a66265ce5c66f227c28d4ac2
parent 44d3dafc87796396850396ef607d7e8fa53e13eb

fix printing of error messages in canvasstatetest.

R=scroggo@google.com, caryclark@google.com

Author: djsollen@google.com

Review URL: https://chromiumcodereview.appspot.com/23477067

git-svn-id: http://skia.googlecode.com/svn/trunk@11363 2bbb7eff-a529-9590-31e7-b0007b416f81

src/utils/SkCanvasStateUtils.cpp

diff --git a/src/utils/SkCanvasStateUtils.cpp b/src/utils/SkCanvasStateUtils.cpp
index cd79a44..0cc42c5c 100644
--- a/src/utils/SkCanvasStateUtils.cpp
+++ b/src/utils/SkCanvasStateUtils.cpp
@@ -10,6 +10,7 @@
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkCanvasStack.h"
+#include "SkErrorInternals.h"
 #include "SkWriter32.h"
 
 #define CANVAS_STATE_VERSION 1
@@ -183,7 +184,8 @@
     ClipValidator validator;
     canvas->replayClips(&validator);
     if (validator.failed()) {
-        SkDEBUGF(("CaptureCanvasState does not support canvases with antialiased clips.\n"));
+        SkErrorInternals::SetError(kInvalidOperation_SkError,
+                "CaptureCanvasState does not support canvases with antialiased clips.\n");
         return NULL;
     }
 
@@ -244,7 +246,7 @@
 
     // for now, just ignore any client supplied DrawFilter.
     if (canvas->getDrawFilter()) {
-        SkDEBUGF(("CaptureCanvasState will ignore the canvases draw filter.\n"));
+//        SkDEBUGF(("CaptureCanvasState will ignore the canvases draw filter.\n"));
     }
 
     return canvasState.detach();

tests/CanvasStateTest.cpp

diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp
index 91d369e..7cba71e 100644
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@@ -11,6 +11,7 @@
 #include "SkCanvas.h"
 #include "SkCanvasStateUtils.h"
 #include "SkDrawFilter.h"
+#include "SkError.h"
 #include "SkPaint.h"
 #include "SkRect.h"
 #include "SkRRect.h"
@@ -205,6 +206,9 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
+// we need this function to prevent SkError from printing to stdout
+static void error_callback(SkError code, void* ctx) {}
+
 static void test_soft_clips(skiatest::Reporter* reporter) {
     SkBitmapDevice device(SkBitmap::kARGB_8888_Config, 10, 10);
     SkCanvas canvas(&device);
@@ -214,8 +218,13 @@
 
     canvas.clipRRect(roundRect, SkRegion::kIntersect_Op, true);
 
+    SkSetErrorCallback(error_callback, NULL);
+
     SkCanvasState* state = SkCanvasStateUtils::CaptureCanvasState(&canvas);
     REPORTER_ASSERT(reporter, !state);
+
+    REPORTER_ASSERT(reporter, kInvalidOperation_SkError == SkGetLastError());
+    SkClearLastError();
 }
 
 ////////////////////////////////////////////////////////////////////////////////