diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 00:30:59 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 00:30:59 +0000 |
| commit | 94a0d258287787cf09854492ce889eb14273c059 (patch) | |
| tree | ff242b01f90ee3888fd10a1583b03268b9a15eb0 /ui/views/widget/native_widget_win.h | |
| parent | fbddf8352b68292d26191060d37c3f0820c8875c (diff) | |
| download | chromium_src-94a0d258287787cf09854492ce889eb14273c059.zip chromium_src-94a0d258287787cf09854492ce889eb14273c059.tar.gz chromium_src-94a0d258287787cf09854492ce889eb14273c059.tar.bz2 | |
ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.
The final goal is to merge these two classes into a single gfx::Canvas class.
BUG=116572
R=ben@chromium.org,asvitkine@chromium.org
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9562038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125735 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget/native_widget_win.h')
| -rw-r--r-- | ui/views/widget/native_widget_win.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/widget/native_widget_win.h b/ui/views/widget/native_widget_win.h index 6b6fea1..fe9eae3 100644 --- a/ui/views/widget/native_widget_win.h +++ b/ui/views/widget/native_widget_win.h @@ -32,7 +32,7 @@ class ViewProp; } namespace gfx { -class CanvasSkia; +class Canvas; class Font; class Rect; } @@ -551,7 +551,7 @@ class VIEWS_EXPORT NativeWidgetWin : public ui::WindowImpl, // A canvas that contains the window contents in the case of a layered // window. - scoped_ptr<gfx::CanvasSkia> layered_window_contents_; + scoped_ptr<gfx::Canvas> layered_window_contents_; // We must track the invalid rect ourselves, for two reasons: // For layered windows, Windows will not do this properly with |