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

Side by Side Diff: ui/aura/mus/window_port_mus.cc

Issue 2907683004: Move ClientCompositorFrameSink to components/viz (Closed)
Patch Set: c Created 3 years, 6 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
« no previous file with comments | « ui/aura/mus/window_port_mus.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/aura/mus/window_port_mus.h" 5 #include "ui/aura/mus/window_port_mus.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "ui/aura/client/aura_constants.h" 8 #include "ui/aura/client/aura_constants.h"
9 #include "ui/aura/client/transient_window_client.h" 9 #include "ui/aura/client/transient_window_client.h"
10 #include "ui/aura/mus/client_surface_embedder.h" 10 #include "ui/aura/mus/client_surface_embedder.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 std::unique_ptr<cc::CompositorFrameSink> 96 std::unique_ptr<cc::CompositorFrameSink>
97 WindowPortMus::RequestCompositorFrameSink( 97 WindowPortMus::RequestCompositorFrameSink(
98 scoped_refptr<cc::ContextProvider> context_provider, 98 scoped_refptr<cc::ContextProvider> context_provider,
99 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) { 99 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
100 cc::mojom::MojoCompositorFrameSinkPtrInfo sink_info; 100 cc::mojom::MojoCompositorFrameSinkPtrInfo sink_info;
101 cc::mojom::MojoCompositorFrameSinkRequest sink_request = 101 cc::mojom::MojoCompositorFrameSinkRequest sink_request =
102 mojo::MakeRequest(&sink_info); 102 mojo::MakeRequest(&sink_info);
103 cc::mojom::MojoCompositorFrameSinkClientPtr client; 103 cc::mojom::MojoCompositorFrameSinkClientPtr client;
104 cc::mojom::MojoCompositorFrameSinkClientRequest client_request = 104 cc::mojom::MojoCompositorFrameSinkClientRequest client_request =
105 mojo::MakeRequest(&client); 105 mojo::MakeRequest(&client);
106 auto compositor_frame_sink = base::MakeUnique<ui::ClientCompositorFrameSink>( 106 auto compositor_frame_sink = base::MakeUnique<viz::ClientCompositorFrameSink>(
107 std::move(context_provider), gpu_memory_buffer_manager, 107 std::move(context_provider), gpu_memory_buffer_manager,
108 std::move(sink_info), std::move(client_request), 108 std::move(sink_info), std::move(client_request),
109 window_tree_client_->enable_surface_synchronization_); 109 window_tree_client_->enable_surface_synchronization_);
110 window_tree_client_->AttachCompositorFrameSink( 110 window_tree_client_->AttachCompositorFrameSink(
111 server_id(), std::move(sink_request), std::move(client)); 111 server_id(), std::move(sink_request), std::move(client));
112 return std::move(compositor_frame_sink); 112 return std::move(compositor_frame_sink);
113 } 113 }
114 114
115 WindowPortMus::ServerChangeIdType WindowPortMus::ScheduleChange( 115 WindowPortMus::ServerChangeIdType WindowPortMus::ScheduleChange(
116 const ServerChangeType type, 116 const ServerChangeType type,
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 if (!client_surface_embedder_) { 526 if (!client_surface_embedder_) {
527 client_surface_embedder_ = base::MakeUnique<ClientSurfaceEmbedder>( 527 client_surface_embedder_ = base::MakeUnique<ClientSurfaceEmbedder>(
528 window_, window_tree_client_->normal_client_area_insets_); 528 window_, window_tree_client_->normal_client_area_insets_);
529 } 529 }
530 530
531 client_surface_embedder_->SetPrimarySurfaceInfo(primary_surface_info_); 531 client_surface_embedder_->SetPrimarySurfaceInfo(primary_surface_info_);
532 client_surface_embedder_->SetFallbackSurfaceInfo(fallback_surface_info_); 532 client_surface_embedder_->SetFallbackSurfaceInfo(fallback_surface_info_);
533 } 533 }
534 534
535 } // namespace aura 535 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/mus/window_port_mus.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698