| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 164 #endif | 164 #endif | 
| 165   virtual void DrawFocusRect(const gfx::Rect& rect) OVERRIDE; | 165   virtual void DrawFocusRect(const gfx::Rect& rect) OVERRIDE; | 
| 166   virtual void TileImageInt(const SkBitmap& bitmap, | 166   virtual void TileImageInt(const SkBitmap& bitmap, | 
| 167                             int x, int y, int w, int h) OVERRIDE; | 167                             int x, int y, int w, int h) OVERRIDE; | 
| 168   virtual void TileImageInt(const SkBitmap& bitmap, | 168   virtual void TileImageInt(const SkBitmap& bitmap, | 
| 169                             int src_x, int src_y, | 169                             int src_x, int src_y, | 
| 170                             int dest_x, int dest_y, int w, int h) OVERRIDE; | 170                             int dest_x, int dest_y, int w, int h) OVERRIDE; | 
| 171   virtual gfx::NativeDrawingContext BeginPlatformPaint() OVERRIDE; | 171   virtual gfx::NativeDrawingContext BeginPlatformPaint() OVERRIDE; | 
| 172   virtual void EndPlatformPaint() OVERRIDE; | 172   virtual void EndPlatformPaint() OVERRIDE; | 
| 173   virtual void Transform(const ui::Transform& transform) OVERRIDE; | 173   virtual void Transform(const ui::Transform& transform) OVERRIDE; | 
| 174   virtual ui::TextureID GetTextureID() OVERRIDE; |  | 
| 175   virtual CanvasSkia* AsCanvasSkia() OVERRIDE; | 174   virtual CanvasSkia* AsCanvasSkia() OVERRIDE; | 
| 176   virtual const CanvasSkia* AsCanvasSkia() const OVERRIDE; | 175   virtual const CanvasSkia* AsCanvasSkia() const OVERRIDE; | 
| 177   virtual SkCanvas* GetSkCanvas() OVERRIDE; | 176   virtual SkCanvas* GetSkCanvas() OVERRIDE; | 
| 178   virtual const SkCanvas* GetSkCanvas() const OVERRIDE; | 177   virtual const SkCanvas* GetSkCanvas() const OVERRIDE; | 
| 179 | 178 | 
| 180   SkCanvas* sk_canvas() const { return canvas_; } | 179   SkCanvas* sk_canvas() const { return canvas_; } | 
| 181   skia::PlatformCanvas* platform_canvas() const { return owned_canvas_.get(); } | 180   skia::PlatformCanvas* platform_canvas() const { return owned_canvas_.get(); } | 
| 182 | 181 | 
| 183  private: | 182  private: | 
| 184   // Test whether the provided rectangle intersects the current clip rect. | 183   // Test whether the provided rectangle intersects the current clip rect. | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 197 | 196 | 
| 198   scoped_ptr<skia::PlatformCanvas> owned_canvas_; | 197   scoped_ptr<skia::PlatformCanvas> owned_canvas_; | 
| 199   SkCanvas* canvas_; | 198   SkCanvas* canvas_; | 
| 200 | 199 | 
| 201   DISALLOW_COPY_AND_ASSIGN(CanvasSkia); | 200   DISALLOW_COPY_AND_ASSIGN(CanvasSkia); | 
| 202 }; | 201 }; | 
| 203 | 202 | 
| 204 }  // namespace gfx | 203 }  // namespace gfx | 
| 205 | 204 | 
| 206 #endif  // UI_GFX_CANVAS_SKIA_H_ | 205 #endif  // UI_GFX_CANVAS_SKIA_H_ | 
| OLD | NEW | 
|---|