Chromium Code Reviews| Index: src/pipe/SkGPipeWrite.cpp |
| diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp |
| index 186b66cd98161b859fe1abd96338c3353be8ecba..d796e8a99bbbd408eaa1b486f9f25a2cf2b4cf47 100644 |
| --- a/src/pipe/SkGPipeWrite.cpp |
| +++ b/src/pipe/SkGPipeWrite.cpp |
| @@ -289,7 +289,7 @@ protected: |
| virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; |
| virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; |
| - virtual void onDrawPicture(const SkPicture* picture) SK_OVERRIDE; |
| + virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; |
| private: |
| void recordTranslate(const SkMatrix&); |
| @@ -933,9 +933,14 @@ void SkGPipeCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const |
| } |
| } |
| -void SkGPipeCanvas::onDrawPicture(const SkPicture* picture) { |
| +void SkGPipeCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix, |
| + const SkPaint* paint) { |
| // we want to playback the picture into individual draw calls |
| - this->INHERITED::onDrawPicture(picture); |
| + // |
|
robertphillips
2014/08/08 15:19:47
I second the motion.
|
| + // todo: do we always have to unroll? If the pipe is not cross-process, seems like |
| + // we could just ref the picture and move on...? <reed, scroggo> |
| + // |
|
robertphillips
2014/08/08 15:19:47
I don't think this will work right. Won't the laye
|
| + this->INHERITED::onDrawPicture(picture, matrix, paint); |
| } |
| void SkGPipeCanvas::drawVertices(VertexMode vmode, int vertexCount, |