| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_GFX_CANVAS_SKIA_H_ | 5 #ifndef UI_GFX_CANVAS_SKIA_H_ |
| 6 #define UI_GFX_CANVAS_SKIA_H_ | 6 #define UI_GFX_CANVAS_SKIA_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/string16.h" | 10 #include "base/string16.h" |
| 11 #include "gfx/canvas.h" | |
| 12 #include "skia/ext/platform_canvas.h" | 11 #include "skia/ext/platform_canvas.h" |
| 12 #include "ui/gfx/canvas.h" |
| 13 | 13 |
| 14 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 14 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 15 typedef struct _GdkPixbuf GdkPixbuf; | 15 typedef struct _GdkPixbuf GdkPixbuf; |
| 16 #endif | 16 #endif |
| 17 | 17 |
| 18 namespace gfx { | 18 namespace gfx { |
| 19 | 19 |
| 20 class Canvas; | 20 class Canvas; |
| 21 | 21 |
| 22 // CanvasSkia is a SkCanvas subclass that provides a number of methods for | 22 // CanvasSkia is a SkCanvas subclass that provides a number of methods for |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 int x, int y, int w, int h, | 156 int x, int y, int w, int h, |
| 157 int flags); | 157 int flags); |
| 158 #endif | 158 #endif |
| 159 | 159 |
| 160 DISALLOW_COPY_AND_ASSIGN(CanvasSkia); | 160 DISALLOW_COPY_AND_ASSIGN(CanvasSkia); |
| 161 }; | 161 }; |
| 162 | 162 |
| 163 } // namespace gfx; | 163 } // namespace gfx; |
| 164 | 164 |
| 165 #endif // UI_GFX_CANVAS_SKIA_H_ | 165 #endif // UI_GFX_CANVAS_SKIA_H_ |
| OLD | NEW |