Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(661)

Side by Side Diff: tests/PipeTest.cpp

Issue 301283003: Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)" (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: add guard for android Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « tests/PictureTest.cpp ('k') | tests/ReadPixelsTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SamplePipeControllers.h" 8 #include "SamplePipeControllers.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
11 #include "SkGPipe.h" 11 #include "SkGPipe.h"
12 #include "SkPaint.h" 12 #include "SkPaint.h"
13 #include "SkShader.h" 13 #include "SkShader.h"
14 #include "Test.h" 14 #include "Test.h"
15 15
16 // Ensures that the pipe gracefully handles drawing an invalid bitmap. 16 // Ensures that the pipe gracefully handles drawing an invalid bitmap.
17 static void testDrawingBadBitmap(SkCanvas* pipeCanvas) { 17 static void testDrawingBadBitmap(SkCanvas* pipeCanvas) {
18 SkBitmap badBitmap; 18 SkBitmap badBitmap;
19 badBitmap.setConfig(SkImageInfo::Make(5, 5, kUnknown_SkColorType, 19 badBitmap.setInfo(SkImageInfo::MakeUnknown(5, 5));
20 kPremul_SkAlphaType));
21 pipeCanvas->drawBitmap(badBitmap, 0, 0); 20 pipeCanvas->drawBitmap(badBitmap, 0, 0);
22 } 21 }
23 22
24 // Ensure that pipe gracefully handles attempting to draw after endRecording is called on the 23 // Ensure that pipe gracefully handles attempting to draw after endRecording is called on the
25 // SkGPipeWriter. 24 // SkGPipeWriter.
26 static void testDrawingAfterEndRecording(SkCanvas* canvas) { 25 static void testDrawingAfterEndRecording(SkCanvas* canvas) {
27 PipeController pc(canvas); 26 PipeController pc(canvas);
28 SkGPipeWriter writer; 27 SkGPipeWriter writer;
29 SkCanvas* pipeCanvas = writer.startRecording(&pc, SkGPipeWriter::kCrossProce ss_Flag); 28 SkCanvas* pipeCanvas = writer.startRecording(&pc, SkGPipeWriter::kCrossProce ss_Flag);
30 writer.endRecording(); 29 writer.endRecording();
31 30
32 SkBitmap bm; 31 SkBitmap bm;
33 bm.allocN32Pixels(2, 2); 32 bm.allocN32Pixels(2, 2);
34 bm.eraseColor(SK_ColorTRANSPARENT); 33 bm.eraseColor(SK_ColorTRANSPARENT);
35 34
36 SkShader* shader = SkShader::CreateBitmapShader(bm, SkShader::kClamp_TileMod e, 35 SkShader* shader = SkShader::CreateBitmapShader(bm, SkShader::kClamp_TileMod e,
37 SkShader::kClamp_TileMode); 36 SkShader::kClamp_TileMode);
38 SkPaint paint; 37 SkPaint paint;
39 paint.setShader(shader)->unref(); 38 paint.setShader(shader)->unref();
40 pipeCanvas->drawPaint(paint); 39 pipeCanvas->drawPaint(paint);
41 40
42 pipeCanvas->drawBitmap(bm, 0, 0); 41 pipeCanvas->drawBitmap(bm, 0, 0);
43 } 42 }
44 43
45 DEF_TEST(Pipe, reporter) { 44 DEF_TEST(Pipe, reporter) {
46 SkBitmap bitmap; 45 SkBitmap bitmap;
47 bitmap.setConfig(SkImageInfo::MakeN32Premul(64, 64)); 46 bitmap.setInfo(SkImageInfo::MakeN32Premul(64, 64));
48 SkCanvas canvas(bitmap); 47 SkCanvas canvas(bitmap);
49 48
50 PipeController pipeController(&canvas); 49 PipeController pipeController(&canvas);
51 SkGPipeWriter writer; 50 SkGPipeWriter writer;
52 SkCanvas* pipeCanvas = writer.startRecording(&pipeController); 51 SkCanvas* pipeCanvas = writer.startRecording(&pipeController);
53 testDrawingBadBitmap(pipeCanvas); 52 testDrawingBadBitmap(pipeCanvas);
54 writer.endRecording(); 53 writer.endRecording();
55 54
56 testDrawingAfterEndRecording(&canvas); 55 testDrawingAfterEndRecording(&canvas);
57 } 56 }
OLDNEW
« no previous file with comments | « tests/PictureTest.cpp ('k') | tests/ReadPixelsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698