summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 00:30:43 +0000
committerasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 00:30:43 +0000
commit3020ca91c71f72c54de74cbd3fd7ef3f9023cc67 (patch)
tree9bce06239054160d9ba8c6684478892d815274cc /ui
parent3e46a536732369decefa12f59706f8e8105b727b (diff)
downloadchromium_src-3020ca91c71f72c54de74cbd3fd7ef3f9023cc67.zip
chromium_src-3020ca91c71f72c54de74cbd3fd7ef3f9023cc67.tar.gz
chromium_src-3020ca91c71f72c54de74cbd3fd7ef3f9023cc67.tar.bz2
Remove unused CanvasSkia::GetTextureID() functions.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/9242017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/gfx/canvas.h4
-rw-r--r--ui/gfx/canvas_skia.h1
-rw-r--r--ui/gfx/canvas_skia_android.cc7
-rw-r--r--ui/gfx/canvas_skia_linux.cc7
-rw-r--r--ui/gfx/canvas_skia_mac.mm4
-rw-r--r--ui/gfx/canvas_skia_win.cc5
6 files changed, 2 insertions, 26 deletions
diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h
index c3af1e3..c3aa3b0 100644
--- a/ui/gfx/canvas.h
+++ b/ui/gfx/canvas.h
@@ -19,7 +19,6 @@ class SkCanvas;
namespace ui {
class Transform;
-typedef unsigned int TextureID;
}
namespace gfx {
@@ -215,9 +214,6 @@ class UI_EXPORT Canvas {
// Apply transformation on the canvas.
virtual void Transform(const ui::Transform& transform) = 0;
- // Create a texture ID that can be used for accelerated drawing.
- virtual ui::TextureID GetTextureID() = 0;
-
// TODO(beng): remove this once we don't need to use any skia-specific methods
// through this interface.
// A quick and dirty way to obtain the underlying SkCanvas.
diff --git a/ui/gfx/canvas_skia.h b/ui/gfx/canvas_skia.h
index 0f0db78..3ccbb60 100644
--- a/ui/gfx/canvas_skia.h
+++ b/ui/gfx/canvas_skia.h
@@ -171,7 +171,6 @@ class UI_EXPORT CanvasSkia : public Canvas {
virtual gfx::NativeDrawingContext BeginPlatformPaint() OVERRIDE;
virtual void EndPlatformPaint() OVERRIDE;
virtual void Transform(const ui::Transform& transform) OVERRIDE;
- virtual ui::TextureID GetTextureID() OVERRIDE;
virtual CanvasSkia* AsCanvasSkia() OVERRIDE;
virtual const CanvasSkia* AsCanvasSkia() const OVERRIDE;
virtual SkCanvas* GetSkCanvas() OVERRIDE;
diff --git a/ui/gfx/canvas_skia_android.cc b/ui/gfx/canvas_skia_android.cc
index 4c3684a..d7cfbbc 100644
--- a/ui/gfx/canvas_skia_android.cc
+++ b/ui/gfx/canvas_skia_android.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.
@@ -24,9 +24,4 @@ void CanvasSkia::DrawStringInt(const string16& text,
NOTIMPLEMENTED();
}
-ui::TextureID CanvasSkia::GetTextureID() {
- NOTIMPLEMENTED();
- return 0;
-}
-
} // namespace gfx
diff --git a/ui/gfx/canvas_skia_linux.cc b/ui/gfx/canvas_skia_linux.cc
index fcba08d..b37b2f1 100644
--- a/ui/gfx/canvas_skia_linux.cc
+++ b/ui/gfx/canvas_skia_linux.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.
@@ -277,9 +277,4 @@ void CanvasSkia::DrawGdkPixbuf(GdkPixbuf* pixbuf, int x, int y) {
}
#endif // defined(TOOLKIT_USES_GTK)
-ui::TextureID CanvasSkia::GetTextureID() {
- // TODO(wjmaclean)
- return 0;
-}
-
} // namespace gfx
diff --git a/ui/gfx/canvas_skia_mac.mm b/ui/gfx/canvas_skia_mac.mm
index 8580eb7..317a3ac 100644
--- a/ui/gfx/canvas_skia_mac.mm
+++ b/ui/gfx/canvas_skia_mac.mm
@@ -76,8 +76,4 @@ void CanvasSkia::DrawStringWithHalo(const string16& text,
int flags) {
}
-ui::TextureID CanvasSkia::GetTextureID() {
- return 0;
-}
-
} // namespace gfx
diff --git a/ui/gfx/canvas_skia_win.cc b/ui/gfx/canvas_skia_win.cc
index d467b83..02a0cde 100644
--- a/ui/gfx/canvas_skia_win.cc
+++ b/ui/gfx/canvas_skia_win.cc
@@ -454,11 +454,6 @@ void CanvasSkia::DrawStringWithHalo(const string16& text,
DrawBitmapInt(text_bitmap, x - 1, y - 1);
}
-ui::TextureID CanvasSkia::GetTextureID() {
- // TODO(wjmaclean)
- return 0;
-}
-
void CanvasSkia::DrawFadeTruncatingString(
const string16& text,
CanvasSkia::TruncateFadeMode truncate_mode,