| 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 baf1ac13f675e9954fa11e1fbae7c52262119241..de69089aaf06fa203e26bfc18fc8146621d6fef5 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -22,6 +22,7 @@
|
| #include "cc/debug/micro_benchmark.h"
|
| #include "cc/input/layer_selection_bound.h"
|
| #include "cc/layers/layer.h"
|
| +#include "cc/output/begin_frame_args.h"
|
| #include "cc/output/copy_output_request.h"
|
| #include "cc/output/copy_output_result.h"
|
| #include "cc/resources/single_release_callback.h"
|
| @@ -55,10 +56,11 @@ namespace cc {
|
| class Layer;
|
| }
|
|
|
| +using blink::WebBeginFrameArgs;
|
| using blink::WebFloatPoint;
|
| +using blink::WebRect;
|
| using blink::WebSelectionBound;
|
| using blink::WebSize;
|
| -using blink::WebRect;
|
|
|
| namespace content {
|
| namespace {
|
| @@ -745,9 +747,10 @@ void RenderWidgetCompositor::DidBeginMainFrame() {
|
| widget_->InstrumentDidBeginFrame();
|
| }
|
|
|
| -void RenderWidgetCompositor::Animate(base::TimeTicks frame_begin_time) {
|
| - widget_->webwidget()->animate(
|
| - (frame_begin_time - base::TimeTicks()).InSecondsF());
|
| +void RenderWidgetCompositor::BeginMainFrame(const cc::BeginFrameArgs& args) {
|
| + double frame_time = (args.frame_time - base::TimeTicks()).InSecondsF();
|
| + WebBeginFrameArgs web_begin_frame_args = WebBeginFrameArgs(frame_time);
|
| + widget_->webwidget()->beginFrame(web_begin_frame_args);
|
| }
|
|
|
| void RenderWidgetCompositor::Layout() {
|
|
|