summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_unittest.cc
diff options
context:
space:
mode:
authormithro <mithro@mithis.com>2015-05-06 17:44:48 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-07 00:45:19 +0000
commite88f9dd1cf36789957044409e97e63987c23307c (patch)
treed517883a0c49e6b1d618c48993834faf0e28b462 /cc/trees/layer_tree_host_unittest.cc
parent62f1f9295154932cd3f03aa908d9197f7f6901af (diff)
downloadchromium_src-e88f9dd1cf36789957044409e97e63987c23307c.zip
chromium_src-e88f9dd1cf36789957044409e97e63987c23307c.tar.gz
chromium_src-e88f9dd1cf36789957044409e97e63987c23307c.tar.bz2
cc: Make HasImplThread() function work in AfterTest().
Before we run AfterTest() the layer_tree_host is destroyed (to allow AfterTest to check that proper cleanup has occurred) which means that the proxy() object is null. This means that HasImplThread() would previously return false in the AfterTest() method even when running on a test which was created using RunTest(threaded=true). R=danakj Review URL: https://codereview.chromium.org/1126973002 Cr-Commit-Position: refs/heads/master@{#328667}
Diffstat (limited to 'cc/trees/layer_tree_host_unittest.cc')
-rw-r--r--cc/trees/layer_tree_host_unittest.cc25
1 files changed, 25 insertions, 0 deletions
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index b9d8bc9..f2ed38e 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -86,6 +86,31 @@ class LayerTreeHostTest : public LayerTreeTest {
PrioritizedResourceManager* contents_texture_manager_;
};
+class LayerTreeHostTestHasImplThreadTest : public LayerTreeHostTest {
+ public:
+ LayerTreeHostTestHasImplThreadTest() : threaded_(false) {}
+
+ void RunTest(bool threaded,
+ bool delegating_renderer,
+ bool impl_side_painting) override {
+ threaded_ = threaded;
+ LayerTreeHostTest::RunTest(threaded, delegating_renderer,
+ impl_side_painting);
+ }
+
+ void BeginTest() override {
+ EXPECT_EQ(threaded_, HasImplThread());
+ EndTest();
+ }
+
+ void AfterTest() override { EXPECT_EQ(threaded_, HasImplThread()); }
+
+ private:
+ bool threaded_;
+};
+
+SINGLE_AND_MULTI_THREAD_IMPL_TEST_F(LayerTreeHostTestHasImplThreadTest);
+
class LayerTreeHostTestSetNeedsCommitInsideLayout : public LayerTreeHostTest {
protected:
void BeginTest() override { PostSetNeedsCommitToMainThread(); }