views/widget/native_widget_wayland.cc - Issue 8240006: Use a mocked compositor for unit tests

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: views/widget/native_widget_wayland.cc

Issue 8240006: Use a mocked compositor for unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge Created 9 years, 2 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: views/widget/native_widget_wayland.cc

diff --git a/views/widget/native_widget_wayland.cc b/views/widget/native_widget_wayland.cc

index 0f5616eb73bcf6f14c879152bec4dd8392dec609..d85db33acc7dc5706ed43a20c626f633a598bda9 100644

--- a/views/widget/native_widget_wayland.cc

+++ b/views/widget/native_widget_wayland.cc

@@ -83,8 +83,8 @@ void NativeWidgetWayland::InitNativeWidget(const Widget::InitParams& params) {

SetNativeWindowProperty(kNativeWidgetKey, this);

if (View::get_use_acceleration_when_possible()) {

- if (Widget::compositor_factory()) {

- compositor_ = (*Widget::compositor_factory())();

+ if (ui::Compositor::compositor_factory()) {

+ compositor_ = (*ui::Compositor::compositor_factory())(this);

} else {

compositor_ = ui::Compositor::Create(this,

egl_window_,