| Index: cc/trees/layer_tree_host_unittest_remote_server.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_remote_server.cc b/cc/trees/layer_tree_host_unittest_remote_server.cc
|
| deleted file mode 100644
|
| index 9c0c4f1b4b78ecc69c90e4ad1a3d328ad1702603..0000000000000000000000000000000000000000
|
| --- a/cc/trees/layer_tree_host_unittest_remote_server.cc
|
| +++ /dev/null
|
| @@ -1,109 +0,0 @@
|
| -// Copyright 2016 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include <memory>
|
| -
|
| -#include "base/memory/ptr_util.h"
|
| -#include "base/threading/thread_task_runner_handle.h"
|
| -#include "cc/animation/animation_host.h"
|
| -#include "cc/test/fake_image_serialization_processor.h"
|
| -#include "cc/test/test_task_graph_runner.h"
|
| -#include "cc/trees/layer_tree_host_client.h"
|
| -#include "cc/trees/layer_tree_host_in_process.h"
|
| -#include "cc/trees/proxy_common.h"
|
| -#include "cc/trees/proxy_main.h"
|
| -#include "cc/trees/remote_proto_channel.h"
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
| -
|
| -namespace cc {
|
| -namespace {
|
| -
|
| -class LayerTreeHostTestRemoteServer : public testing::Test,
|
| - public RemoteProtoChannel,
|
| - public LayerTreeHostClient {
|
| - public:
|
| - LayerTreeHostTestRemoteServer()
|
| - : calls_received_(0),
|
| - image_serialization_processor_(
|
| - base::WrapUnique(new FakeImageSerializationProcessor)) {
|
| - animation_host_ = AnimationHost::CreateForTesting(ThreadInstance::MAIN);
|
| -
|
| - LayerTreeHostInProcess::InitParams params;
|
| - params.client = this;
|
| - params.task_graph_runner = &task_graph_runner_;
|
| - params.settings = &settings_;
|
| - params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
|
| - params.image_serialization_processor = image_serialization_processor_.get();
|
| - params.mutator_host = animation_host_.get();
|
| - layer_tree_host_ =
|
| - LayerTreeHostInProcess::CreateRemoteServer(this, ¶ms);
|
| - }
|
| -
|
| - ~LayerTreeHostTestRemoteServer() override {
|
| - animation_host_->SetMutatorHostClient(nullptr);
|
| - }
|
| -
|
| - // LayerTreeHostClient implementation
|
| - void WillBeginMainFrame() override {}
|
| - void BeginMainFrame(const BeginFrameArgs& args) override {}
|
| - void BeginMainFrameNotExpectedSoon() override {}
|
| - void DidBeginMainFrame() override {}
|
| - void UpdateLayerTreeHost() override {}
|
| - void ApplyViewportDeltas(const gfx::Vector2dF& inner_delta,
|
| - const gfx::Vector2dF& outer_delta,
|
| - const gfx::Vector2dF& elastic_overscroll_delta,
|
| - float page_scale,
|
| - float top_controls_delta) override {}
|
| - void RequestNewCompositorFrameSink() override { NOTREACHED(); }
|
| - void DidInitializeCompositorFrameSink() override { NOTREACHED(); }
|
| - void DidFailToInitializeCompositorFrameSink() override { NOTREACHED(); }
|
| - void WillCommit() override {}
|
| - void DidCommit() override {}
|
| - void DidCommitAndDrawFrame() override {}
|
| - void DidReceiveCompositorFrameAck() override {}
|
| - void DidCompletePageScaleAnimation() override {}
|
| -
|
| - // RemoteProtoChannel implementation
|
| - void SetProtoReceiver(RemoteProtoChannel::ProtoReceiver* receiver) override {
|
| - receiver_ = receiver;
|
| - }
|
| - void SendCompositorProto(const proto::CompositorMessage& proto) override {}
|
| -
|
| - int calls_received_;
|
| - TestTaskGraphRunner task_graph_runner_;
|
| - LayerTreeSettings settings_;
|
| - std::unique_ptr<AnimationHost> animation_host_;
|
| - std::unique_ptr<LayerTreeHostInProcess> layer_tree_host_;
|
| - RemoteProtoChannel::ProtoReceiver* receiver_;
|
| - std::unique_ptr<FakeImageSerializationProcessor>
|
| - image_serialization_processor_;
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(LayerTreeHostTestRemoteServer);
|
| -};
|
| -
|
| -class LayerTreeHostTestRemoteServerBeginMainFrame
|
| - : public LayerTreeHostTestRemoteServer {
|
| - protected:
|
| - void BeginMainFrame(const BeginFrameArgs& args) override {
|
| - calls_received_++;
|
| - }
|
| -};
|
| -
|
| -// Makes sure that the BeginMainFrame call is not aborted on the server.
|
| -// See crbug.com/577301.
|
| -TEST_F(LayerTreeHostTestRemoteServerBeginMainFrame, BeginMainFrameNotAborted) {
|
| - layer_tree_host_->SetVisible(true);
|
| -
|
| - std::unique_ptr<BeginMainFrameAndCommitState> begin_frame_state;
|
| - begin_frame_state.reset(new BeginMainFrameAndCommitState());
|
| - begin_frame_state->scroll_info.reset(new ScrollAndScaleSet());
|
| -
|
| - static_cast<ProxyMain*>(layer_tree_host_->proxy())
|
| - ->BeginMainFrame(std::move(begin_frame_state));
|
| - EXPECT_EQ(calls_received_, 1);
|
| -}
|
| -
|
| -} // namespace
|
| -} // namespace cc
|
|
|