| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 | 96 |
| 97 // Overridden from Canvas: | 97 // Overridden from Canvas: |
| 98 virtual void Save() OVERRIDE; | 98 virtual void Save() OVERRIDE; |
| 99 virtual void SaveLayerAlpha(uint8 alpha) OVERRIDE; | 99 virtual void SaveLayerAlpha(uint8 alpha) OVERRIDE; |
| 100 virtual void SaveLayerAlpha(uint8 alpha, | 100 virtual void SaveLayerAlpha(uint8 alpha, |
| 101 const gfx::Rect& layer_bounds) OVERRIDE; | 101 const gfx::Rect& layer_bounds) OVERRIDE; |
| 102 virtual void Restore() OVERRIDE; | 102 virtual void Restore() OVERRIDE; |
| 103 virtual bool ClipRect(const gfx::Rect& rect) OVERRIDE; | 103 virtual bool ClipRect(const gfx::Rect& rect) OVERRIDE; |
| 104 virtual void Translate(const gfx::Point& point) OVERRIDE; | 104 virtual void Translate(const gfx::Point& point) OVERRIDE; |
| 105 virtual void Scale(int x_scale, int y_scale) OVERRIDE; | 105 virtual void Scale(int x_scale, int y_scale) OVERRIDE; |
| 106 virtual void FillRectInt(const SkColor& color, | 106 virtual void FillRect(const SkColor& color, const gfx::Rect& rect) OVERRIDE; |
| 107 int x, int y, int w, int h) OVERRIDE; | 107 virtual void FillRect(const SkColor& color, |
| 108 virtual void FillRectInt(const SkColor& color, | 108 const gfx::Rect& rect, |
| 109 int x, int y, int w, int h, | 109 SkXfermode::Mode mode) OVERRIDE; |
| 110 SkXfermode::Mode mode) OVERRIDE; | 110 virtual void FillRect(const gfx::Brush* brush, |
| 111 virtual void FillRectInt(const gfx::Brush* brush, | 111 const gfx::Rect& rect) OVERRIDE; |
| 112 int x, int y, int w, int h) OVERRIDE; | |
| 113 virtual void DrawRectInt(const SkColor& color, | 112 virtual void DrawRectInt(const SkColor& color, |
| 114 int x, int y, int w, int h) OVERRIDE; | 113 int x, int y, int w, int h) OVERRIDE; |
| 115 virtual void DrawRectInt(const SkColor& color, | 114 virtual void DrawRectInt(const SkColor& color, |
| 116 int x, int y, int w, int h, | 115 int x, int y, int w, int h, |
| 117 SkXfermode::Mode mode) OVERRIDE; | 116 SkXfermode::Mode mode) OVERRIDE; |
| 118 virtual void DrawRectInt(int x, int y, int w, int h, | 117 virtual void DrawRectInt(int x, int y, int w, int h, |
| 119 const SkPaint& paint) OVERRIDE; | 118 const SkPaint& paint) OVERRIDE; |
| 120 virtual void DrawLineInt(const SkColor& color, | 119 virtual void DrawLineInt(const SkColor& color, |
| 121 int x1, int y1, | 120 int x1, int y1, |
| 122 int x2, int y2) OVERRIDE; | 121 int x2, int y2) OVERRIDE; |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 | 195 |
| 197 scoped_ptr<skia::PlatformCanvas> owned_canvas_; | 196 scoped_ptr<skia::PlatformCanvas> owned_canvas_; |
| 198 SkCanvas* canvas_; | 197 SkCanvas* canvas_; |
| 199 | 198 |
| 200 DISALLOW_COPY_AND_ASSIGN(CanvasSkia); | 199 DISALLOW_COPY_AND_ASSIGN(CanvasSkia); |
| 201 }; | 200 }; |
| 202 | 201 |
| 203 } // namespace gfx | 202 } // namespace gfx |
| 204 | 203 |
| 205 #endif // UI_GFX_CANVAS_SKIA_H_ | 204 #endif // UI_GFX_CANVAS_SKIA_H_ |
| OLD | NEW |