| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkCanvas_DEFINED | 8 #ifndef SkCanvas_DEFINED |
| 9 #define SkCanvas_DEFINED | 9 #define SkCanvas_DEFINED |
| 10 | 10 |
| (...skipping 1496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1507 | 1507 |
| 1508 private: | 1508 private: |
| 1509 SkBitmap fBitmap; // used if peekPixels() fails | 1509 SkBitmap fBitmap; // used if peekPixels() fails |
| 1510 const void* fAddr; // NULL on failure | 1510 const void* fAddr; // NULL on failure |
| 1511 SkImageInfo fInfo; | 1511 SkImageInfo fInfo; |
| 1512 size_t fRowBytes; | 1512 size_t fRowBytes; |
| 1513 }; | 1513 }; |
| 1514 | 1514 |
| 1515 static inline SkCanvas::SaveFlags operator|(const SkCanvas::SaveFlags lhs, | 1515 static inline SkCanvas::SaveFlags operator|(const SkCanvas::SaveFlags lhs, |
| 1516 const SkCanvas::SaveFlags rhs) { | 1516 const SkCanvas::SaveFlags rhs) { |
| 1517 return static_cast<SkCanvas::SaveFlags>(lhs | rhs); | 1517 return static_cast<SkCanvas::SaveFlags>(static_cast<int>(lhs) | static_cast<
int>(rhs)); |
| 1518 } | 1518 } |
| 1519 | 1519 |
| 1520 static inline SkCanvas::SaveFlags& operator|=(SkCanvas::SaveFlags& lhs, | 1520 static inline SkCanvas::SaveFlags& operator|=(SkCanvas::SaveFlags& lhs, |
| 1521 const SkCanvas::SaveFlags rhs) { | 1521 const SkCanvas::SaveFlags rhs) { |
| 1522 lhs = lhs | rhs; | 1522 lhs = lhs | rhs; |
| 1523 return lhs; | 1523 return lhs; |
| 1524 } | 1524 } |
| 1525 | 1525 |
| 1526 | 1526 |
| 1527 #endif | 1527 #endif |
| OLD | NEW |