| OLD | NEW |
| 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 "components/viz/client/local_surface_id_provider.h" | 8 #include "components/viz/client/local_surface_id_provider.h" |
| 9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
| 10 #include "ui/aura/client/transient_window_client.h" | 10 #include "ui/aura/client/transient_window_client.h" |
| 11 #include "ui/aura/env.h" | 11 #include "ui/aura/env.h" |
| 12 #include "ui/aura/mus/client_surface_embedder.h" | 12 #include "ui/aura/mus/client_surface_embedder.h" |
| 13 #include "ui/aura/mus/hit_test_data_provider_mus.h" |
| 13 #include "ui/aura/mus/property_converter.h" | 14 #include "ui/aura/mus/property_converter.h" |
| 14 #include "ui/aura/mus/window_tree_client.h" | 15 #include "ui/aura/mus/window_tree_client.h" |
| 15 #include "ui/aura/mus/window_tree_client_delegate.h" | 16 #include "ui/aura/mus/window_tree_client_delegate.h" |
| 16 #include "ui/aura/window.h" | 17 #include "ui/aura/window.h" |
| 17 #include "ui/aura/window_delegate.h" | 18 #include "ui/aura/window_delegate.h" |
| 18 #include "ui/aura/window_observer.h" | 19 #include "ui/aura/window_observer.h" |
| 19 #include "ui/base/class_property.h" | 20 #include "ui/base/class_property.h" |
| 20 #include "ui/display/display.h" | 21 #include "ui/display/display.h" |
| 21 #include "ui/display/screen.h" | 22 #include "ui/display/screen.h" |
| 22 #include "ui/gfx/geometry/dip_util.h" | 23 #include "ui/gfx/geometry/dip_util.h" |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 mojo::MakeRequest(&sink_info); | 113 mojo::MakeRequest(&sink_info); |
| 113 cc::mojom::CompositorFrameSinkClientPtr client; | 114 cc::mojom::CompositorFrameSinkClientPtr client; |
| 114 cc::mojom::CompositorFrameSinkClientRequest client_request = | 115 cc::mojom::CompositorFrameSinkClientRequest client_request = |
| 115 mojo::MakeRequest(&client); | 116 mojo::MakeRequest(&client); |
| 116 constexpr bool enable_surface_synchronization = true; | 117 constexpr bool enable_surface_synchronization = true; |
| 117 auto layer_tree_frame_sink = base::MakeUnique<viz::ClientLayerTreeFrameSink>( | 118 auto layer_tree_frame_sink = base::MakeUnique<viz::ClientLayerTreeFrameSink>( |
| 118 std::move(context_provider), nullptr /* worker_context_provider */, | 119 std::move(context_provider), nullptr /* worker_context_provider */, |
| 119 gpu_memory_buffer_manager, nullptr /* shared_bitmap_manager */, | 120 gpu_memory_buffer_manager, nullptr /* shared_bitmap_manager */, |
| 120 nullptr /* synthetic_begin_frame_source */, std::move(sink_info), | 121 nullptr /* synthetic_begin_frame_source */, std::move(sink_info), |
| 121 std::move(client_request), | 122 std::move(client_request), |
| 123 base::MakeUnique<HitTestDataProviderMus>(window_), |
| 122 base::MakeUnique<viz::DefaultLocalSurfaceIdProvider>(), | 124 base::MakeUnique<viz::DefaultLocalSurfaceIdProvider>(), |
| 123 enable_surface_synchronization); | 125 enable_surface_synchronization); |
| 124 window_tree_client_->AttachCompositorFrameSink( | 126 window_tree_client_->AttachCompositorFrameSink( |
| 125 server_id(), std::move(sink_request), std::move(client)); | 127 server_id(), std::move(sink_request), std::move(client)); |
| 126 return layer_tree_frame_sink; | 128 return layer_tree_frame_sink; |
| 127 } | 129 } |
| 128 | 130 |
| 129 WindowPortMus::ServerChangeIdType WindowPortMus::ScheduleChange( | 131 WindowPortMus::ServerChangeIdType WindowPortMus::ScheduleChange( |
| 130 const ServerChangeType type, | 132 const ServerChangeType type, |
| 131 const ServerChangeData& data) { | 133 const ServerChangeData& data) { |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 584 if (!client_surface_embedder_) { | 586 if (!client_surface_embedder_) { |
| 585 client_surface_embedder_ = base::MakeUnique<ClientSurfaceEmbedder>( | 587 client_surface_embedder_ = base::MakeUnique<ClientSurfaceEmbedder>( |
| 586 window_, window_tree_client_->normal_client_area_insets_); | 588 window_, window_tree_client_->normal_client_area_insets_); |
| 587 } | 589 } |
| 588 | 590 |
| 589 client_surface_embedder_->SetPrimarySurfaceInfo(primary_surface_info_); | 591 client_surface_embedder_->SetPrimarySurfaceInfo(primary_surface_info_); |
| 590 client_surface_embedder_->SetFallbackSurfaceInfo(fallback_surface_info_); | 592 client_surface_embedder_->SetFallbackSurfaceInfo(fallback_surface_info_); |
| 591 } | 593 } |
| 592 | 594 |
| 593 } // namespace aura | 595 } // namespace aura |
| OLD | NEW |