Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 Google Inc. |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #include "SkBitmapHeap.h" | 10 #include "SkBitmapHeap.h" |
| 11 #include "SkCanvas.h" | 11 #include "SkCanvas.h" |
| 12 #include "SkPaint.h" | 12 #include "SkPaint.h" |
| 13 #include "SkGPipe.h" | 13 #include "SkGPipe.h" |
| 14 #include "SkGPipePriv.h" | 14 #include "SkGPipePriv.h" |
| 15 #include "SkReader32.h" | 15 #include "SkReader32.h" |
| 16 #include "SkStream.h" | 16 #include "SkStream.h" |
| 17 | 17 |
| 18 #include "SkAnnotation.h" | 18 #include "SkAnnotation.h" |
| 19 #include "SkColorFilter.h" | 19 #include "SkColorFilter.h" |
| 20 #include "SkDrawLooper.h" | 20 #include "SkDrawLooper.h" |
| 21 #include "SkImageFilter.h" | 21 #include "SkImageFilter.h" |
| 22 #include "SkMaskFilter.h" | 22 #include "SkMaskFilter.h" |
| 23 #include "SkReadBuffer.h" | 23 #include "SkReadBuffer.h" |
| 24 #include "SkPatchUtils.h" | 24 #include "SkPatchUtils.h" |
| 25 #include "SkPathEffect.h" | 25 #include "SkPathEffect.h" |
| 26 #include "SkRasterizer.h" | 26 #include "SkRasterizer.h" |
| 27 #include "SkRRect.h" | 27 #include "SkRRect.h" |
| 28 #include "SkShader.h" | 28 #include "SkShader.h" |
| 29 #include "SkTextBlob.h" | |
| 29 #include "SkTypeface.h" | 30 #include "SkTypeface.h" |
| 30 #include "SkXfermode.h" | 31 #include "SkXfermode.h" |
| 31 | 32 |
| 32 static SkFlattenable::Type paintflat_to_flattype(PaintFlats pf) { | 33 static SkFlattenable::Type paintflat_to_flattype(PaintFlats pf) { |
| 33 static const uint8_t gEffectTypesInPaintFlatsOrder[] = { | 34 static const uint8_t gEffectTypesInPaintFlatsOrder[] = { |
| 34 SkFlattenable::kSkColorFilter_Type, | 35 SkFlattenable::kSkColorFilter_Type, |
| 35 SkFlattenable::kSkDrawLooper_Type, | 36 SkFlattenable::kSkDrawLooper_Type, |
| 36 SkFlattenable::kSkImageFilter_Type, | 37 SkFlattenable::kSkImageFilter_Type, |
| 37 SkFlattenable::kSkMaskFilter_Type, | 38 SkFlattenable::kSkMaskFilter_Type, |
| 38 SkFlattenable::kSkPathEffect_Type, | 39 SkFlattenable::kSkPathEffect_Type, |
| (...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 665 } | 666 } |
| 666 } | 667 } |
| 667 | 668 |
| 668 static void drawPicture_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, | 669 static void drawPicture_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, |
| 669 SkGPipeState* state) { | 670 SkGPipeState* state) { |
| 670 UNIMPLEMENTED | 671 UNIMPLEMENTED |
| 671 } | 672 } |
| 672 | 673 |
| 673 static void drawTextBlob_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, | 674 static void drawTextBlob_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, |
| 674 SkGPipeState* state) { | 675 SkGPipeState* state) { |
| 675 UNIMPLEMENTED | 676 SkScalar x = reader->readScalar(); |
| 677 SkScalar y = reader->readScalar(); | |
| 678 | |
| 679 size_t blobSize = reader->readU32(); | |
| 680 const void* data = reader->skip(SkAlign4(blobSize)); | |
| 681 | |
| 682 SkReadBuffer blobBuffer(data, blobSize); | |
|
mtklein
2014/08/28 18:53:27
This seems like a small thing, but I bet we could
f(malita)
2014/08/28 19:02:45
Done.
| |
| 683 SkAutoTUnref<const SkTextBlob> blob(SkTextBlob::CreateFromBuffer(blobBuffer) ); | |
| 684 | |
|
mtklein
2014/08/28 18:53:27
Consider SkASSERT(blob.get()) ?
f(malita)
2014/08/28 19:02:45
Done.
| |
| 685 if (state->shouldDraw()) { | |
| 686 canvas->drawTextBlob(blob, x, y, state->paint()); | |
| 687 } | |
| 676 } | 688 } |
| 677 /////////////////////////////////////////////////////////////////////////////// | 689 /////////////////////////////////////////////////////////////////////////////// |
| 678 | 690 |
| 679 static void paintOp_rp(SkCanvas*, SkReader32* reader, uint32_t op32, | 691 static void paintOp_rp(SkCanvas*, SkReader32* reader, uint32_t op32, |
| 680 SkGPipeState* state) { | 692 SkGPipeState* state) { |
| 681 size_t offset = reader->offset(); | 693 size_t offset = reader->offset(); |
| 682 size_t stop = offset + PaintOp_unpackData(op32); | 694 size_t stop = offset + PaintOp_unpackData(op32); |
| 683 SkPaint* p = state->editPaint(); | 695 SkPaint* p = state->editPaint(); |
| 684 | 696 |
| 685 do { | 697 do { |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 932 status = kReadAtom_Status; | 944 status = kReadAtom_Status; |
| 933 break; | 945 break; |
| 934 } | 946 } |
| 935 } | 947 } |
| 936 | 948 |
| 937 if (bytesRead) { | 949 if (bytesRead) { |
| 938 *bytesRead = reader.offset(); | 950 *bytesRead = reader.offset(); |
| 939 } | 951 } |
| 940 return status; | 952 return status; |
| 941 } | 953 } |
| OLD | NEW |