Index: cc/CCHeadsUpDisplayTest.cpp |
diff --git a/cc/CCHeadsUpDisplayTest.cpp b/cc/CCHeadsUpDisplayTest.cpp |
deleted file mode 100644 |
index 5ad3796fc2c643744f6c2024a995db4aba999431..0000000000000000000000000000000000000000 |
--- a/cc/CCHeadsUpDisplayTest.cpp |
+++ /dev/null |
@@ -1,113 +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 "config.h" |
- |
-#include "CCLayerTreeHost.h" |
-#include "CCThreadedTest.h" |
-#include "HeadsUpDisplayLayerChromium.h" |
-#include "LayerChromium.h" |
- |
-using namespace cc; |
-using namespace WebKitTests; |
- |
-namespace { |
- |
-class CCHeadsUpDisplayTest : public CCThreadedTest { |
-protected: |
- virtual void initializeSettings(CCLayerTreeSettings& settings) OVERRIDE |
- { |
- // Enable the HUD without requiring text. |
- settings.showPropertyChangedRects = true; |
- } |
-}; |
- |
-class DrawsContentLayerChromium : public LayerChromium { |
-public: |
- static scoped_refptr<DrawsContentLayerChromium> create() { return make_scoped_refptr(new DrawsContentLayerChromium()); } |
- virtual bool drawsContent() const OVERRIDE { return true; } |
- |
-private: |
- DrawsContentLayerChromium() : LayerChromium() { } |
- virtual ~DrawsContentLayerChromium() |
- { |
- } |
-}; |
- |
-class CCHudWithRootLayerChange : public CCHeadsUpDisplayTest { |
-public: |
- CCHudWithRootLayerChange() |
- : m_rootLayer1(DrawsContentLayerChromium::create()) |
- , m_rootLayer2(DrawsContentLayerChromium::create()) |
- , m_numCommits(0) |
- { |
- } |
- |
- virtual void beginTest() OVERRIDE |
- { |
- m_rootLayer1->setBounds(IntSize(30, 30)); |
- m_rootLayer2->setBounds(IntSize(30, 30)); |
- |
- postSetNeedsCommitToMainThread(); |
- } |
- |
- virtual void didCommit() OVERRIDE |
- { |
- ++m_numCommits; |
- |
- ASSERT_TRUE(m_layerTreeHost->hudLayer()); |
- |
- 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->hudLayer()->parent()); |
- // Unset the root layer. |
- m_layerTreeHost->setRootLayer(0); |
- break; |
- case 3: |
- EXPECT_EQ(0, m_layerTreeHost->hudLayer()->parent()); |
- // Change back to the previous root layer. |
- m_layerTreeHost->setRootLayer(m_rootLayer1); |
- break; |
- case 4: |
- EXPECT_EQ(m_rootLayer1.get(), m_layerTreeHost->hudLayer()->parent()); |
- // Unset the root layer. |
- m_layerTreeHost->setRootLayer(0); |
- break; |
- case 5: |
- EXPECT_EQ(0, m_layerTreeHost->hudLayer()->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->hudLayer()->parent()); |
- // Change directly back to the last root layer/ |
- m_layerTreeHost->setRootLayer(m_rootLayer1); |
- break; |
- case 7: |
- EXPECT_EQ(m_rootLayer1.get(), m_layerTreeHost->hudLayer()->parent()); |
- endTest(); |
- break; |
- } |
- } |
- |
- virtual void afterTest() OVERRIDE |
- { |
- } |
- |
-private: |
- scoped_refptr<DrawsContentLayerChromium> m_rootLayer1; |
- scoped_refptr<DrawsContentLayerChromium> m_rootLayer2; |
- int m_numCommits; |
-}; |
- |
-TEST_F(CCHudWithRootLayerChange, runMultiThread) |
-{ |
- runTest(true); |
-} |
- |
-} // namespace |