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

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

Issue 8476019: ui/gfx: Convert Canvas::DrawRectInt() to use gfx::Rect. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 Scale(int x_scale, int y_scale) OVERRIDE; 105 virtual void Scale(int x_scale, int y_scale) OVERRIDE;
106 virtual void FillRect(const SkColor& color, const gfx::Rect& rect) OVERRIDE; 106 virtual void FillRect(const SkColor& color, const gfx::Rect& rect) OVERRIDE;
107 virtual void FillRect(const SkColor& color, 107 virtual void FillRect(const SkColor& color,
108 const gfx::Rect& rect, 108 const gfx::Rect& rect,
109 SkXfermode::Mode mode) OVERRIDE; 109 SkXfermode::Mode mode) OVERRIDE;
110 virtual void FillRect(const gfx::Brush* brush, 110 virtual void FillRect(const gfx::Brush* brush,
111 const gfx::Rect& rect) OVERRIDE; 111 const gfx::Rect& rect) OVERRIDE;
112 virtual void DrawRectInt(const SkColor& color, 112 virtual void DrawRect(const SkColor& color, const gfx::Rect& rect) OVERRIDE;
113 int x, int y, int w, int h) OVERRIDE; 113 virtual void DrawRect(const SkColor& color,
114 virtual void DrawRectInt(const SkColor& color, 114 const gfx::Rect& rect,
115 int x, int y, int w, int h, 115 SkXfermode::Mode mode) OVERRIDE;
116 SkXfermode::Mode mode) OVERRIDE; 116 virtual void DrawRect(const gfx::Rect& rect, const SkPaint& paint) OVERRIDE;
117 virtual void DrawRectInt(int x, int y, int w, int h,
118 const SkPaint& paint) OVERRIDE;
119 virtual void DrawLineInt(const SkColor& color, 117 virtual void DrawLineInt(const SkColor& color,
120 int x1, int y1, 118 int x1, int y1,
121 int x2, int y2) OVERRIDE; 119 int x2, int y2) OVERRIDE;
122 virtual void DrawBitmapInt(const SkBitmap& bitmap, int x, int y) OVERRIDE; 120 virtual void DrawBitmapInt(const SkBitmap& bitmap, int x, int y) OVERRIDE;
123 virtual void DrawBitmapInt(const SkBitmap& bitmap, 121 virtual void DrawBitmapInt(const SkBitmap& bitmap,
124 int x, int y, 122 int x, int y,
125 const SkPaint& paint) OVERRIDE; 123 const SkPaint& paint) OVERRIDE;
126 virtual void DrawBitmapInt(const SkBitmap& bitmap, 124 virtual void DrawBitmapInt(const SkBitmap& bitmap,
127 int src_x, int src_y, int src_w, int src_h, 125 int src_x, int src_y, int src_w, int src_h,
128 int dest_x, int dest_y, int dest_w, int dest_h, 126 int dest_x, int dest_y, int dest_w, int dest_h,
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 193
196 scoped_ptr<skia::PlatformCanvas> owned_canvas_; 194 scoped_ptr<skia::PlatformCanvas> owned_canvas_;
197 SkCanvas* canvas_; 195 SkCanvas* canvas_;
198 196
199 DISALLOW_COPY_AND_ASSIGN(CanvasSkia); 197 DISALLOW_COPY_AND_ASSIGN(CanvasSkia);
200 }; 198 };
201 199
202 } // namespace gfx 200 } // namespace gfx
203 201
204 #endif // UI_GFX_CANVAS_SKIA_H_ 202 #endif // UI_GFX_CANVAS_SKIA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698