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
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();
}
////////////////////////////////////////////////////////////////////////////////