AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix printing of error messages in canvasstatetest.

Browse Source 
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
This commit is contained in:
commit-bot@chromium.org 2013-09-18 20:15:12 +00:00
parent 44d3dafc87
commit 07f6cf372d
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/SkCanvasStateUtils.cpp
View File

@ -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 @@ SkCanvasState* SkCanvasStateUtils::CaptureCanvasState(SkCanvas* canvas) {
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 @@ SkCanvasState* SkCanvasStateUtils::CaptureCanvasState(SkCanvas* canvas) {
// 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();

9
tests/CanvasStateTest.cpp
View File

@ -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 @@ static void test_draw_filters(skiatest::Reporter* reporter) {
////////////////////////////////////////////////////////////////////////////////
// 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 @@ static void test_soft_clips(skiatest::Reporter* reporter) {
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();
}
////////////////////////////////////////////////////////////////////////////////