summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/base.gyp5
-rw-r--r--base/gfx/platform_canvas.h7
-rw-r--r--base/gfx/platform_canvas_linux.h12
-rw-r--r--base/gfx/platform_canvas_mac.h12
-rw-r--r--base/gfx/platform_device_linux.h12
-rw-r--r--base/gfx/platform_device_mac.h12
-rw-r--r--webkit/glue/media/video_renderer_impl.h2
-rw-r--r--webkit/glue/webmediaplayer_impl.h2
-rw-r--r--webkit/tools/test_shell/mac/webview_host.mm2
-rw-r--r--webkit/tools/test_shell/mac/webwidget_host.mm2
10 files changed, 4 insertions, 64 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 25d9e32..e281a43 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -550,11 +550,6 @@
'gfx/native_theme.h',
'gfx/native_widget_types.h',
'gfx/native_widget_types_gtk.cc',
- 'gfx/platform_canvas.h',
- 'gfx/platform_canvas_linux.h',
- 'gfx/platform_canvas_mac.h',
- 'gfx/platform_device_linux.h',
- 'gfx/platform_device_mac.h',
'gfx/png_decoder.cc',
'gfx/png_decoder.h',
'gfx/png_encoder.cc',
diff --git a/base/gfx/platform_canvas.h b/base/gfx/platform_canvas.h
index 427a7f8..e69de29 100644
--- a/base/gfx/platform_canvas.h
+++ b/base/gfx/platform_canvas.h
@@ -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_canvas.h"
diff --git a/base/gfx/platform_canvas_linux.h b/base/gfx/platform_canvas_linux.h
index 4a493a4..e69de29 100644
--- a/base/gfx/platform_canvas_linux.h
+++ b/base/gfx/platform_canvas_linux.h
@@ -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_PLATFORM_CANVAS_LINUX_H_
-#define BASE_GFX_PLATFORM_CANVAS_LINUX_H_
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_canvas_linux.h"
-
-#endif // BASE_GFX_PLATFORM_CANVAS_LINUX_H_
diff --git a/base/gfx/platform_canvas_mac.h b/base/gfx/platform_canvas_mac.h
index ba01e73..e69de29 100644
--- a/base/gfx/platform_canvas_mac.h
+++ b/base/gfx/platform_canvas_mac.h
@@ -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_PLATFORM_CANVAS_MAC_H__
-#define BASE_GFX_PLATFORM_CANVAS_MAC_H__
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_canvas_mac.h"
-
-#endif // BASE_GFX_PLATFORM_CANVAS_MAC_H__
diff --git a/base/gfx/platform_device_linux.h b/base/gfx/platform_device_linux.h
index 3cb9572..e69de29 100644
--- a/base/gfx/platform_device_linux.h
+++ b/base/gfx/platform_device_linux.h
@@ -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_PLATFORM_DEVICE_LINUX_H_
-#define BASE_GFX_PLATFORM_DEVICE_LINUX_H_
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_device_linux.h"
-
-#endif // BASE_GFX_PLATFORM_DEVICE_LINUX_H_
diff --git a/base/gfx/platform_device_mac.h b/base/gfx/platform_device_mac.h
index 9447f65..e69de29 100644
--- a/base/gfx/platform_device_mac.h
+++ b/base/gfx/platform_device_mac.h
@@ -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_PLATFORM_DEVICE_MAC_H__
-#define BASE_GFX_PLATFORM_DEVICE_MAC_H__
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_device_mac.h"
-
-#endif // BASE_GFX_PLATFORM_DEVICE_MAC_H__
diff --git a/webkit/glue/media/video_renderer_impl.h b/webkit/glue/media/video_renderer_impl.h
index d57223e..6e7daf2 100644
--- a/webkit/glue/media/video_renderer_impl.h
+++ b/webkit/glue/media/video_renderer_impl.h
@@ -14,13 +14,13 @@
#ifndef WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_
#define WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_
-#include "base/gfx/platform_canvas.h"
#include "base/gfx/rect.h"
#include "base/gfx/size.h"
#include "media/base/buffers.h"
#include "media/base/factory.h"
#include "media/base/filters.h"
#include "media/filters/video_renderer_base.h"
+#include "skia/ext/platform_canvas.h"
#include "webkit/api/public/WebMediaPlayer.h"
#include "webkit/glue/webmediaplayer_impl.h"
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
index 3972653..a73ea71 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/glue/webmediaplayer_impl.h
@@ -55,7 +55,6 @@
#include <vector>
-#include "base/gfx/platform_canvas.h"
#include "base/gfx/rect.h"
#include "base/gfx/size.h"
#include "base/lock.h"
@@ -63,6 +62,7 @@
#include "base/ref_counted.h"
#include "media/base/filters.h"
#include "media/base/pipeline_impl.h"
+#include "skia/ext/platform_canvas.h"
#include "webkit/api/public/WebMediaPlayer.h"
#include "webkit/api/public/WebMediaPlayerClient.h"
diff --git a/webkit/tools/test_shell/mac/webview_host.mm b/webkit/tools/test_shell/mac/webview_host.mm
index 3349546..960a55b 100644
--- a/webkit/tools/test_shell/mac/webview_host.mm
+++ b/webkit/tools/test_shell/mac/webview_host.mm
@@ -7,9 +7,9 @@
#include "webkit/tools/test_shell/webview_host.h"
#include "webkit/tools/test_shell/mac/test_shell_webview.h"
-#include "base/gfx/platform_canvas.h"
#include "base/gfx/rect.h"
#include "base/gfx/size.h"
+#include "skia/ext/platform_canvas.h"
#include "webkit/api/public/WebSize.h"
#include "webkit/glue/webview.h"
diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm
index acb98b6..c6257f7 100644
--- a/webkit/tools/test_shell/mac/webwidget_host.mm
+++ b/webkit/tools/test_shell/mac/webwidget_host.mm
@@ -6,10 +6,10 @@
#include "webkit/tools/test_shell/webwidget_host.h"
-#include "base/gfx/platform_canvas.h"
#include "base/gfx/rect.h"
#include "base/gfx/size.h"
#include "base/logging.h"
+#include "skia/ext/platform_canvas.h"
#include "webkit/api/public/mac/WebInputEventFactory.h"
#include "webkit/api/public/mac/WebScreenInfoFactory.h"
#include "webkit/api/public/WebInputEvent.h"
generated by cgit v1.1 at 2025-01-22 16:54:22 +0000