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

Unified Diff: content/renderer/gpu/render_widget_compositor.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
Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index f3f6489daee1f0e3dec61487b979322f8e8fe52d..23683c4f9874c6b4cc2a6dca339f3fb3d88cd444 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -21,6 +21,7 @@
#include "cc/debug/micro_benchmark.h"
#include "cc/input/layer_selection_bound.h"
#include "cc/layers/layer.h"
+#include "cc/output/activation_promise.h"
#include "cc/output/begin_frame_args.h"
#include "cc/output/copy_output_request.h"
#include "cc/output/copy_output_result.h"
@@ -527,9 +528,9 @@ RenderWidgetCompositor::CreateLatencyInfoSwapPromiseMonitor(
latency, layer_tree_host_.get(), NULL));
}
-void RenderWidgetCompositor::QueueSwapPromise(
- scoped_ptr<cc::SwapPromise> swap_promise) {
- layer_tree_host_->QueueSwapPromise(swap_promise.Pass());
+void RenderWidgetCompositor::QueuePromise(
+ scoped_ptr<cc::Promise> promise) {
+ layer_tree_host_->QueuePromise(promise.Pass());
}
int RenderWidgetCompositor::GetSourceFrameNumber() const {

Powered by Google App Engine
This is Rietveld 408576698