ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

The final goal is to merge these two classes into a single gfx::Canvas class.

BUG=116572
R=ben@chromium.org,asvitkine@chromium.org
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9562038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125735 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 9 deletions

diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
index 619f93f..0020707 100644
--- a/ui/gfx/canvas.cc
+++ b/ui/gfx/canvas.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,20 +6,20 @@
 
 namespace gfx {
 
-CanvasSkia* Canvas::AsCanvasSkia() {
-  return NULL;
+Canvas::Canvas()
+    : CanvasSkia() {
 }
 
-const CanvasSkia* Canvas::AsCanvasSkia() const {
-  return NULL;
+Canvas::Canvas(SkCanvas* canvas)
+    : CanvasSkia(canvas) {
 }
 
-SkCanvas* Canvas::GetSkCanvas() {
-  return NULL;
+Canvas::Canvas(const gfx::Size& size, bool is_opaque)
+    : CanvasSkia(size, is_opaque) {
 }
 
-const SkCanvas* Canvas::GetSkCanvas() const {
-  return NULL;
+Canvas::Canvas(const SkBitmap& bitmap, bool is_opaque)
+    : CanvasSkia(bitmap, is_opaque) {
 }
 
 }  // namespace gfx