ui/views/widget/native_widget_win.cc - Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/widget/native_widget_win.cc

Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more two win fixes Created 8 years, 9 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:

Index: ui/views/widget/native_widget_win.cc

diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc

index 5f6181116e3198b0134ce0aa370ba662c57d8b05..ecd7d832db3fd0527691fcde1ec295e7f82174f2 100644

--- a/ui/views/widget/native_widget_win.cc

+++ b/ui/views/widget/native_widget_win.cc

@@ -25,8 +25,8 @@

#include "ui/base/view_prop.h"

#include "ui/base/win/hwnd_util.h"

#include "ui/base/win/mouse_wheel_util.h"

+#include "ui/gfx/canvas.h"

#include "ui/gfx/canvas_paint.h"

-#include "ui/gfx/canvas_skia.h"

#include "ui/gfx/canvas_skia_paint.h"

#include "ui/gfx/icon_util.h"

#include "ui/gfx/native_theme_win.h"

@@ -2382,7 +2382,7 @@ void NativeWidgetWin::ClientAreaSizeChanged() {

std::max(0, static_cast<int>(r.bottom - r.top)));

delegate_->OnNativeWidgetSizeChanged(s);

if (use_layered_buffer_)

- layered_window_contents_.reset(new gfx::CanvasSkia(s, false));

+ layered_window_contents_.reset(new gfx::Canvas(s, false));

}

void NativeWidgetWin::UpdateDWMFrame() {

« no previous file with comments | « ui/views/widget/native_widget_win.h ('k') | ui/views/widget/root_view.cc » ('j') | no next file with comments »