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

Side by Side Diff: cc/test/layer_tree_test.cc

Issue 2314933004: cc/blimp: Remove the LayerTreeSettings serialization. (Closed)
Patch Set: Created 4 years, 3 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 | « cc/proto/layer_tree_settings.proto ('k') | cc/trees/layer_tree_settings.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/test/layer_tree_test.h" 5 #include "cc/test/layer_tree_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 } 897 }
898 898
899 void LayerTreeTest::CreateRemoteClientHost( 899 void LayerTreeTest::CreateRemoteClientHost(
900 const proto::CompositorMessageToImpl& proto) { 900 const proto::CompositorMessageToImpl& proto) {
901 DCHECK(IsRemoteTest()); 901 DCHECK(IsRemoteTest());
902 DCHECK(!remote_client_layer_tree_host_); 902 DCHECK(!remote_client_layer_tree_host_);
903 DCHECK(impl_thread_); 903 DCHECK(impl_thread_);
904 DCHECK(proto.message_type() == 904 DCHECK(proto.message_type() ==
905 proto::CompositorMessageToImpl::INITIALIZE_IMPL); 905 proto::CompositorMessageToImpl::INITIALIZE_IMPL);
906 906
907 proto::InitializeImpl initialize_proto = proto.initialize_impl_message(); 907 LayerTreeSettings settings = settings_;
908 LayerTreeSettings settings;
909 settings.FromProtobuf(initialize_proto.layer_tree_settings());
910 settings.abort_commit_before_output_surface_creation = false; 908 settings.abort_commit_before_output_surface_creation = false;
911 remote_client_layer_tree_host_ = LayerTreeHostForTesting::Create( 909 remote_client_layer_tree_host_ = LayerTreeHostForTesting::Create(
912 this, mode_, client_.get(), &remote_proto_channel_bridge_.channel_impl, 910 this, mode_, client_.get(), &remote_proto_channel_bridge_.channel_impl,
913 nullptr, nullptr, task_graph_runner_.get(), settings, 911 nullptr, nullptr, task_graph_runner_.get(), settings,
914 base::ThreadTaskRunnerHandle::Get(), impl_thread_->task_runner(), nullptr, 912 base::ThreadTaskRunnerHandle::Get(), impl_thread_->task_runner(), nullptr,
915 image_serialization_processor_.get()); 913 image_serialization_processor_.get());
916 914
917 DCHECK(remote_proto_channel_bridge_.channel_impl.HasReceiver()); 915 DCHECK(remote_proto_channel_bridge_.channel_impl.HasReceiver());
918 DCHECK(task_runner_provider()->HasImplThread()); 916 DCHECK(task_runner_provider()->HasImplThread());
919 } 917 }
(...skipping 20 matching lines...) Expand all
940 } 938 }
941 939
942 LayerTreeHost* LayerTreeTest::remote_client_layer_tree_host() { 940 LayerTreeHost* LayerTreeTest::remote_client_layer_tree_host() {
943 DCHECK(IsRemoteTest()); 941 DCHECK(IsRemoteTest());
944 DCHECK(task_runner_provider()->IsMainThread() || 942 DCHECK(task_runner_provider()->IsMainThread() ||
945 task_runner_provider()->IsMainThreadBlocked()); 943 task_runner_provider()->IsMainThreadBlocked());
946 return remote_client_layer_tree_host_.get(); 944 return remote_client_layer_tree_host_.get();
947 } 945 }
948 946
949 } // namespace cc 947 } // namespace cc
OLDNEW
« no previous file with comments | « cc/proto/layer_tree_settings.proto ('k') | cc/trees/layer_tree_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698