diff options
| author |  robertphillips <robertphillips@google.com> | 2015-12-02 08:57:50 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-02 08:57:50 -0800 |
| commit | 6ee690e1d838e152c134257bdd57e9a1509ee7c2 (patch) | |
| tree | 5e6e5ff50dd40718778bad340882606fcd3d8e95 /src/gpu/GrTextContext.cpp | |
| parent | 7d5105c4d2a9be7ef9ddba646471c35d4c966d97 (diff) | |
Remove plumbing of clipRect thoughout the TextContexts
The RenderTarget was only being passed around to be able to recreate the clipRect.
Review URL: https://codereview.chromium.org/1486323002
Diffstat (limited to 'src/gpu/GrTextContext.cpp')
| -rw-r--r-- | src/gpu/GrTextContext.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp index 5cfcf64c1a..b1bae56ed5 100644 --- a/src/gpu/GrTextContext.cpp +++ b/src/gpu/GrTextContext.cpp @@ -42,7 +42,7 @@ void GrTextContext::drawText(GrDrawContext* dc, GrRenderTarget* rt, GrTextContext* textContext = this; do { - if (textContext->canDraw(rt, clip, paint, skPaint, viewMatrix)) { + if (textContext->canDraw(skPaint, viewMatrix)) { textContext->onDrawText(dc, rt, clip, paint, skPaint, viewMatrix, text, byteLength, x, y, clipBounds); return; @@ -51,8 +51,7 @@ void GrTextContext::drawText(GrDrawContext* dc, GrRenderTarget* rt, } while (textContext); // fall back to drawing as a path - this->drawTextAsPath(dc, clip, skPaint, viewMatrix, - text, byteLength, x, y, clipBounds); + this->drawTextAsPath(dc, clip, skPaint, viewMatrix, text, byteLength, x, y, clipBounds); } void GrTextContext::drawPosText(GrDrawContext* dc, GrRenderTarget* rt, @@ -67,7 +66,7 @@ void GrTextContext::drawPosText(GrDrawContext* dc, GrRenderTarget* rt, GrTextContext* textContext = this; do { - if (textContext->canDraw(rt, clip, paint, skPaint, viewMatrix)) { + if (textContext->canDraw(skPaint, viewMatrix)) { textContext->onDrawPosText(dc, rt, clip, paint, skPaint, viewMatrix, text, byteLength, pos, scalarsPerPosition, offset, clipBounds); |