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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 1126963006: Move VISUAL_STATE promise to activation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Current state (presubmit warnings, cc_unittests tests failing) 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
« cc/trees/layer_tree_host_impl.cc ('K') | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index b984b35bdef20e5a431833cac01654cf0cf9470e..e89fdb7bf060b19aba76f8ced17908e29f07a18a 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -4824,12 +4824,12 @@ struct TestSwapPromiseResult {
: did_swap_called(false),
did_not_swap_called(false),
dtor_called(false),
- reason(SwapPromise::DID_NOT_SWAP_UNKNOWN) {}
+ reason(Promise::DidNotSwap::UNKNOWN) {}
bool did_swap_called;
bool did_not_swap_called;
bool dtor_called;
- SwapPromise::DidNotSwapReason reason;
+ Promise::DidNotSwap::Reason reason;
base::Lock lock;
};
@@ -4849,7 +4849,7 @@ class TestSwapPromise : public SwapPromise {
result_->did_swap_called = true;
}
- void DidNotSwap(DidNotSwapReason reason) override {
+ void DidNotSwap(DidNotSwap::Reason reason) override {
base::AutoLock lock(result_->lock);
EXPECT_FALSE(result_->did_swap_called);
EXPECT_FALSE(result_->did_not_swap_called);
@@ -4871,9 +4871,9 @@ class LayerTreeHostTestBreakSwapPromise : public LayerTreeHostTest {
void WillBeginMainFrame() override {
ASSERT_LE(commit_count_, 2);
- scoped_ptr<SwapPromise> swap_promise(
+ scoped_ptr<Promise> swap_promise(
new TestSwapPromise(&swap_promise_result_[commit_count_]));
- layer_tree_host()->QueueSwapPromise(swap_promise.Pass());
+ layer_tree_host()->QueuePromise(swap_promise.Pass());
}
void BeginTest() override { PostSetNeedsCommitToMainThread(); }
@@ -4915,7 +4915,7 @@ class LayerTreeHostTestBreakSwapPromise : public LayerTreeHostTest {
base::AutoLock lock(swap_promise_result_[1].lock);
EXPECT_FALSE(swap_promise_result_[1].did_swap_called);
EXPECT_TRUE(swap_promise_result_[1].did_not_swap_called);
- EXPECT_EQ(SwapPromise::COMMIT_NO_UPDATE, swap_promise_result_[1].reason);
+ EXPECT_EQ(Promise::DidNotSwap::COMMIT_NO_UPDATE, swap_promise_result_[1].reason);
EXPECT_TRUE(swap_promise_result_[1].dtor_called);
}
@@ -4925,7 +4925,7 @@ class LayerTreeHostTestBreakSwapPromise : public LayerTreeHostTest {
base::AutoLock lock(swap_promise_result_[2].lock);
EXPECT_FALSE(swap_promise_result_[2].did_swap_called);
EXPECT_TRUE(swap_promise_result_[2].did_not_swap_called);
- EXPECT_EQ(SwapPromise::SWAP_FAILS, swap_promise_result_[2].reason);
+ EXPECT_EQ(Promise::DidNotSwap::SWAP_FAILS, swap_promise_result_[2].reason);
EXPECT_TRUE(swap_promise_result_[2].dtor_called);
}
}
@@ -4961,7 +4961,7 @@ class LayerTreeHostTestKeepSwapPromise : public LayerTreeTest {
switch (layer_tree_host()->source_frame_number()) {
case 1:
layer_->SetBounds(gfx::Size(10, 11));
- layer_tree_host()->QueueSwapPromise(
+ layer_tree_host()->QueuePromise(
make_scoped_ptr(new TestSwapPromise(&swap_promise_result_)));
break;
case 2:
@@ -5000,9 +5000,9 @@ class LayerTreeHostTestBreakSwapPromiseForVisibility
void SetVisibleFalseAndQueueSwapPromise() {
layer_tree_host()->SetVisible(false);
- scoped_ptr<SwapPromise> swap_promise(
+ scoped_ptr<Promise> swap_promise(
new TestSwapPromise(&swap_promise_result_));
- layer_tree_host()->QueueSwapPromise(swap_promise.Pass());
+ layer_tree_host()->QueuePromise(swap_promise.Pass());
}
void ScheduledActionWillSendBeginMainFrame() override {
@@ -5023,7 +5023,7 @@ class LayerTreeHostTestBreakSwapPromiseForVisibility
base::AutoLock lock(swap_promise_result_.lock);
EXPECT_FALSE(swap_promise_result_.did_swap_called);
EXPECT_TRUE(swap_promise_result_.did_not_swap_called);
- EXPECT_EQ(SwapPromise::COMMIT_FAILS, swap_promise_result_.reason);
+ EXPECT_EQ(Promise::DidNotSwap::COMMIT_FAILS, swap_promise_result_.reason);
EXPECT_TRUE(swap_promise_result_.dtor_called);
}
}
@@ -5043,9 +5043,9 @@ class LayerTreeHostTestBreakSwapPromiseForContext : public LayerTreeHostTest {
void LoseOutputSurfaceAndQueueSwapPromise() {
layer_tree_host()->DidLoseOutputSurface();
- scoped_ptr<SwapPromise> swap_promise(
+ scoped_ptr<Promise> swap_promise(
new TestSwapPromise(&swap_promise_result_));
- layer_tree_host()->QueueSwapPromise(swap_promise.Pass());
+ layer_tree_host()->QueuePromise(swap_promise.Pass());
}
void ScheduledActionWillSendBeginMainFrame() override {
@@ -5072,7 +5072,7 @@ class LayerTreeHostTestBreakSwapPromiseForContext : public LayerTreeHostTest {
base::AutoLock lock(swap_promise_result_.lock);
EXPECT_FALSE(swap_promise_result_.did_swap_called);
EXPECT_TRUE(swap_promise_result_.did_not_swap_called);
- EXPECT_EQ(SwapPromise::COMMIT_FAILS, swap_promise_result_.reason);
+ EXPECT_EQ(Promise::DidNotSwap::COMMIT_FAILS, swap_promise_result_.reason);
EXPECT_TRUE(swap_promise_result_.dtor_called);
}
}
@@ -5626,22 +5626,22 @@ class LayerTreeHostTestSynchronousCompositeSwapPromise
void BeginTest() override {
// Successful composite.
- scoped_ptr<SwapPromise> swap_promise0(
+ scoped_ptr<Promise> swap_promise0(
new TestSwapPromise(&swap_promise_result_[0]));
- layer_tree_host()->QueueSwapPromise(swap_promise0.Pass());
+ layer_tree_host()->QueuePromise(swap_promise0.Pass());
layer_tree_host()->Composite(gfx::FrameTime::Now());
// Fail to swap (no damage).
- scoped_ptr<SwapPromise> swap_promise1(
+ scoped_ptr<Promise> swap_promise1(
new TestSwapPromise(&swap_promise_result_[1]));
- layer_tree_host()->QueueSwapPromise(swap_promise1.Pass());
+ layer_tree_host()->QueuePromise(swap_promise1.Pass());
layer_tree_host()->SetNeedsCommit();
layer_tree_host()->Composite(gfx::FrameTime::Now());
// Fail to draw (not visible).
- scoped_ptr<SwapPromise> swap_promise2(
+ scoped_ptr<Promise> swap_promise2(
new TestSwapPromise(&swap_promise_result_[2]));
- layer_tree_host()->QueueSwapPromise(swap_promise2.Pass());
+ layer_tree_host()->QueuePromise(swap_promise2.Pass());
layer_tree_host()->SetNeedsDisplayOnAllLayers();
layer_tree_host()->SetVisible(false);
layer_tree_host()->Composite(gfx::FrameTime::Now());
@@ -5670,7 +5670,7 @@ class LayerTreeHostTestSynchronousCompositeSwapPromise
base::AutoLock lock(swap_promise_result_[1].lock);
EXPECT_FALSE(swap_promise_result_[1].did_swap_called);
EXPECT_TRUE(swap_promise_result_[1].did_not_swap_called);
- EXPECT_EQ(SwapPromise::SWAP_FAILS, swap_promise_result_[1].reason);
+ EXPECT_EQ(Promise::DidNotSwap::SWAP_FAILS, swap_promise_result_[1].reason);
EXPECT_TRUE(swap_promise_result_[1].dtor_called);
}
@@ -5679,7 +5679,7 @@ class LayerTreeHostTestSynchronousCompositeSwapPromise
base::AutoLock lock(swap_promise_result_[2].lock);
EXPECT_FALSE(swap_promise_result_[2].did_swap_called);
EXPECT_TRUE(swap_promise_result_[2].did_not_swap_called);
- EXPECT_EQ(SwapPromise::SWAP_FAILS, swap_promise_result_[2].reason);
+ EXPECT_EQ(Promise::DidNotSwap::SWAP_FAILS, swap_promise_result_[2].reason);
EXPECT_TRUE(swap_promise_result_[2].dtor_called);
}
}
« cc/trees/layer_tree_host_impl.cc ('K') | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698