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

Unified Diff: cc/layers/delegated_frame_provider_unittest.cc

Issue 1122393003: CC: Plumb LayerSettings parameter for cc::Layer construction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
« no previous file with comments | « cc/layers/contents_scaling_layer_unittest.cc ('k') | cc/layers/delegated_renderer_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 b54b9d4188dce5deabd36732d9731b4f5d4d03aa..aab9436256fe2fe888948dbade49eb0935aafd56 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 {
@@ -89,6 +90,7 @@ class DelegatedFrameProviderTest
scoped_refptr<DelegatedFrameProvider> frame_provider_;
bool resources_available_;
ReturnedResourceArray resources_;
+ LayerSettings layer_settings_;
};
TEST_F(DelegatedFrameProviderTest, SameResources) {
@@ -152,9 +154,9 @@ TEST_F(DelegatedFrameProviderTest, RefResources) {
SetFrameProvider(frame.Pass());
scoped_refptr<DelegatedRendererLayer> observer1 =
- DelegatedRendererLayer::Create(frame_provider_);
+ DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
scoped_refptr<DelegatedRendererLayer> observer2 =
- DelegatedRendererLayer::Create(frame_provider_);
+ DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
gfx::RectF damage;
@@ -210,9 +212,9 @@ TEST_F(DelegatedFrameProviderTest, RefResourcesInFrameProvider) {
SetFrameProvider(frame.Pass());
scoped_refptr<DelegatedRendererLayer> observer1 =
- DelegatedRendererLayer::Create(frame_provider_);
+ DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
scoped_refptr<DelegatedRendererLayer> observer2 =
- DelegatedRendererLayer::Create(frame_provider_);
+ DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
gfx::RectF damage;
@@ -252,9 +254,9 @@ TEST_F(DelegatedFrameProviderTest, RefResourcesInFrameProviderUntilDestroy) {
SetFrameProvider(frame.Pass());
scoped_refptr<DelegatedRendererLayer> observer1 =
- DelegatedRendererLayer::Create(frame_provider_);
+ DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
scoped_refptr<DelegatedRendererLayer> observer2 =
- DelegatedRendererLayer::Create(frame_provider_);
+ DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
gfx::RectF damage;
@@ -296,9 +298,9 @@ TEST_F(DelegatedFrameProviderTest, Damage) {
SetFrameProvider(frame.Pass());
scoped_refptr<DelegatedRendererLayer> observer1 =
- DelegatedRendererLayer::Create(frame_provider_);
+ DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
scoped_refptr<DelegatedRendererLayer> observer2 =
- DelegatedRendererLayer::Create(frame_provider_);
+ DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
gfx::RectF damage;
« no previous file with comments | « cc/layers/contents_scaling_layer_unittest.cc ('k') | cc/layers/delegated_renderer_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698