src/core/SkCanvas.cpp - Issue 1168303006: Revert[2] SkDraw and all Blitters to use pixmap instead of bitmapi

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

Unified Diff: src/core/SkCanvas.cpp

Issue 1168303006: Revert[2] SkDraw and all Blitters to use pixmap instead of bitmapi (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: add dox to new test Created 5 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 side-by-side diff with in-line comments

Download patch

Index: src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp

index 30778fc13004df33bfb47d73fc37171237ecdf63..14372611f8cfbed8a667a0a3b9eeedaf853aa17f 100644

--- a/src/core/SkCanvas.cpp

+++ b/src/core/SkCanvas.cpp

@@ -270,7 +270,9 @@ public:

fClip = &((SkRasterClip*)&rec->fClip)->forceGetBW();

fRC = &rec->fClip;

fDevice = rec->fDevice;

- fBitmap = &fDevice->accessBitmap(true);

+ if (!fDevice->accessPixels(&fDst)) {

+ fDst.reset(fDevice->imageInfo(), NULL, 0);

+ }

fPaint = rec->fPaint;

SkDEBUGCODE(this->validate();)

« no previous file with comments | « src/core/SkBlitter_RGB16.cpp ('k') | src/core/SkCoreBlitters.h » ('j') | no next file with comments »