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 64e0982bc250d659c9c6f6b84fc762c4ef452a94..8a8bbd0b0d48457954c439951479d97e1078f8a5 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 { |
@@ -437,10 +439,6 @@ bool RenderWidgetCompositor::BeginMainFrameRequested() const { |
return layer_tree_host_->BeginMainFrameRequested(); |
} |
-void RenderWidgetCompositor::UpdateAnimations(base::TimeTicks time) { |
- layer_tree_host_->UpdateClientAnimations(time); |
-} |
- |
void RenderWidgetCompositor::SetNeedsDisplayOnAllLayers() { |
layer_tree_host_->SetNeedsDisplayOnAllLayers(); |
} |
@@ -703,7 +701,7 @@ void RenderWidgetCompositor::compositeAndReadbackAsync( |
base::Bind(&CompositeAndReadbackAsyncCallback, callback)); |
layer_tree_host_->root_layer()->RequestCopyOfOutput(request.Pass()); |
if (!threaded_) { |
- widget_->webwidget()->animate(0.0); |
+ widget_->webwidget()->beginFrame(WebBeginFrameArgs(0.0)); |
widget_->webwidget()->layout(); |
layer_tree_host_->Composite(gfx::FrameTime::Now()); |
} |
@@ -758,9 +756,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() { |