content/browser/compositor/mus_browser_compositor_output_surface.cc - Issue 2194893002: services/ui: Revert CLs that broke Windows.

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: content/browser/compositor/mus_browser_compositor_output_surface.cc

Issue 2194893002: services/ui: Revert CLs that broke Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/compositor/gpu_process_transport_factory.cc ('k') | content/browser/gpu/gpu_data_manager_impl_private.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/mus_browser_compositor_output_surface.cc

diff --git a/content/browser/compositor/mus_browser_compositor_output_surface.cc b/content/browser/compositor/mus_browser_compositor_output_surface.cc

index 6e7a758773b44a368626f033c1eaea7357c88793..0cd81f2c8cd1fe96c75dbc3134a66805697db4e4 100644

--- a/content/browser/compositor/mus_browser_compositor_output_surface.cc

+++ b/content/browser/compositor/mus_browser_compositor_output_surface.cc

@@ -13,6 +13,7 @@

#include "content/common/gpu/client/context_provider_command_buffer.h"

#include "gpu/command_buffer/client/gles2_interface.h"

#include "gpu/ipc/client/command_buffer_proxy_impl.h"

+#include "services/ui/common/gpu_service.h"

#include "services/ui/public/cpp/window.h"

#include "services/ui/public/cpp/window_surface.h"

#include "ui/views/mus/native_widget_mus.h"

@@ -32,6 +33,7 @@ MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(

begin_frame_source,

std::move(overlay_candidate_validator)),

ui_window_(nullptr) {

+ DCHECK(ui::GpuService::UseChromeGpuCommandBuffer());

views::WindowTreeHostMus* window_tree_host =

static_cast<views::WindowTreeHostMus*>(

aura::WindowTreeHost::GetForAcceleratedWidget(surface_handle));