summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/gfx/canvas.h4
-rw-r--r--ui/gfx/canvas_skia.cc4
-rw-r--r--ui/gfx/canvas_skia.h4
3 files changed, 3 insertions, 9 deletions
diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h
index 7942a93..c3af1e3 100644
--- a/ui/gfx/canvas.h
+++ b/ui/gfx/canvas.h
@@ -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.
@@ -212,10 +212,8 @@ class UI_EXPORT Canvas {
// returned by BeginPlatformPaint().
virtual void EndPlatformPaint() = 0;
-#if !defined(OS_MACOSX)
// Apply transformation on the canvas.
virtual void Transform(const ui::Transform& transform) = 0;
-#endif
// Create a texture ID that can be used for accelerated drawing.
virtual ui::TextureID GetTextureID() = 0;
diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc
index d89e11d..b8ca78a 100644
--- a/ui/gfx/canvas_skia.cc
+++ b/ui/gfx/canvas_skia.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.
@@ -356,11 +356,9 @@ void CanvasSkia::EndPlatformPaint() {
skia::EndPlatformPaint(canvas_);
}
-#if !defined(OS_MACOSX)
void CanvasSkia::Transform(const ui::Transform& transform) {
canvas_->concat(transform.matrix());
}
-#endif
CanvasSkia* CanvasSkia::AsCanvasSkia() {
return this;
diff --git a/ui/gfx/canvas_skia.h b/ui/gfx/canvas_skia.h
index 9c0f82e..6115dd3 100644
--- a/ui/gfx/canvas_skia.h
+++ b/ui/gfx/canvas_skia.h
@@ -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.
@@ -172,9 +172,7 @@ class UI_EXPORT CanvasSkia : public Canvas {
int dest_x, int dest_y, int w, int h) OVERRIDE;
virtual gfx::NativeDrawingContext BeginPlatformPaint() OVERRIDE;
virtual void EndPlatformPaint() OVERRIDE;
-#if !defined(OS_MACOSX)
virtual void Transform(const ui::Transform& transform) OVERRIDE;
-#endif
virtual ui::TextureID GetTextureID() OVERRIDE;
virtual CanvasSkia* AsCanvasSkia() OVERRIDE;
virtual const CanvasSkia* AsCanvasSkia() const OVERRIDE;