Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Side by Side Diff: ui/gfx/canvas_skia.h

Issue 8363036: ui/gfx: Change Canvas::ScaleInt() to just Canvas::Scale(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address Peter's review Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/canvas_direct2d_unittest.cc ('k') | ui/gfx/canvas_skia.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_CANVAS_SKIA_H_ 5 #ifndef UI_GFX_CANVAS_SKIA_H_
6 #define UI_GFX_CANVAS_SKIA_H_ 6 #define UI_GFX_CANVAS_SKIA_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 SkBitmap ExtractBitmap() const; 95 SkBitmap ExtractBitmap() const;
96 96
97 // Overridden from Canvas: 97 // Overridden from Canvas:
98 virtual void Save() OVERRIDE; 98 virtual void Save() OVERRIDE;
99 virtual void SaveLayerAlpha(uint8 alpha) OVERRIDE; 99 virtual void SaveLayerAlpha(uint8 alpha) OVERRIDE;
100 virtual void SaveLayerAlpha(uint8 alpha, 100 virtual void SaveLayerAlpha(uint8 alpha,
101 const gfx::Rect& layer_bounds) OVERRIDE; 101 const gfx::Rect& layer_bounds) OVERRIDE;
102 virtual void Restore() OVERRIDE; 102 virtual void Restore() OVERRIDE;
103 virtual bool ClipRect(const gfx::Rect& rect) OVERRIDE; 103 virtual bool ClipRect(const gfx::Rect& rect) OVERRIDE;
104 virtual void Translate(const gfx::Point& point) OVERRIDE; 104 virtual void Translate(const gfx::Point& point) OVERRIDE;
105 virtual void ScaleInt(int x, int y) OVERRIDE; 105 virtual void Scale(int x_scale, int y_scale) OVERRIDE;
106 virtual void FillRectInt(const SkColor& color, 106 virtual void FillRectInt(const SkColor& color,
107 int x, int y, int w, int h) OVERRIDE; 107 int x, int y, int w, int h) OVERRIDE;
108 virtual void FillRectInt(const SkColor& color, 108 virtual void FillRectInt(const SkColor& color,
109 int x, int y, int w, int h, 109 int x, int y, int w, int h,
110 SkXfermode::Mode mode) OVERRIDE; 110 SkXfermode::Mode mode) OVERRIDE;
111 virtual void FillRectInt(const gfx::Brush* brush, 111 virtual void FillRectInt(const gfx::Brush* brush,
112 int x, int y, int w, int h) OVERRIDE; 112 int x, int y, int w, int h) OVERRIDE;
113 virtual void DrawRectInt(const SkColor& color, 113 virtual void DrawRectInt(const SkColor& color,
114 int x, int y, int w, int h) OVERRIDE; 114 int x, int y, int w, int h) OVERRIDE;
115 virtual void DrawRectInt(const SkColor& color, 115 virtual void DrawRectInt(const SkColor& color,
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 196
197 scoped_ptr<skia::PlatformCanvas> owned_canvas_; 197 scoped_ptr<skia::PlatformCanvas> owned_canvas_;
198 SkCanvas* canvas_; 198 SkCanvas* canvas_;
199 199
200 DISALLOW_COPY_AND_ASSIGN(CanvasSkia); 200 DISALLOW_COPY_AND_ASSIGN(CanvasSkia);
201 }; 201 };
202 202
203 } // namespace gfx 203 } // namespace gfx
204 204
205 #endif // UI_GFX_CANVAS_SKIA_H_ 205 #endif // UI_GFX_CANVAS_SKIA_H_
OLDNEW
« no previous file with comments | « ui/gfx/canvas_direct2d_unittest.cc ('k') | ui/gfx/canvas_skia.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698