Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: content/browser/compositor/mus_browser_compositor_output_surface.cc

Issue 2176303002: services/ui: Remove deprecated gpu code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 4 years, 4 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #include "content/browser/compositor/mus_browser_compositor_output_surface.h" 5 #include "content/browser/compositor/mus_browser_compositor_output_surface.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "cc/output/compositor_frame.h" 9 #include "cc/output/compositor_frame.h"
10 #include "cc/quads/render_pass.h" 10 #include "cc/quads/render_pass.h"
11 #include "cc/quads/texture_draw_quad.h" 11 #include "cc/quads/texture_draw_quad.h"
12 #include "components/display_compositor/compositor_overlay_candidate_validator.h " 12 #include "components/display_compositor/compositor_overlay_candidate_validator.h "
13 #include "content/common/gpu/client/context_provider_command_buffer.h" 13 #include "content/common/gpu/client/context_provider_command_buffer.h"
14 #include "gpu/command_buffer/client/gles2_interface.h" 14 #include "gpu/command_buffer/client/gles2_interface.h"
15 #include "gpu/ipc/client/command_buffer_proxy_impl.h" 15 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
16 #include "services/ui/common/gpu_service.h"
17 #include "services/ui/public/cpp/window.h" 16 #include "services/ui/public/cpp/window.h"
18 #include "services/ui/public/cpp/window_surface.h" 17 #include "services/ui/public/cpp/window_surface.h"
19 #include "ui/views/mus/native_widget_mus.h" 18 #include "ui/views/mus/native_widget_mus.h"
20 #include "ui/views/mus/window_tree_host_mus.h" 19 #include "ui/views/mus/window_tree_host_mus.h"
21 20
22 namespace content { 21 namespace content {
23 22
24 MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface( 23 MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(
25 gpu::SurfaceHandle surface_handle, 24 gpu::SurfaceHandle surface_handle,
26 scoped_refptr<ContextProviderCommandBuffer> context, 25 scoped_refptr<ContextProviderCommandBuffer> context,
27 scoped_refptr<ui::CompositorVSyncManager> vsync_manager, 26 scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
28 cc::SyntheticBeginFrameSource* begin_frame_source, 27 cc::SyntheticBeginFrameSource* begin_frame_source,
29 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> 28 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
30 overlay_candidate_validator) 29 overlay_candidate_validator)
31 : GpuBrowserCompositorOutputSurface(std::move(context), 30 : GpuBrowserCompositorOutputSurface(std::move(context),
32 std::move(vsync_manager), 31 std::move(vsync_manager),
33 begin_frame_source, 32 begin_frame_source,
34 std::move(overlay_candidate_validator)), 33 std::move(overlay_candidate_validator)),
35 ui_window_(nullptr) { 34 ui_window_(nullptr) {
36 DCHECK(ui::GpuService::UseChromeGpuCommandBuffer());
37 views::WindowTreeHostMus* window_tree_host = 35 views::WindowTreeHostMus* window_tree_host =
38 static_cast<views::WindowTreeHostMus*>( 36 static_cast<views::WindowTreeHostMus*>(
39 aura::WindowTreeHost::GetForAcceleratedWidget(surface_handle)); 37 aura::WindowTreeHost::GetForAcceleratedWidget(surface_handle));
40 ui_window_ = window_tree_host->native_widget()->window(); 38 ui_window_ = window_tree_host->native_widget()->window();
41 ui_window_surface_ = 39 ui_window_surface_ =
42 ui_window_->RequestSurface(ui::mojom::SurfaceType::DEFAULT); 40 ui_window_->RequestSurface(ui::mojom::SurfaceType::DEFAULT);
43 } 41 }
44 42
45 MusBrowserCompositorOutputSurface::~MusBrowserCompositorOutputSurface() {} 43 MusBrowserCompositorOutputSurface::~MusBrowserCompositorOutputSurface() {}
46 44
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 162
165 const gpu::Mailbox& MusBrowserCompositorOutputSurface::GetMailboxFromResourceId( 163 const gpu::Mailbox& MusBrowserCompositorOutputSurface::GetMailboxFromResourceId(
166 uint32_t id) { 164 uint32_t id) {
167 DCHECK_LT(id, mailboxes_.size()); 165 DCHECK_LT(id, mailboxes_.size());
168 DCHECK(std::find(free_resource_ids_.begin(), free_resource_ids_.end(), id) == 166 DCHECK(std::find(free_resource_ids_.begin(), free_resource_ids_.end(), id) ==
169 free_resource_ids_.end()); 167 free_resource_ids_.end());
170 return mailboxes_[id]; 168 return mailboxes_[id];
171 } 169 }
172 170
173 } // namespace content 171 } // namespace content
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698