| 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 "cc/trees/remote_channel_main.h" | 5 #include "cc/trees/remote_channel_main.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "cc/proto/base_conversions.h" | 10 #include "cc/proto/base_conversions.h" |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 DCHECK(!initialized_); | 230 DCHECK(!initialized_); |
| 231 | 231 |
| 232 proto::CompositorMessage proto; | 232 proto::CompositorMessage proto; |
| 233 proto::CompositorMessageToImpl* to_impl_proto = proto.mutable_to_impl(); | 233 proto::CompositorMessageToImpl* to_impl_proto = proto.mutable_to_impl(); |
| 234 to_impl_proto->set_message_type( | 234 to_impl_proto->set_message_type( |
| 235 proto::CompositorMessageToImpl::INITIALIZE_IMPL); | 235 proto::CompositorMessageToImpl::INITIALIZE_IMPL); |
| 236 proto::InitializeImpl* initialize_impl_proto = | 236 proto::InitializeImpl* initialize_impl_proto = |
| 237 to_impl_proto->mutable_initialize_impl_message(); | 237 to_impl_proto->mutable_initialize_impl_message(); |
| 238 proto::LayerTreeSettings* settings_proto = | 238 proto::LayerTreeSettings* settings_proto = |
| 239 initialize_impl_proto->mutable_layer_tree_settings(); | 239 initialize_impl_proto->mutable_layer_tree_settings(); |
| 240 layer_tree_host->settings().ToProtobuf(settings_proto); | 240 layer_tree_host->GetSettings().ToProtobuf(settings_proto); |
| 241 | 241 |
| 242 VLOG(1) << "Sending initialize message to client"; | 242 VLOG(1) << "Sending initialize message to client"; |
| 243 SendMessageProto(proto); | 243 SendMessageProto(proto); |
| 244 initialized_ = true; | 244 initialized_ = true; |
| 245 } | 245 } |
| 246 | 246 |
| 247 void RemoteChannelMain::SynchronouslyCloseImpl() { | 247 void RemoteChannelMain::SynchronouslyCloseImpl() { |
| 248 TRACE_EVENT0("cc.remote", "RemoteChannelMain::SynchronouslyCloseImpl"); | 248 TRACE_EVENT0("cc.remote", "RemoteChannelMain::SynchronouslyCloseImpl"); |
| 249 DCHECK(initialized_); | 249 DCHECK(initialized_); |
| 250 proto::CompositorMessage proto; | 250 proto::CompositorMessage proto; |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 | 292 |
| 293 void RemoteChannelMain::DidCompleteSwapBuffers() { | 293 void RemoteChannelMain::DidCompleteSwapBuffers() { |
| 294 proxy_main_->DidCompleteSwapBuffers(); | 294 proxy_main_->DidCompleteSwapBuffers(); |
| 295 } | 295 } |
| 296 | 296 |
| 297 base::SingleThreadTaskRunner* RemoteChannelMain::MainThreadTaskRunner() const { | 297 base::SingleThreadTaskRunner* RemoteChannelMain::MainThreadTaskRunner() const { |
| 298 return task_runner_provider_->MainThreadTaskRunner(); | 298 return task_runner_provider_->MainThreadTaskRunner(); |
| 299 } | 299 } |
| 300 | 300 |
| 301 } // namespace cc | 301 } // namespace cc |
| OLD | NEW |