| 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 #include "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
| 7 #include "ui/gfx/canvas.h" |
| 7 #include "ui/gfx/canvas_paint.h" | 8 #include "ui/gfx/canvas_paint.h" |
| 8 #include "ui/gfx/canvas_skia_paint.h" | 9 #include "ui/gfx/canvas_skia_paint.h" |
| 9 #include "ui/gfx/rect.h" | 10 #include "ui/gfx/rect.h" |
| 10 | 11 |
| 11 namespace { | 12 namespace { |
| 12 | 13 |
| 13 #if !defined(USE_AURA) | 14 #if !defined(USE_AURA) |
| 14 class CanvasPaintWin : public gfx::CanvasPaint, public gfx::CanvasSkiaPaint { | 15 class CanvasPaintWin : public gfx::CanvasPaint, public gfx::CanvasSkiaPaint { |
| 15 public: | 16 public: |
| 16 CanvasPaintWin(gfx::NativeView view); | 17 CanvasPaintWin(gfx::NativeView view); |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 | 50 |
| 50 CanvasPaint* CanvasPaint::CreateCanvasPaint(gfx::NativeView view) { | 51 CanvasPaint* CanvasPaint::CreateCanvasPaint(gfx::NativeView view) { |
| 51 #if !defined(USE_AURA) | 52 #if !defined(USE_AURA) |
| 52 return new CanvasPaintWin(view); | 53 return new CanvasPaintWin(view); |
| 53 #else | 54 #else |
| 54 return NULL; | 55 return NULL; |
| 55 #endif | 56 #endif |
| 56 } | 57 } |
| 57 | 58 |
| 58 } // namespace gfx | 59 } // namespace gfx |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 9562038:
ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src