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

Unified Diff: cc/layer_tree_host_unittest.cc

Issue 11464007: Add the DelegatingRenderer class with its initialize path. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: init Created 8 years 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
Index: cc/layer_tree_host_unittest.cc
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index e2fd1afe09e2f3fb9762b278a7031da9b0ed5eb6..6cb02c51ee2d55f57bde784656ceedc06f1c3248 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -2959,11 +2959,6 @@ public:
m_children.push_back(ContentLayerWithUpdateTracking::create(&m_client));
}
- virtual scoped_ptr<OutputSurface> createOutputSurface()
- {
- return FakeOutputSurface::Create3d(CompositorFakeWebGraphicsContext3DWithEndQueryCausingLostContext::create(WebGraphicsContext3D::Attributes()).PassAs<WebKit::WebGraphicsContext3D>()).PassAs<OutputSurface>();
- }
-
virtual void beginTest()
{
m_layerTreeHost->setRootLayer(m_parent);
@@ -3334,7 +3329,8 @@ TEST(LayerTreeHostTest, LimitPartialUpdates)
TEST(LayerTreeHostTest, PartialUpdatesWithGLRenderer)
{
bool useSoftwareRendering = false;
- FakeLayerImplTreeHostClient client(useSoftwareRendering);
+ bool useDelegatingRenderer = false;
+ FakeLayerImplTreeHostClient client(useSoftwareRendering, useDelegatingRenderer);
LayerTreeSettings settings;
settings.maxPartialTextureUpdates = 4;
@@ -3347,7 +3343,8 @@ TEST(LayerTreeHostTest, PartialUpdatesWithGLRenderer)
TEST(LayerTreeHostTest, PartialUpdatesWithSoftwareRenderer)
{
bool useSoftwareRendering = true;
- FakeLayerImplTreeHostClient client(useSoftwareRendering);
+ bool useDelegatingRenderer = false;
+ FakeLayerImplTreeHostClient client(useSoftwareRendering, useDelegatingRenderer);
LayerTreeSettings settings;
settings.maxPartialTextureUpdates = 4;
@@ -3357,5 +3354,33 @@ TEST(LayerTreeHostTest, PartialUpdatesWithSoftwareRenderer)
EXPECT_EQ(4u, host->settings().maxPartialTextureUpdates);
}
+TEST(LayerTreeHostTest, PartialUpdatesWithDelegatingRendererAndGLContent)
+{
+ bool useSoftwareRendering = false;
+ bool useDelegatingRenderer = true;
+ FakeLayerImplTreeHostClient client(useSoftwareRendering, useDelegatingRenderer);
+
+ LayerTreeSettings settings;
+ settings.maxPartialTextureUpdates = 4;
+
+ scoped_ptr<LayerTreeHost> host = LayerTreeHost::create(&client, settings, scoped_ptr<Thread>());
+ EXPECT_TRUE(host->initializeRendererIfNeeded());
+ EXPECT_EQ(0u, host->settings().maxPartialTextureUpdates);
+}
+
+TEST(LayerTreeHostTest, PartialUpdatesWithDelegatingRendererAndSoftwareContent)
+{
+ bool useSoftwareRendering = true;
+ bool useDelegatingRenderer = true;
+ FakeLayerImplTreeHostClient client(useSoftwareRendering, useDelegatingRenderer);
+
+ LayerTreeSettings settings;
+ settings.maxPartialTextureUpdates = 4;
+
+ scoped_ptr<LayerTreeHost> host = LayerTreeHost::create(&client, settings, scoped_ptr<Thread>());
+ EXPECT_TRUE(host->initializeRendererIfNeeded());
+ EXPECT_EQ(0u, host->settings().maxPartialTextureUpdates);
+}
+
} // namespace
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698