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

Unified Diff: cc/heads_up_display_unittest.cc

Issue 12603013: Part 10 of cc/ directory shuffles: layers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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/heads_up_display_layer_impl.cc ('k') | cc/image_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/heads_up_display_unittest.cc
diff --git a/cc/heads_up_display_unittest.cc b/cc/heads_up_display_unittest.cc
deleted file mode 100644
index 68bc4748a86de45b1e085af536ef4eb191984438..0000000000000000000000000000000000000000
--- a/cc/heads_up_display_unittest.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2012 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 "cc/heads_up_display_layer.h"
-#include "cc/layer.h"
-#include "cc/test/layer_tree_test_common.h"
-#include "cc/trees/layer_tree_host.h"
-
-namespace cc {
-namespace {
-
-class HeadsUpDisplayTest : public ThreadedTest {
-protected:
- virtual void initializeSettings(LayerTreeSettings& settings) OVERRIDE
- {
- // Enable the HUD without requiring text.
- settings.initialDebugState.showPropertyChangedRects = true;
- }
-};
-
-class DrawsContentLayer : public Layer {
-public:
- static scoped_refptr<DrawsContentLayer> Create() { return make_scoped_refptr(new DrawsContentLayer()); }
- virtual bool DrawsContent() const OVERRIDE { return true; }
-
-private:
- DrawsContentLayer() : Layer() { }
- virtual ~DrawsContentLayer()
- {
- }
-};
-
-class HudWithRootLayerChange : public HeadsUpDisplayTest {
-public:
- HudWithRootLayerChange()
- : m_rootLayer1(DrawsContentLayer::Create())
- , m_rootLayer2(DrawsContentLayer::Create())
- , m_numCommits(0)
- {
- }
-
- virtual void beginTest() OVERRIDE
- {
- m_rootLayer1->SetBounds(gfx::Size(30, 30));
- m_rootLayer2->SetBounds(gfx::Size(30, 30));
-
- postSetNeedsCommitToMainThread();
- }
-
- virtual void didCommit() OVERRIDE
- {
- ++m_numCommits;
-
- ASSERT_TRUE(m_layerTreeHost->hud_layer());
-
- switch (m_numCommits) {
- case 1:
- // Change directly to a new root layer.
- m_layerTreeHost->SetRootLayer(m_rootLayer1);
- break;
- case 2:
- EXPECT_EQ(m_rootLayer1.get(), m_layerTreeHost->hud_layer()->parent());
- // Unset the root layer.
- m_layerTreeHost->SetRootLayer(NULL);
- break;
- case 3:
- EXPECT_EQ(0, m_layerTreeHost->hud_layer()->parent());
- // Change back to the previous root layer.
- m_layerTreeHost->SetRootLayer(m_rootLayer1);
- break;
- case 4:
- EXPECT_EQ(m_rootLayer1.get(), m_layerTreeHost->hud_layer()->parent());
- // Unset the root layer.
- m_layerTreeHost->SetRootLayer(NULL);
- break;
- case 5:
- EXPECT_EQ(0, m_layerTreeHost->hud_layer()->parent());
- // Change to a new root layer from a null root.
- m_layerTreeHost->SetRootLayer(m_rootLayer2);
- break;
- case 6:
- EXPECT_EQ(m_rootLayer2.get(), m_layerTreeHost->hud_layer()->parent());
- // Change directly back to the last root layer/
- m_layerTreeHost->SetRootLayer(m_rootLayer1);
- break;
- case 7:
- EXPECT_EQ(m_rootLayer1.get(), m_layerTreeHost->hud_layer()->parent());
- endTest();
- break;
- }
- }
-
- virtual void afterTest() OVERRIDE
- {
- }
-
-private:
- scoped_refptr<DrawsContentLayer> m_rootLayer1;
- scoped_refptr<DrawsContentLayer> m_rootLayer2;
- int m_numCommits;
-};
-
-TEST_F(HudWithRootLayerChange, runMultiThread)
-{
- runTest(true);
-}
-
-} // namespace
-} // namespace cc
« no previous file with comments | « cc/heads_up_display_layer_impl.cc ('k') | cc/image_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698