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

Unified Diff: cc/test/layer_tree_test.cc

Issue 1418953002: cc: Send shared variables between main and impl side using the channel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 1 month 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/test/layer_tree_test.h ('k') | cc/trees/channel_main.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_test.cc
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index 55c0b033a682cd4e09b0b3ee3e72560a5911d6e7..9f03a8c748334b18928eee7e59d8d3d70d753d42 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -181,6 +181,11 @@ class ThreadProxyForTest : public ThreadProxy {
test_hooks_->SendBeginMainFrameNotExpectedSoon();
}
+ void DidActivateSyncTree() override {
+ ThreadProxy::DidActivateSyncTree();
+ test_hooks_->DidActivateSyncTree();
+ }
+
void SetThrottleFrameProductionOnImpl(bool throttle) override {
ThreadProxy::SetThrottleFrameProductionOnImpl(throttle);
test_hooks_->SetThrottleFrameProductionOnImpl(throttle);
@@ -248,11 +253,25 @@ class ThreadProxyForTest : public ThreadProxy {
test_hooks_->FinishGLOnImpl();
}
- void StartCommitOnImpl(CompletionEvent* completion) override {
- ThreadProxy::StartCommitOnImpl(completion);
+ void StartCommitOnImpl(CompletionEvent* completion,
+ LayerTreeHost* layer_tree_host,
+ bool hold_commit_for_activation) override {
+ ThreadProxy::StartCommitOnImpl(completion, layer_tree_host,
+ hold_commit_for_activation);
test_hooks_->StartCommitOnImpl();
}
+ void InitializeImplOnImpl(CompletionEvent* completion,
+ LayerTreeHost* layer_tree_host) override {
+ ThreadProxy::InitializeImplOnImpl(completion, layer_tree_host);
+ test_hooks_->InitializeImplOnImpl();
+ }
+
+ void LayerTreeHostClosedOnImpl(CompletionEvent* completion) override {
+ test_hooks_->WillCloseLayerTreeHostOnImpl();
+ ThreadProxy::LayerTreeHostClosedOnImpl(completion);
+ }
+
void DidCompleteSwapBuffers() override {
ThreadProxy::DidCompleteSwapBuffers();
test_hooks_->ReceivedDidCompleteSwapBuffers();
« no previous file with comments | « cc/test/layer_tree_test.h ('k') | cc/trees/channel_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698