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

Side by Side Diff: gfx/canvas_direct2d.cc

Issue 6121004: Remove wstring from gfx. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months 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 | « gfx/canvas_direct2d.h ('k') | gfx/canvas_skia.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "gfx/canvas_direct2d.h" 5 #include "gfx/canvas_direct2d.h"
6 6
7 #include "base/scoped_ptr.h" 7 #include "base/scoped_ptr.h"
8 #include "gfx/brush.h" 8 #include "gfx/brush.h"
9 #include "gfx/rect.h" 9 #include "gfx/rect.h"
10 10
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 279
280 void CanvasDirect2D::DrawBitmapInt(const SkBitmap& bitmap, 280 void CanvasDirect2D::DrawBitmapInt(const SkBitmap& bitmap,
281 int src_x, int src_y, int src_w, int src_h, 281 int src_x, int src_y, int src_w, int src_h,
282 int dest_x, int dest_y, 282 int dest_x, int dest_y,
283 int dest_w, int dest_h, 283 int dest_w, int dest_h,
284 bool filter, 284 bool filter,
285 const SkPaint& paint) { 285 const SkPaint& paint) {
286 NOTIMPLEMENTED(); 286 NOTIMPLEMENTED();
287 } 287 }
288 288
289 void CanvasDirect2D::DrawStringInt(const std::wstring& text, 289 void CanvasDirect2D::DrawStringInt(const string16& text,
290 const gfx::Font& font, 290 const gfx::Font& font,
291 const SkColor& color, 291 const SkColor& color,
292 int x, int y, int w, int h) { 292 int x, int y, int w, int h) {
293 NOTIMPLEMENTED(); 293 NOTIMPLEMENTED();
294 } 294 }
295 295
296 void CanvasDirect2D::DrawStringInt(const std::wstring& text, 296 void CanvasDirect2D::DrawStringInt(const string16& text,
297 const gfx::Font& font, 297 const gfx::Font& font,
298 const SkColor& color, 298 const SkColor& color,
299 const gfx::Rect& display_rect) { 299 const gfx::Rect& display_rect) {
300 NOTIMPLEMENTED(); 300 NOTIMPLEMENTED();
301 } 301 }
302 302
303 void CanvasDirect2D::DrawStringInt(const std::wstring& text, 303 void CanvasDirect2D::DrawStringInt(const string16& text,
304 const gfx::Font& font, 304 const gfx::Font& font,
305 const SkColor& color, 305 const SkColor& color,
306 int x, int y, int w, int h, 306 int x, int y, int w, int h,
307 int flags) { 307 int flags) {
308 NOTIMPLEMENTED(); 308 NOTIMPLEMENTED();
309 } 309 }
310 310
311 void CanvasDirect2D::DrawFocusRect(int x, int y, int width, int height) { 311 void CanvasDirect2D::DrawFocusRect(int x, int y, int width, int height) {
312 NOTIMPLEMENTED(); 312 NOTIMPLEMENTED();
313 } 313 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 // CanvasDirect2D, private: 353 // CanvasDirect2D, private:
354 354
355 void CanvasDirect2D::SaveInternal(ID2D1Layer* layer) { 355 void CanvasDirect2D::SaveInternal(ID2D1Layer* layer) {
356 if (!drawing_state_block_) 356 if (!drawing_state_block_)
357 GetD2D1Factory()->CreateDrawingStateBlock(drawing_state_block_.Receive()); 357 GetD2D1Factory()->CreateDrawingStateBlock(drawing_state_block_.Receive());
358 rt_->SaveDrawingState(drawing_state_block_.get()); 358 rt_->SaveDrawingState(drawing_state_block_.get());
359 state_.push(RenderState(layer)); 359 state_.push(RenderState(layer));
360 } 360 }
361 361
362 } // namespace gfx 362 } // namespace gfx
OLDNEW
« no previous file with comments | « gfx/canvas_direct2d.h ('k') | gfx/canvas_skia.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698