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

Unified Diff: cc/trees/remote_channel_impl.cc

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/proxy_main.cc ('k') | cc/trees/remote_channel_main.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/remote_channel_impl.cc
diff --git a/cc/trees/remote_channel_impl.cc b/cc/trees/remote_channel_impl.cc
index 2e8d745d0171c8ff44a1386b7b2464c0187d4603..0ffaecf83d0c73406bfea08206672d141dd7b218 100644
--- a/cc/trees/remote_channel_impl.cc
+++ b/cc/trees/remote_channel_impl.cc
@@ -130,12 +130,14 @@ void RemoteChannelImpl::HandleProto(
proto.begin_main_frame_aborted_message();
CommitEarlyOutReason reason = CommitEarlyOutReasonFromProtobuf(
begin_main_frame_aborted_message.reason());
+ std::vector<std::unique_ptr<SwapPromise>> empty_swap_promises;
VLOG(1) << "Received BeginMainFrameAborted from the engine with reason: "
<< CommitEarlyOutReasonToString(reason);
ImplThreadTaskRunner()->PostTask(
FROM_HERE,
base::Bind(&ProxyImpl::BeginMainFrameAbortedOnImpl,
- proxy_impl_weak_ptr_, reason, main_thread_start_time));
+ proxy_impl_weak_ptr_, reason, main_thread_start_time,
+ base::Passed(&empty_swap_promises)));
} break;
case proto::CompositorMessageToImpl::SET_NEEDS_REDRAW: {
VLOG(1) << "Received redraw request from the engine.";
« no previous file with comments | « cc/trees/proxy_main.cc ('k') | cc/trees/remote_channel_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698