| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 Google Inc. |
| 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 SkImage_Base_DEFINED | 8 #ifndef SkImage_Base_DEFINED |
| 9 #define SkImage_Base_DEFINED | 9 #define SkImage_Base_DEFINED |
| 10 | 10 |
| 11 #include "SkAtomics.h" | 11 #include "../private/SkAtomics.h" |
| 12 #include "SkImage.h" | 12 #include "SkImage.h" |
| 13 #include "SkSurface.h" | 13 #include "SkSurface.h" |
| 14 | 14 |
| 15 #include <new> | 15 #include <new> |
| 16 | 16 |
| 17 enum { | 17 enum { |
| 18 kNeedNewImageUniqueID = 0 | 18 kNeedNewImageUniqueID = 0 |
| 19 }; | 19 }; |
| 20 | 20 |
| 21 class SkImage_Base : public SkImage { | 21 class SkImage_Base : public SkImage { |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 | 79 |
| 80 static inline SkImage_Base* as_IB(SkImage* image) { | 80 static inline SkImage_Base* as_IB(SkImage* image) { |
| 81 return static_cast<SkImage_Base*>(image); | 81 return static_cast<SkImage_Base*>(image); |
| 82 } | 82 } |
| 83 | 83 |
| 84 static inline const SkImage_Base* as_IB(const SkImage* image) { | 84 static inline const SkImage_Base* as_IB(const SkImage* image) { |
| 85 return static_cast<const SkImage_Base*>(image); | 85 return static_cast<const SkImage_Base*>(image); |
| 86 } | 86 } |
| 87 | 87 |
| 88 #endif | 88 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1369333004:
Move SkAtomics.h to private. (Closed)
Base URL: https://skia.googlesource.com/skia.git@master