cc/layers/delegated_frame_provider_unittest.cc - Issue 1101823002: CC Animations: Make LayerAnimationController creation optional

Unified Diff: cc/layers/delegated_frame_provider_unittest.cc

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Plumb LayerSettings parameter for cc::Layer construction. Created 5 years, 7 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 side-by-side diff with in-line comments

Download patch

« cc/blink/web_layer_impl.cc ('K') | « cc/layers/contents_scaling_layer_unittest.cc ('k') | cc/layers/delegated_renderer_layer.h » ('j') | chrome/browser/android/compositor/layer/content_layer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/layers/delegated_frame_provider_unittest.cc

diff --git a/cc/layers/delegated_frame_provider_unittest.cc b/cc/layers/delegated_frame_provider_unittest.cc

index fe8117e797a452d3bd30224434633f4101964d02..4e2f07da77f93601f1e44f11c918eac2bd5a7ceb 100644

--- a/cc/layers/delegated_frame_provider_unittest.cc

+++ b/cc/layers/delegated_frame_provider_unittest.cc

@@ -9,6 +9,7 @@

#include "cc/quads/texture_draw_quad.h"

#include "cc/resources/returned_resource.h"

#include "cc/resources/transferable_resource.h"

+#include "cc/trees/layer_tree_settings.h"

#include "testing/gtest/include/gtest/gtest.h"

namespace cc {

@@ -90,6 +91,7 @@ class DelegatedFrameProviderTest

scoped_refptr<DelegatedFrameProvider> frame_provider_;

bool resources_available_;

ReturnedResourceArray resources_;

+ LayerSettings layer_settings_;

};

TEST_F(DelegatedFrameProviderTest, SameResources) {

@@ -153,9 +155,9 @@ TEST_F(DelegatedFrameProviderTest, RefResources) {

SetFrameProvider(frame.Pass());

scoped_refptr<DelegatedRendererLayer> observer1 =

- DelegatedRendererLayer::Create(frame_provider_);