gfx/canvas_direct2d.h - Issue 6121004: Remove wstring from gfx.

Side by Side Diff: gfx/canvas_direct2d.h

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

OLD	NEW
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 #ifndef GFX_CANVAS_DIRECT2D_H_	5 #ifndef GFX_CANVAS_DIRECT2D_H_

6 #define GFX_CANVAS_DIRECT2D_H_	6 #define GFX_CANVAS_DIRECT2D_H_

7 #pragma once	7 #pragma once

8	8

9 #include <d2d1.h>	9 #include <d2d1.h>

10	10

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 const SkPaint& paint);	50 const SkPaint& paint);

51 virtual void DrawBitmapInt(const SkBitmap& bitmap,	51 virtual void DrawBitmapInt(const SkBitmap& bitmap,

52 int src_x, int src_y, int src_w, int src_h,	52 int src_x, int src_y, int src_w, int src_h,

53 int dest_x, int dest_y, int dest_w, int dest_h,	53 int dest_x, int dest_y, int dest_w, int dest_h,

54 bool filter);	54 bool filter);

55 virtual void DrawBitmapInt(const SkBitmap& bitmap,	55 virtual void DrawBitmapInt(const SkBitmap& bitmap,

56 int src_x, int src_y, int src_w, int src_h,	56 int src_x, int src_y, int src_w, int src_h,

57 int dest_x, int dest_y, int dest_w, int dest_h,	57 int dest_x, int dest_y, int dest_w, int dest_h,

58 bool filter,	58 bool filter,

59 const SkPaint& paint);	59 const SkPaint& paint);

60 virtual void DrawStringInt(const std::wstring& text,	60 virtual void DrawStringInt(const string16& text,

61 const gfx::Font& font,	61 const gfx::Font& font,

62 const SkColor& color,	62 const SkColor& color,

63 int x, int y, int w, int h);	63 int x, int y, int w, int h);

64 virtual void DrawStringInt(const std::wstring& text,	64 virtual void DrawStringInt(const string16& text,

65 const gfx::Font& font,	65 const gfx::Font& font,

66 const SkColor& color,	66 const SkColor& color,

67 const gfx::Rect& display_rect);	67 const gfx::Rect& display_rect);

68 virtual void DrawStringInt(const std::wstring& text,	68 virtual void DrawStringInt(const string16& text,

69 const gfx::Font& font,	69 const gfx::Font& font,

70 const SkColor& color,	70 const SkColor& color,

71 int x, int y, int w, int h,	71 int x, int y, int w, int h,

72 int flags);	72 int flags);

73 virtual void DrawFocusRect(int x, int y, int width, int height);	73 virtual void DrawFocusRect(int x, int y, int width, int height);

74 virtual void TileImageInt(const SkBitmap& bitmap, int x, int y, int w, int h);	74 virtual void TileImageInt(const SkBitmap& bitmap, int x, int y, int w, int h);

75 virtual void TileImageInt(const SkBitmap& bitmap,	75 virtual void TileImageInt(const SkBitmap& bitmap,

76 int src_x, int src_y,	76 int src_x, int src_y,

77 int dest_x, int dest_y, int w, int h);	77 int dest_x, int dest_y, int w, int h);

78 virtual gfx::NativeDrawingContext BeginPlatformPaint();	78 virtual gfx::NativeDrawingContext BeginPlatformPaint();

(...skipping 24 matching lines...) Expand all Loading...
103 int clip_count;	103 int clip_count;

104 };	104 };

105 std::stack<RenderState> state_;	105 std::stack<RenderState> state_;

106	106

107 DISALLOW_COPY_AND_ASSIGN(CanvasDirect2D);	107 DISALLOW_COPY_AND_ASSIGN(CanvasDirect2D);

108 };	108 };

109	109

110 } // namespace gfx;	110 } // namespace gfx;

111	111

112 #endif // GFX_CANVAS_DIRECT2D_H_	112 #endif // GFX_CANVAS_DIRECT2D_H_

OLD	NEW

« no previous file with comments | « gfx/canvas.h ('k') | gfx/canvas_direct2d.cc » ('j') | no next file with comments »