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" |
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 /////////////////////////////////////////////////////////////////////////////// | 328 /////////////////////////////////////////////////////////////////////////////// |
329 | 329 |
330 static void save_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, | 330 static void save_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, |
331 SkGPipeState* state) { | 331 SkGPipeState* state) { |
332 canvas->save(); | 332 canvas->save(); |
333 } | 333 } |
334 | 334 |
335 static void saveLayer_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, | 335 static void saveLayer_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, |
336 SkGPipeState* state) { | 336 SkGPipeState* state) { |
337 unsigned flags = DrawOp_unpackFlags(op32); | 337 unsigned flags = DrawOp_unpackFlags(op32); |
338 SkCanvas::SaveFlags saveFlags = (SkCanvas::SaveFlags)DrawOp_unpackData(op32)
; | 338 SkCanvas::SaveLayerFlags saveLayerFlags = DrawOp_unpackData(op32); |
339 | 339 |
340 const SkRect* bounds = nullptr; | 340 const SkRect* bounds = nullptr; |
341 if (flags & kSaveLayer_HasBounds_DrawOpFlag) { | 341 if (flags & kSaveLayer_HasBounds_DrawOpFlag) { |
342 bounds = skip<SkRect>(reader); | 342 bounds = skip<SkRect>(reader); |
343 } | 343 } |
344 const SkPaint* paint = nullptr; | 344 const SkPaint* paint = nullptr; |
345 if (flags & kSaveLayer_HasPaint_DrawOpFlag) { | 345 if (flags & kSaveLayer_HasPaint_DrawOpFlag) { |
346 paint = &state->paint(); | 346 paint = &state->paint(); |
347 } | 347 } |
348 canvas->saveLayer(bounds, paint, saveFlags); | 348 canvas->saveLayer(SkCanvas::SaveLayerRec(bounds, paint, saveLayerFlags)); |
349 } | 349 } |
350 | 350 |
351 static void restore_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, | 351 static void restore_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, |
352 SkGPipeState* state) { | 352 SkGPipeState* state) { |
353 canvas->restore(); | 353 canvas->restore(); |
354 } | 354 } |
355 | 355 |
356 /////////////////////////////////////////////////////////////////////////////// | 356 /////////////////////////////////////////////////////////////////////////////// |
357 | 357 |
358 static void drawPaint_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, | 358 static void drawPaint_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, |
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
996 status = kReadAtom_Status; | 996 status = kReadAtom_Status; |
997 break; | 997 break; |
998 } | 998 } |
999 } | 999 } |
1000 | 1000 |
1001 if (bytesRead) { | 1001 if (bytesRead) { |
1002 *bytesRead = reader.offset(); | 1002 *bytesRead = reader.offset(); |
1003 } | 1003 } |
1004 return status; | 1004 return status; |
1005 } | 1005 } |
OLD | NEW |