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

Unified Diff: cc/trees/remote_channel_main.h

Issue 2188093002: cc: Complete swap promise for aborted commit after pending activation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: post rebase fix Created 4 years, 4 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/trees/remote_channel_impl.cc ('k') | cc/trees/remote_channel_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/remote_channel_main.h
diff --git a/cc/trees/remote_channel_main.h b/cc/trees/remote_channel_main.h
index e162d323ce00164ac5ffef425f58c744094ac1d5..50845de0d82705d188ac3ce958aa70ccac7014e6 100644
--- a/cc/trees/remote_channel_main.h
+++ b/cc/trees/remote_channel_main.h
@@ -49,7 +49,8 @@ class CC_EXPORT RemoteChannelMain : public ChannelMain,
void SetNeedsCommitOnImpl() override;
void BeginMainFrameAbortedOnImpl(
CommitEarlyOutReason reason,
- base::TimeTicks main_thread_start_time) override;
+ base::TimeTicks main_thread_start_time,
+ std::vector<std::unique_ptr<SwapPromise>> swap_promises) override;
void NotifyReadyToCommitOnImpl(CompletionEvent* completion,
LayerTreeHost* layer_tree_host,
base::TimeTicks main_thread_start_time,
« no previous file with comments | « cc/trees/remote_channel_impl.cc ('k') | cc/trees/remote_channel_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698