Remove base versions of the graphics headers, which previously just forwarded to the skia ones.

Review URL: http://codereview.chromium.org/11588

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

10 files changed, 1 insertions, 132 deletions

diff --git a/base/gfx/bitmap_platform_device.h b/base/gfx/bitmap_platform_device.h
deleted file mode 100644
index 19a35ba..0000000
--- a/base/gfx/bitmap_platform_device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/bitmap_platform_device.h"
diff --git a/base/gfx/bitmap_platform_device_linux.h b/base/gfx/bitmap_platform_device_linux.h
deleted file mode 100644
index 25b2894..0000000
--- a/base/gfx/bitmap_platform_device_linux.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#ifndef BASE_GFX_BITMAP_PLATFORM_DEVICE_LINUX_H_
-#define BASE_GFX_BITMAP_PLATFORM_DEVICE_LINUX_H_
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/bitmap_platform_device_linux.h"
-
-#endif  // BASE_GFX_BITMAP_PLATFORM_DEVICE_LINUX_H_
diff --git a/base/gfx/bitmap_platform_device_mac.h b/base/gfx/bitmap_platform_device_mac.h
deleted file mode 100755
index 70c2e0e..0000000
--- a/base/gfx/bitmap_platform_device_mac.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#ifndef BASE_GFX_BITMAP_PLATFORM_DEVICE_MAC_H__
-#define BASE_GFX_BITMAP_PLATFORM_DEVICE_MAC_H__
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/bitmap_platform_device_mac.h"
-
-#endif  // BASE_GFX_BITMAP_PLATFORM_DEVICE_MAC_H__
-
diff --git a/base/gfx/bitmap_platform_device_win.h b/base/gfx/bitmap_platform_device_win.h
deleted file mode 100644
index 5adfa34..0000000
--- a/base/gfx/bitmap_platform_device_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#ifndef BASE_GFX_BITMAP_PLATFORM_DEVICE_WIN_H_
-#define BASE_GFX_BITMAP_PLATFORM_DEVICE_WIN_H_
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/bitmap_platform_device_win.h"
-
-#endif  // BASE_GFX_BITMAP_PLATFORM_DEVICE_WIN_H_
-
diff --git a/base/gfx/native_theme.cc b/base/gfx/native_theme.cc
index 7fdc459e..71289d8 100644
--- a/base/gfx/native_theme.cc
+++ b/base/gfx/native_theme.cc
@@ -10,11 +10,11 @@
 #include <vssym32.h>
 
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/platform_canvas_win.h"
 #include "base/gfx/skia_utils.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
+#include "skia/ext/platform_canvas.h"
 #include "skia/include/SkShader.h"
 
 namespace gfx {
diff --git a/base/gfx/platform_canvas_win.h b/base/gfx/platform_canvas_win.h
deleted file mode 100644
index 3af1c0d..0000000
--- a/base/gfx/platform_canvas_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#ifndef BASE_GFX_PLATFORM_CANVAS_WIN_H_
-#define BASE_GFX_PLATFORM_CANVAS_WIN_H_
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_canvas_win.h"
-
-#endif  // BASE_GFX_PLATFORM_CANVAS_WIN_H_
-
diff --git a/base/gfx/platform_device.h b/base/gfx/platform_device.h
deleted file mode 100644
index 2c2acd2..0000000
--- a/base/gfx/platform_device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_device.h"
diff --git a/base/gfx/platform_device_win.h b/base/gfx/platform_device_win.h
deleted file mode 100644
index 3851e60..0000000
--- a/base/gfx/platform_device_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#ifndef BASE_GFX_PLATFORM_DEVICE_WIN_H__
-#define BASE_GFX_PLATFORM_DEVICE_WIN_H__
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_device_win.h"
-
-#endif  // BASE_GFX_PLATFORM_DEVICE_WIN_H__
-
diff --git a/base/gfx/vector_canvas.h b/base/gfx/vector_canvas.h
deleted file mode 100644
index 8538366..0000000
--- a/base/gfx/vector_canvas.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#ifndef BASE_GFX_VECTOR_CANVAS_H_
-#define BASE_GFX_VECTOR_CANVAS_H_
-
-#include "base/gfx/platform_canvas_win.h"
-#include "base/gfx/vector_device.h"
-
-namespace gfx {
-
-// This class is a specialization of the regular PlatformCanvas. It is designed
-// to work with a VectorDevice to manage platform-specific drawing. It allows
-// using both Skia operations and platform-specific operations. It *doesn't*
-// support reading back from the bitmap backstore since it is not used.
-class VectorCanvas : public PlatformCanvasWin {
- public:
-  VectorCanvas();
-  VectorCanvas(HDC dc, int width, int height);
-  virtual ~VectorCanvas();
-
-  // For two-part init, call if you use the no-argument constructor above
-  bool initialize(HDC context, int width, int height);
-
-  virtual SkBounder* setBounder(SkBounder*);
-  virtual SkDevice* createDevice(SkBitmap::Config config,
-                                 int width, int height,
-                                 bool is_opaque, bool isForLayer);
-  virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter);
-
- private:
-  // |is_opaque| is unused. |shared_section| is in fact the HDC used for output.
-  virtual SkDevice* createPlatformDevice(int width, int height, bool is_opaque,
-                                         HANDLE shared_section);
-
-  // Returns true if the top device is vector based and not bitmap based.
-  bool IsTopDeviceVectorial() const;
-
-  DISALLOW_COPY_AND_ASSIGN(VectorCanvas);
-};
-
-}  // namespace gfx
-
-#endif  // BASE_GFX_VECTOR_CANVAS_H_
-
diff --git a/base/gfx/vector_device.h b/base/gfx/vector_device.h
deleted file mode 100644
index 8ba1724..0000000
--- a/base/gfx/vector_device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/vector_device.h"