dm/DMGpuGMTask.cpp - Issue 301283003: Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: dm/DMGpuGMTask.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

OLD	NEW
1 #include "DMGpuGMTask.h"	1 #include "DMGpuGMTask.h"

2	2

3 #include "DMExpectationsTask.h"	3 #include "DMExpectationsTask.h"

4 #include "DMUtil.h"	4 #include "DMUtil.h"

5 #include "DMWriteTask.h"	5 #include "DMWriteTask.h"

6 #include "SkCommandLineFlags.h"	6 #include "SkCommandLineFlags.h"

7 #include "SkSurface.h"	7 #include "SkSurface.h"

8 #include "SkTLS.h"	8 #include "SkTLS.h"

9	9

10 namespace DM {	10 namespace DM {

(...skipping 19 matching lines...) Expand all Loading...
30 kN32_SkColorType,	30 kN32_SkColorType,

31 kPremul_SkAlphaType);	31 kPremul_SkAlphaType);

32 SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, info, fSampleCount));	32 SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, info, fSampleCount));

33 SkCanvas* canvas = surface->getCanvas();	33 SkCanvas* canvas = surface->getCanvas();

34	34

35 canvas->concat(fGM->getInitialTransform());	35 canvas->concat(fGM->getInitialTransform());

36 fGM->draw(canvas);	36 fGM->draw(canvas);

37 canvas->flush();	37 canvas->flush();

38	38

39 SkBitmap bitmap;	39 SkBitmap bitmap;

40 bitmap.setConfig(info);	40 bitmap.setInfo(info);

41 canvas->readPixels(&bitmap, 0, 0);	41 canvas->readPixels(&bitmap, 0, 0);

42	42

43 this->spawnChild(SkNEW_ARGS(ExpectationsTask, (*this, fExpectations, bitmap) ));	43 this->spawnChild(SkNEW_ARGS(ExpectationsTask, (*this, fExpectations, bitmap) ));

44 this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap)));	44 this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap)));

45 }	45 }

46	46

47 bool GpuGMTask::shouldSkip() const {	47 bool GpuGMTask::shouldSkip() const {

48 return kGPUDisabled \|\| SkToBool(fGM->getFlags() & skiagm::GM::kSkipGPU_Flag) ;	48 return kGPUDisabled \|\| SkToBool(fGM->getFlags() & skiagm::GM::kSkipGPU_Flag) ;

49 }	49 }

50	50

51 } // namespace DM	51 } // namespace DM

OLD	NEW

« no previous file with comments | « no previous file | dm/DMWriteTask.cpp » ('j') | no next file with comments »