| Index: components/mus/surfaces/top_level_display_client.cc
|
| diff --git a/components/view_manager/surfaces/top_level_display_client.cc b/components/mus/surfaces/top_level_display_client.cc
|
| similarity index 86%
|
| rename from components/view_manager/surfaces/top_level_display_client.cc
|
| rename to components/mus/surfaces/top_level_display_client.cc
|
| index 8b5091796d011a5315c49453322be1b5cbba0000..c6eeea7c5ada25e2f07327184a8e292f2bfa409c 100644
|
| --- a/components/view_manager/surfaces/top_level_display_client.cc
|
| +++ b/components/mus/surfaces/top_level_display_client.cc
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/view_manager/surfaces/top_level_display_client.h"
|
| +#include "components/mus/surfaces/top_level_display_client.h"
|
|
|
| #include "cc/output/compositor_frame.h"
|
| #include "cc/surfaces/display.h"
|
| -#include "components/view_manager/gles2/gpu_state.h"
|
| -#include "components/view_manager/surfaces/surfaces_context_provider.h"
|
| -#include "components/view_manager/surfaces/surfaces_output_surface.h"
|
| -#include "components/view_manager/surfaces/surfaces_scheduler.h"
|
| -#include "components/view_manager/surfaces/surfaces_state.h"
|
| +#include "components/mus/gles2/gpu_state.h"
|
| +#include "components/mus/surfaces/surfaces_context_provider.h"
|
| +#include "components/mus/surfaces/surfaces_output_surface.h"
|
| +#include "components/mus/surfaces/surfaces_scheduler.h"
|
| +#include "components/mus/surfaces/surfaces_state.h"
|
|
|
| namespace surfaces {
|
| namespace {
|
| @@ -46,8 +46,7 @@ TopLevelDisplayClient::TopLevelDisplayClient(
|
| display_->SetSurfaceId(cc_id_, 1.f /* device_scale_factor */);
|
| }
|
|
|
| -void TopLevelDisplayClient::OnContextCreated() {
|
| -}
|
| +void TopLevelDisplayClient::OnContextCreated() {}
|
|
|
| TopLevelDisplayClient::~TopLevelDisplayClient() {
|
| if (display_) {
|
| @@ -65,8 +64,8 @@ void TopLevelDisplayClient::SubmitCompositorFrame(
|
| pending_frame_ = frame.Pass();
|
|
|
| last_submitted_frame_size_ =
|
| - pending_frame_->delegated_frame_data->render_pass_list.back()->
|
| - output_rect.size();
|
| + pending_frame_->delegated_frame_data->render_pass_list.back()
|
| + ->output_rect.size();
|
| display_->Resize(last_submitted_frame_size_);
|
| factory_.SubmitCompositorFrame(cc_id_, pending_frame_.Pass(),
|
| base::Bind(&CallCallback, callback));
|
| @@ -74,8 +73,7 @@ void TopLevelDisplayClient::SubmitCompositorFrame(
|
| }
|
|
|
| void TopLevelDisplayClient::CommitVSyncParameters(base::TimeTicks timebase,
|
| - base::TimeDelta interval) {
|
| -}
|
| + base::TimeDelta interval) {}
|
|
|
| void TopLevelDisplayClient::OutputSurfaceLost() {
|
| if (!display_) // Shutdown case
|
| @@ -92,8 +90,7 @@ void TopLevelDisplayClient::OutputSurfaceLost() {
|
| }
|
|
|
| void TopLevelDisplayClient::SetMemoryPolicy(
|
| - const cc::ManagedMemoryPolicy& policy) {
|
| -}
|
| + const cc::ManagedMemoryPolicy& policy) {}
|
|
|
| void TopLevelDisplayClient::OnVSyncParametersUpdated(int64_t timebase,
|
| int64_t interval) {
|
|
|