Commit f22e7bc5 authored by Eric Karl's avatar Eric Karl Committed by Commit Bot

Add UnitTests for compositor lock behavior of DelegatedFrameHostAndroid

DelegatedFrameHostAndroid was updated to take a compositor lock when
it attaches to the compositor. This patch adds unit tests verifying
that this behavior works as expected.

Bug: 792120
Change-Id: I0eb783e15663df1f1f9efce01249946aec7678a1
Reviewed-on: https://chromium-review.googlesource.com/952662
Commit-Queue: Eric Karl <ericrk@chromium.org>
Reviewed-by: default avatarKhushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541658}
parent a127d07b
...@@ -295,6 +295,7 @@ junit_binary("ui_junit_tests") { ...@@ -295,6 +295,7 @@ junit_binary("ui_junit_tests") {
test("ui_android_unittests") { test("ui_android_unittests") {
sources = [ sources = [
"delegated_frame_host_android_unittest.cc",
"overscroll_refresh_unittest.cc", "overscroll_refresh_unittest.cc",
"resources/resource_manager_impl_unittest.cc", "resources/resource_manager_impl_unittest.cc",
"run_all_unittests.cc", "run_all_unittests.cc",
...@@ -308,10 +309,13 @@ test("ui_android_unittests") { ...@@ -308,10 +309,13 @@ test("ui_android_unittests") {
"//base/test:test_support", "//base/test:test_support",
"//cc", "//cc",
"//cc:test_support", "//cc:test_support",
"//components/viz/host:host",
"//components/viz/service:service",
"//skia", "//skia",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//ui/base", "//ui/base",
"//ui/compositor",
"//ui/events", "//ui/events",
"//ui/gfx", "//ui/gfx",
"//ui/resources:ui_test_pak", "//ui/resources:ui_test_pak",
......
// Copyright 2018 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 "ui/android/delegated_frame_host_android.h"
#include "base/test/test_mock_time_task_runner.h"
#include "cc/layers/layer.h"
#include "cc/layers/solid_color_layer.h"
#include "components/viz/host/host_frame_sink_manager.h"
#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/android/resources/resource_manager.h"
#include "ui/android/view_android.h"
#include "ui/android/window_android_compositor.h"
namespace ui {
namespace {
using ::testing::Return;
using ::testing::_;
using ::testing::NiceMock;
using ::testing::Invoke;
class MockDelegatedFrameHostAndroidClient
: public DelegatedFrameHostAndroid::Client {
public:
MOCK_METHOD1(SetBeginFrameSource, void(viz::BeginFrameSource*));
MOCK_METHOD0(DidReceiveCompositorFrameAck, void());
MOCK_METHOD4(DidPresentCompositorFrame,
void(uint32_t, base::TimeTicks, base::TimeDelta, uint32_t));
MOCK_METHOD1(DidDiscardCompositorFrame, void(uint32_t));
MOCK_METHOD1(ReclaimResources,
void(const std::vector<viz::ReturnedResource>&));
MOCK_METHOD1(OnFrameTokenChanged, void(uint32_t));
};
class MockWindowAndroidCompositor : public WindowAndroidCompositor {
public:
MOCK_METHOD1(AttachLayerForReadback, void(scoped_refptr<cc::Layer>));
MOCK_METHOD1(DoRequestCopyOfOutputOnRootLayer, void(viz::CopyOutputRequest*));
MOCK_METHOD0(SetNeedsAnimate, void());
MOCK_METHOD0(GetResourceManager, ResourceManager&());
MOCK_METHOD0(GetFrameSinkId, viz::FrameSinkId());
MOCK_METHOD1(AddChildFrameSink, void(const viz::FrameSinkId&));
MOCK_METHOD1(RemoveChildFrameSink, void(const viz::FrameSinkId&));
MOCK_METHOD2(DoGetCompositorLock,
CompositorLock*(CompositorLockClient*, base::TimeDelta));
MOCK_CONST_METHOD0(IsDrawingFirstVisibleFrame, bool());
// Helpers for move-only types:
void RequestCopyOfOutputOnRootLayer(
std::unique_ptr<viz::CopyOutputRequest> request) override {
return DoRequestCopyOfOutputOnRootLayer(request.get());
}
std::unique_ptr<CompositorLock> GetCompositorLock(
CompositorLockClient* client,
base::TimeDelta time_delta) override {
return std::unique_ptr<CompositorLock>(
DoGetCompositorLock(client, time_delta));
}
};
class MockCompositorLockManagerClient : public ui::CompositorLockManagerClient {
public:
MOCK_METHOD1(OnCompositorLockStateChanged, void(bool));
};
class DelegatedFrameHostAndroidTest : public testing::Test {
public:
DelegatedFrameHostAndroidTest()
: frame_sink_id_(1, 1),
task_runner_(new base::TestMockTimeTaskRunner()),
lock_manager_(task_runner_, &lock_manager_client_) {
host_frame_sink_manager_.SetLocalManager(&frame_sink_manager_impl_);
view_.SetLayer(cc::SolidColorLayer::Create());
frame_host_ = std::make_unique<DelegatedFrameHostAndroid>(
&view_, &host_frame_sink_manager_, &client_, frame_sink_id_);
}
static viz::LocalSurfaceId GetFakeId() {
return viz::LocalSurfaceId(1, 1, base::UnguessableToken::Create());
}
ui::CompositorLock* GetLock(CompositorLockClient* client,
base::TimeDelta time_delta) {
return lock_manager_.GetCompositorLock(client, time_delta).release();
}
void SubmitCompositorFrame() {
viz::CompositorFrame frame;
auto render_pass = viz::RenderPass::Create();
render_pass->output_rect = gfx::Rect(10, 10);
frame.render_pass_list.push_back(std::move(render_pass));
frame.metadata.begin_frame_ack.sequence_number = 1;
frame.metadata.device_scale_factor = 1;
frame_host_->SubmitCompositorFrame(GetFakeId(), std::move(frame),
viz::mojom::HitTestRegionList::New());
}
protected:
MockWindowAndroidCompositor compositor_;
ui::ViewAndroid view_;
viz::FrameSinkManagerImpl frame_sink_manager_impl_;
viz::HostFrameSinkManager host_frame_sink_manager_;
MockDelegatedFrameHostAndroidClient client_;
viz::FrameSinkId frame_sink_id_;
std::unique_ptr<DelegatedFrameHostAndroid> frame_host_;
MockCompositorLockManagerClient lock_manager_client_;
scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
CompositorLockManager lock_manager_;
};
TEST_F(DelegatedFrameHostAndroidTest, CompositorLockDuringFirstFrame) {
// Attach during the first frame, lock will be taken.
EXPECT_CALL(compositor_, IsDrawingFirstVisibleFrame()).WillOnce(Return(true));
EXPECT_CALL(compositor_, DoGetCompositorLock(frame_host_.get(), _))
.WillOnce(Invoke(this, &DelegatedFrameHostAndroidTest::GetLock));
EXPECT_CALL(lock_manager_client_, OnCompositorLockStateChanged(true))
.Times(1);
frame_host_->AttachToCompositor(&compositor_);
// Lock should be released when we submit a compositor frame.
EXPECT_CALL(lock_manager_client_, OnCompositorLockStateChanged(false))
.Times(1);
SubmitCompositorFrame();
}
TEST_F(DelegatedFrameHostAndroidTest, CompositorLockDuringLaterFrame) {
// Attach after the first frame, lock will not be taken.
EXPECT_CALL(compositor_, IsDrawingFirstVisibleFrame())
.WillOnce(Return(false));
EXPECT_CALL(compositor_, DoGetCompositorLock(_, _)).Times(0);
frame_host_->AttachToCompositor(&compositor_);
}
TEST_F(DelegatedFrameHostAndroidTest, CompositorLockWithDelegatedContent) {
// Submit a compositor frame to ensure we have delegated content.
SubmitCompositorFrame();
// Even though it's the first frame, we won't take the lock as we already have
// delegated content.
EXPECT_CALL(compositor_, IsDrawingFirstVisibleFrame()).WillOnce(Return(true));
EXPECT_CALL(compositor_, DoGetCompositorLock(_, _)).Times(0);
frame_host_->AttachToCompositor(&compositor_);
}
TEST_F(DelegatedFrameHostAndroidTest, CompositorLockReleasedWithDetach) {
// Attach during the first frame, lock will be taken.
EXPECT_CALL(compositor_, IsDrawingFirstVisibleFrame()).WillOnce(Return(true));
EXPECT_CALL(compositor_, DoGetCompositorLock(frame_host_.get(), _))
.WillOnce(Invoke(this, &DelegatedFrameHostAndroidTest::GetLock));
EXPECT_CALL(lock_manager_client_, OnCompositorLockStateChanged(true))
.Times(1);
frame_host_->AttachToCompositor(&compositor_);
// Lock should be released when we detach.
EXPECT_CALL(lock_manager_client_, OnCompositorLockStateChanged(false))
.Times(1);
frame_host_->DetachFromCompositor();
}
} // namespace
} // namespace ui
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment