summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/base.xcodeproj/project.pbxproj16
-rw-r--r--base/build/base_gfx.vcproj12
-rw-r--r--base/gfx/bitmap_platform_device.h7
-rw-r--r--base/gfx/bitmap_platform_device_linux.h12
-rwxr-xr-xbase/gfx/bitmap_platform_device_mac.h13
-rw-r--r--base/gfx/bitmap_platform_device_win.h13
-rw-r--r--base/gfx/native_theme.cc2
-rw-r--r--base/gfx/platform_canvas_win.h13
-rw-r--r--base/gfx/platform_device.h7
-rw-r--r--base/gfx/platform_device_win.h13
-rw-r--r--base/gfx/vector_canvas.h46
-rw-r--r--base/gfx/vector_device.h7
12 files changed, 1 insertions, 160 deletions
diff --git a/base/base.xcodeproj/project.pbxproj b/base/base.xcodeproj/project.pbxproj
index 1fa9482..5709f3c 100644
--- a/base/base.xcodeproj/project.pbxproj
+++ b/base/base.xcodeproj/project.pbxproj
@@ -576,11 +576,6 @@
825403D40D92D31D0006B936 /* rect.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rect.cc; sourceTree = "<group>"; };
825403D50D92D31D0006B936 /* rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rect.h; sourceTree = "<group>"; };
825403D70D92D31D0006B936 /* size.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = size.h; sourceTree = "<group>"; };
- 825403DD0D92D31D0006B936 /* vector_canvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vector_canvas.h; sourceTree = "<group>"; };
- 825403DF0D92D31D0006B936 /* vector_device.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vector_device.h; sourceTree = "<group>"; };
- 829E2F950DBFD74B00819EBF /* bitmap_platform_device_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bitmap_platform_device_mac.h; sourceTree = "<group>"; };
- 829E2F980DBFD76300819EBF /* platform_canvas_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_canvas_mac.h; sourceTree = "<group>"; };
- 829E2F9C0DBFD76F00819EBF /* platform_device_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_device_mac.h; sourceTree = "<group>"; };
829E30D60DBFD8ED00819EBF /* skia.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia.xcodeproj; path = skia/skia.xcodeproj; sourceTree = "<group>"; };
829E36720DC0FBAD00819EBF /* thread_local_storage_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread_local_storage_posix.cc; sourceTree = "<group>"; };
82D094530E5B892600FEC05C /* time_format.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = time_format.h; sourceTree = "<group>"; };
@@ -610,9 +605,6 @@
A5CB82960E5C74E300FD6825 /* platform_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_test.h; sourceTree = "<group>"; };
A5CB82970E5C74E300FD6825 /* platform_test_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_test_mac.mm; sourceTree = "<group>"; };
AB14B6060EBFA74C00FB3807 /* time_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = time_posix.cc; sourceTree = "<group>"; };
- AB6BC1ED0E54E836006436D5 /* bitmap_platform_device.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bitmap_platform_device.h; sourceTree = "<group>"; };
- AB6BC1F10E54E900006436D5 /* platform_canvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_canvas.h; sourceTree = "<group>"; };
- AB6BC1F50E54E97B006436D5 /* platform_device.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_device.h; sourceTree = "<group>"; };
ABE1BA290E7574D1009041DA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<group>"; };
ABE1BA600E75757C009041DA /* skia_utils_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skia_utils_mac.cc; sourceTree = "<group>"; };
ABF4B98E0DC2BA6900A6E319 /* base_paths_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = base_paths_mac.mm; sourceTree = "<group>"; };
@@ -1081,8 +1073,6 @@
825403B40D92D2EC0006B936 /* gfx */ = {
isa = PBXGroup;
children = (
- AB6BC1ED0E54E836006436D5 /* bitmap_platform_device.h */,
- 829E2F950DBFD74B00819EBF /* bitmap_platform_device_mac.h */,
E48A06680E3F70B500172919 /* convolver.cc */,
E48A06690E3F70B500172919 /* convolver.h */,
E48A06790E3F714300172919 /* convolver_unittest.cc */,
@@ -1094,10 +1084,6 @@
825403C90D92D31D0006B936 /* native_theme.h */,
7B8505A20E5B3FBE00730B43 /* native_theme_unittest.cc */,
7B1435DF0E78419700901940 /* native_widget_types.h */,
- AB6BC1F10E54E900006436D5 /* platform_canvas.h */,
- 829E2F980DBFD76300819EBF /* platform_canvas_mac.h */,
- AB6BC1F50E54E97B006436D5 /* platform_device.h */,
- 829E2F9C0DBFD76F00819EBF /* platform_device_mac.h */,
E4562A200E27C8C1005E4685 /* png_codec_unittest.cc */,
825403CD0D92D31D0006B936 /* png_decoder.cc */,
825403CE0D92D31D0006B936 /* png_decoder.h */,
@@ -1114,8 +1100,6 @@
7B8505A60E5B3FBE00730B43 /* skia_utils.h */,
ABE1BA600E75757C009041DA /* skia_utils_mac.cc */,
7B1435DE0E78416400901940 /* skia_utils_mac.h */,
- 825403DD0D92D31D0006B936 /* vector_canvas.h */,
- 825403DF0D92D31D0006B936 /* vector_device.h */,
);
path = gfx;
sourceTree = "<group>";
diff --git a/base/build/base_gfx.vcproj b/base/build/base_gfx.vcproj
index 8b2bc64..ef4b5de 100644
--- a/base/build/base_gfx.vcproj
+++ b/base/build/base_gfx.vcproj
@@ -122,10 +122,6 @@
</References>
<Files>
<File
- RelativePath="..\gfx\bitmap_platform_device_win.h"
- >
- </File>
- <File
RelativePath="..\gfx\convolver.cc"
>
</File>
@@ -158,14 +154,6 @@
>
</File>
<File
- RelativePath="..\gfx\platform_canvas_win.h"
- >
- </File>
- <File
- RelativePath="..\gfx\platform_device_win.h"
- >
- </File>
- <File
RelativePath="..\gfx\png_decoder.cc"
>
</File>
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"
generated by cgit v1.1 at 2025-02-01 13:32:52 +0000