| 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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 static void translate_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, | 312 static void translate_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, |
| 313 SkGPipeState* state) { | 313 SkGPipeState* state) { |
| 314 const SkScalar* param = skip<SkScalar>(reader, 2); | 314 const SkScalar* param = skip<SkScalar>(reader, 2); |
| 315 canvas->translate(param[0], param[1]); | 315 canvas->translate(param[0], param[1]); |
| 316 } | 316 } |
| 317 | 317 |
| 318 /////////////////////////////////////////////////////////////////////////////// | 318 /////////////////////////////////////////////////////////////////////////////// |
| 319 | 319 |
| 320 static void save_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, | 320 static void save_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, |
| 321 SkGPipeState* state) { | 321 SkGPipeState* state) { |
| 322 canvas->save((SkCanvas::SaveFlags)DrawOp_unpackData(op32)); | 322 canvas->save( |
| 323 #ifdef SK_SUPPORT_LEGACY_SAVEFLAGS |
| 324 (SkCanvas::SaveFlags)DrawOp_unpackData(op32) |
| 325 #endif |
| 326 ); |
| 323 } | 327 } |
| 324 | 328 |
| 325 static void saveLayer_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, | 329 static void saveLayer_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, |
| 326 SkGPipeState* state) { | 330 SkGPipeState* state) { |
| 327 unsigned flags = DrawOp_unpackFlags(op32); | 331 unsigned flags = DrawOp_unpackFlags(op32); |
| 328 SkCanvas::SaveFlags saveFlags = (SkCanvas::SaveFlags)DrawOp_unpackData(op32)
; | |
| 329 | 332 |
| 330 const SkRect* bounds = NULL; | 333 const SkRect* bounds = NULL; |
| 331 if (flags & kSaveLayer_HasBounds_DrawOpFlag) { | 334 if (flags & kSaveLayer_HasBounds_DrawOpFlag) { |
| 332 bounds = skip<SkRect>(reader); | 335 bounds = skip<SkRect>(reader); |
| 333 } | 336 } |
| 334 const SkPaint* paint = NULL; | 337 const SkPaint* paint = NULL; |
| 335 if (flags & kSaveLayer_HasPaint_DrawOpFlag) { | 338 if (flags & kSaveLayer_HasPaint_DrawOpFlag) { |
| 336 paint = &state->paint(); | 339 paint = &state->paint(); |
| 337 } | 340 } |
| 338 canvas->saveLayer(bounds, paint, saveFlags); | 341 canvas->saveLayer(bounds, paint |
| 342 #ifdef SK_SUPPORT_LEGACY_SAVEFLAGS |
| 343 , (SkCanvas::SaveFlags)DrawOp_unpackData(op32) |
| 344 #endif |
| 345 ); |
| 339 } | 346 } |
| 340 | 347 |
| 341 static void restore_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, | 348 static void restore_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, |
| 342 SkGPipeState* state) { | 349 SkGPipeState* state) { |
| 343 canvas->restore(); | 350 canvas->restore(); |
| 344 } | 351 } |
| 345 | 352 |
| 346 /////////////////////////////////////////////////////////////////////////////// | 353 /////////////////////////////////////////////////////////////////////////////// |
| 347 | 354 |
| 348 static void drawClear_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, | 355 static void drawClear_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 899 status = kReadAtom_Status; | 906 status = kReadAtom_Status; |
| 900 break; | 907 break; |
| 901 } | 908 } |
| 902 } | 909 } |
| 903 | 910 |
| 904 if (bytesRead) { | 911 if (bytesRead) { |
| 905 *bytesRead = reader.offset(); | 912 *bytesRead = reader.offset(); |
| 906 } | 913 } |
| 907 return status; | 914 return status; |
| 908 } | 915 } |
| OLD | NEW |