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

Unified Diff: content/renderer/gpu/render_widget_compositor.h

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
Index: content/renderer/gpu/render_widget_compositor.h
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h
index 32999e2a62bd11245eb2a251cd3b4fd93169e537..c1323f807ff90db66f8dbccb5504f084cec1bc41 100644
--- a/content/renderer/gpu/render_widget_compositor.h
+++ b/content/renderer/gpu/render_widget_compositor.h
@@ -10,6 +10,7 @@
#include "base/time/time.h"
#include "base/values.h"
#include "cc/input/top_controls_state.h"
+#include "cc/output/activation_promise.h"
#include "cc/output/swap_promise.h"
#include "cc/trees/layer_tree_host_client.h"
#include "cc/trees/layer_tree_host_single_thread_client.h"
@@ -63,9 +64,11 @@ class CONTENT_EXPORT RenderWidgetCompositor
// info will be turned into a LatencyInfoSwapPromise.
scoped_ptr<cc::SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor(
ui::LatencyInfo* latency);
- // Calling QueueSwapPromise() to directly queue a SwapPromise into
+
+ // Calling QueuePromise() to directly queue a SwapPromise into
// LayerTreeHost.
- void QueueSwapPromise(scoped_ptr<cc::SwapPromise> swap_promise);
+ void QueuePromise(scoped_ptr<cc::Promise> promise);
+
int GetSourceFrameNumber() const;
void SetNeedsUpdateLayers();
void SetNeedsCommit();

Powered by Google App Engine
This is Rietveld 408576698