Add GrRenderTarget parameter to GrTextContext::canDraw

Add more parameters to GrTextContext::canDraw

Updates canDraw to accept all the same Skia/Gr objects as the drawText
functions, since that information may very well be relevant in
determining whether a context can draw.

Also moves the onDrawTextBlob implementation directly into
drawTextBlob.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/e68f7362b1e00e88688906de6384e4e5a83076d0

[Chris Dalton, 2015-03-17 00:27:38]

cdalton@nvidia.com changed reviewers:
+ bsalomon@google.com, vbuzinov@nvidia.com

[vbuzinov, 2015-03-17 13:06:56]

https://codereview.chromium.org/1010113004/diff/1/src/gpu/GrTextContext.cpp
File src/gpu/GrTextContext.cpp (right):

https://codereview.chromium.org/1010113004/diff/1/src/gpu/GrTextContext.cpp#n...
src/gpu/GrTextContext.cpp:48: do {
Can we create a pipeline builder here and pass it to canDraw instead of rt (rt
can be queried with getRenderTarget)?  That would allow us to just use the same
code in canDraw as in GrStencilAndCoverPathRenderer.  

We could then pass it to onDrawText as well to the implementation that can draw.
 Unless its creation has to be deferred until later for some reason?

[bsalomon, 2015-03-17 14:45:48]

bsalomon@google.com changed reviewers:
+ egdaniel@google.com, jvanverth@google.com

[bsalomon, 2015-03-17 14:45:48]

https://codereview.chromium.org/1010113004/diff/1/src/gpu/GrTextContext.cpp
File src/gpu/GrTextContext.cpp (right):

https://codereview.chromium.org/1010113004/diff/1/src/gpu/GrTextContext.cpp#n...
src/gpu/GrTextContext.cpp:48: do {
On 2015/03/17 13:06:56, vbuzinov wrote:
> Can we create a pipeline builder here and pass it to canDraw instead of rt (rt
> can be queried with getRenderTarget)?  That would allow us to just use the
same
> code in canDraw as in GrStencilAndCoverPathRenderer.  
> 
> We could then pass it to onDrawText as well to the implementation that can
draw.
>  Unless its creation has to be deferred until later for some reason?

I like that direction (passing a PB here). I know there were some complexities
that caused us to pass both a SkPaint and GrPaint here. IIRC it is related to
LCD text. The XP work was supposed to help simplify that. It'd be great to just
turn the GrPaint into a GrPB here and drop the two paints. But I'm not familiar
with the details. Adding Greg and Jim to comment.

[Chris Dalton, 2015-03-17 19:46:36]

Right now each text context has its own pipeline builder object that it uses. I
really like the idea of taking that out and stack-allocating one instead. Then
we could pass it to both canDraw and draw.

I do slightly worry about the fallback though. If no text context can draw, we
fall back on drawText_asPaths, which then creates its own pipeline builder. Is
it acceptable to throw one away and end up making two during a draw call? (I'm
gusesing yes, since the class looks pretty lightweight and the GrXPFactory gets
saved in the GrPaint anyway, so you only have to create it once).

In the meantime while we wait for feedback, I went ahead and modified it
slightly so canDraw accepts more parameters. That would also give us enough info
to do our thing with nvfms if the pipeline builder approach ends up not
happening.

[Chris Dalton, 2015-03-22 17:46:53]

Ping! Do you think we can get a green light on this (simple) change, or else
some feedback on a refactor for PipelineBuilder?

[bsalomon, 2015-03-24 15:35:05]

On 2015/03/22 17:46:53, Chris Dalton wrote:
> Ping! Do you think we can get a green light on this (simple) change, or else
> some feedback on a refactor for PipelineBuilder?

I think we can probably do some reduction of the params here, do to some work
we've done in creating the XP. But, I don't think this CL fundamentally makes
that harder. So, lgtm.

[Chris Dalton, 2015-03-24 16:43:38]

The CQ bit was checked by cdalton@nvidia.com

[commit-bot: I haz the power, 2015-03-24 16:43:47]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1010113004/20001

[commit-bot: I haz the power, 2015-03-24 16:43:51]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-24 16:43:52]

Failed to apply patch for src/gpu/GrBitmapTextContext.h:
While running git apply --index -3 -p1;
  error: patch failed: src/gpu/GrBitmapTextContext.h:39
  Falling back to three-way merge...
  Applied patch to 'src/gpu/GrBitmapTextContext.h' with conflicts.
  U src/gpu/GrBitmapTextContext.h

Patch:       src/gpu/GrBitmapTextContext.h
Index: src/gpu/GrBitmapTextContext.h
diff --git a/src/gpu/GrBitmapTextContext.h b/src/gpu/GrBitmapTextContext.h
index
e181fd2b69616befc8a3c08764d3c6b588f189a0..fcf55ce76febb36f43b63a5727211fc9644d764d
100644
--- a/src/gpu/GrBitmapTextContext.h
+++ b/src/gpu/GrBitmapTextContext.h
@@ -39,16 +39,17 @@ private:
 
     GrBitmapTextContext(GrContext*, const SkDeviceProperties&);
 
-    bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE;
-
-    virtual void onDrawText(GrRenderTarget*, const GrClip&, const GrPaint&,
const SkPaint&,
-                            const SkMatrix& viewMatrix, const char text[],
size_t byteLength,
-                            SkScalar x, SkScalar y) SK_OVERRIDE;
-    virtual void onDrawPosText(GrRenderTarget*, const GrClip&, const GrPaint&,
const SkPaint&,
-                               const SkMatrix& viewMatrix,
-                               const char text[], size_t byteLength,
-                               const SkScalar pos[], int scalarsPerPosition,
-                               const SkPoint& offset) SK_OVERRIDE;
+    bool canDraw(const GrRenderTarget*, const GrClip&, const GrPaint&,
+                 const SkPaint&, const SkMatrix& viewMatrix) SK_OVERRIDE;
+
+    void onDrawText(GrRenderTarget*, const GrClip&, const GrPaint&, const
SkPaint&,
+                    const SkMatrix& viewMatrix, const char text[], size_t
byteLength,
+                    SkScalar x, SkScalar y) SK_OVERRIDE;
+    void onDrawPosText(GrRenderTarget*, const GrClip&, const GrPaint&, const
SkPaint&,
+                       const SkMatrix& viewMatrix,
+                       const char text[], size_t byteLength,
+                       const SkScalar pos[], int scalarsPerPosition,
+                       const SkPoint& offset) SK_OVERRIDE;
 
     void init(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&);
     void appendGlyph(GrGlyph::PackedID, SkFixed left, SkFixed top,
GrFontScaler*);

[Chris Dalton, 2015-03-24 17:11:01]

Patch doesn't rebase trivially anymore

[Chris Dalton, 2015-03-24 20:15:16]

cdalton@nvidia.com changed reviewers:
+ joshualitt@google.com
- egdaniel@google.com, jvanverth@google.com

[Chris Dalton, 2015-03-24 20:15:17]

This rebase is pretty big. Adding joshualitt@ to ok the text blob change.

[joshualitt, 2015-03-24 20:17:27]

On 2015/03/24 20:15:17, Chris Dalton wrote:
> This rebase is pretty big. Adding joshualitt@ to ok the text blob change.

textblob change lgtm

[Chris Dalton, 2015-03-25 20:46:01]

The CQ bit was checked by cdalton@nvidia.com

[Chris Dalton, 2015-03-25 20:46:02]

The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com
Link to the patchset: https://codereview.chromium.org/1010113004/#ps40001
(title: "rebase")

[commit-bot: I haz the power, 2015-03-25 20:46:16]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1010113004/40001

[commit-bot: I haz the power, 2015-03-25 21:02:41]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/e68f7362b1e00e88688906de6384e4e5a83076d0