src/gpu/GrTextContext.h - Issue 1178383003: Revert of Make GrTextContext be owned by the GrDrawContext

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/gpu/GrTextContext.h

Issue 1178383003: Revert of Make GrTextContext be owned by the GrDrawContext (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: 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/gpu/GrTextContext.h

diff --git a/src/gpu/GrTextContext.h b/src/gpu/GrTextContext.h

index 775203e544f61faf3ca15eeee4a8e988a4abdb37..f4c0982ed4393b0e9ce2b0eb7bbeeec7cbc5fb78 100644

--- a/src/gpu/GrTextContext.h

+++ b/src/gpu/GrTextContext.h

@@ -48,7 +48,6 @@

GrContext* fContext;

SkDeviceProperties fDeviceProperties;

- GrDrawContext* fDrawContext; // owning drawContext

SkAutoTUnref<GrRenderTarget> fRenderTarget;

GrClip fClip;

SkIRect fClipRect;

@@ -56,27 +55,27 @@

GrPaint fPaint;

SkPaint fSkPaint;

- GrTextContext(GrContext*, GrDrawContext*, const SkDeviceProperties&);

+ GrTextContext(GrContext*, const SkDeviceProperties&);

virtual bool canDraw(const GrRenderTarget*, const GrClip&, const GrPaint&,

const SkPaint&, const SkMatrix& viewMatrix) = 0;

- virtual void onDrawText(GrRenderTarget*, const GrClip&,

+ virtual void onDrawText(GrDrawContext*, GrRenderTarget*, const GrClip&,

const GrPaint&, const SkPaint&,

const SkMatrix& viewMatrix, const char text[], size_t byteLength,

SkScalar x, SkScalar y, const SkIRect& clipBounds) = 0;

- virtual void onDrawPosText(GrRenderTarget*, const GrClip&,

+ virtual void onDrawPosText(GrDrawContext*, GrRenderTarget*, const GrClip&,

const GrPaint&, const SkPaint&,

const SkMatrix& viewMatrix,

const char text[], size_t byteLength,

const SkScalar pos[], int scalarsPerPosition,

const SkPoint& offset, const SkIRect& clipBounds) = 0;

- void drawTextAsPath(GrRenderTarget*, const GrClip& clip,

+ void drawTextAsPath(GrDrawContext*, GrRenderTarget*, const GrClip& clip,

const SkPaint& origPaint, const SkMatrix& viewMatrix,

const char text[], size_t byteLength, SkScalar x, SkScalar y,

const SkIRect& clipBounds);

- void drawPosTextAsPath(GrRenderTarget*, const GrClip& clip,

+ void drawPosTextAsPath(GrDrawContext*, GrRenderTarget*, const GrClip& clip,

const SkPaint& origPaint, const SkMatrix& viewMatrix,

const char text[], size_t byteLength,

const SkScalar pos[], int scalarsPerPosition,

« no previous file with comments | « src/gpu/GrStencilAndCoverTextContext.cpp ('k') | src/gpu/GrTextContext.cpp » ('j') | no next file with comments »