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

Side by Side Diff: ui/gfx/canvas_direct2d.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.h ('k') | ui/gfx/canvas_direct2d.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_DIRECT2D_H_ 5 #ifndef UI_GFX_CANVAS_DIRECT2D_H_
6 #define UI_GFX_CANVAS_DIRECT2D_H_ 6 #define UI_GFX_CANVAS_DIRECT2D_H_
7 #pragma once 7 #pragma once
8 8
9 #include <d2d1.h> 9 #include <d2d1.h>
10 10
(...skipping 15 matching lines...) Expand all
26 static ID2D1Factory* GetD2D1Factory(); 26 static ID2D1Factory* GetD2D1Factory();
27 27
28 // Overridden from Canvas: 28 // Overridden from Canvas:
29 virtual void Save() OVERRIDE; 29 virtual void Save() OVERRIDE;
30 virtual void SaveLayerAlpha(uint8 alpha) OVERRIDE; 30 virtual void SaveLayerAlpha(uint8 alpha) OVERRIDE;
31 virtual void SaveLayerAlpha(uint8 alpha, 31 virtual void SaveLayerAlpha(uint8 alpha,
32 const gfx::Rect& layer_bounds) OVERRIDE; 32 const gfx::Rect& layer_bounds) OVERRIDE;
33 virtual void Restore() OVERRIDE; 33 virtual void Restore() OVERRIDE;
34 virtual bool ClipRect(const gfx::Rect& rect) OVERRIDE; 34 virtual bool ClipRect(const gfx::Rect& rect) OVERRIDE;
35 virtual void Translate(const gfx::Point& point) OVERRIDE; 35 virtual void Translate(const gfx::Point& point) OVERRIDE;
36 virtual void ScaleInt(int x, int y) OVERRIDE; 36 virtual void Scale(int x_scale, int y_scale) OVERRIDE;
37 virtual void FillRectInt(const SkColor& color, 37 virtual void FillRectInt(const SkColor& color,
38 int x, int y, int w, int h) OVERRIDE; 38 int x, int y, int w, int h) OVERRIDE;
39 virtual void FillRectInt(const SkColor& color, 39 virtual void FillRectInt(const SkColor& color,
40 int x, int y, int w, int h, 40 int x, int y, int w, int h,
41 SkXfermode::Mode mode) OVERRIDE; 41 SkXfermode::Mode mode) OVERRIDE;
42 virtual void FillRectInt(const gfx::Brush* brush, 42 virtual void FillRectInt(const gfx::Brush* brush,
43 int x, int y, int w, int h) OVERRIDE; 43 int x, int y, int w, int h) OVERRIDE;
44 virtual void DrawRectInt(const SkColor& color, 44 virtual void DrawRectInt(const SkColor& color,
45 int x, int y, int w, int h) OVERRIDE; 45 int x, int y, int w, int h) OVERRIDE;
46 virtual void DrawRectInt(const SkColor& color, 46 virtual void DrawRectInt(const SkColor& color,
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 int clip_count; 113 int clip_count;
114 }; 114 };
115 std::stack<RenderState> state_; 115 std::stack<RenderState> state_;
116 116
117 DISALLOW_COPY_AND_ASSIGN(CanvasDirect2D); 117 DISALLOW_COPY_AND_ASSIGN(CanvasDirect2D);
118 }; 118 };
119 119
120 } // namespace gfx 120 } // namespace gfx
121 121
122 #endif // UI_GFX_CANVAS_DIRECT2D_H_ 122 #endif // UI_GFX_CANVAS_DIRECT2D_H_
OLDNEW
« no previous file with comments | « ui/gfx/canvas.h ('k') | ui/gfx/canvas_direct2d.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698