| 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 f974828d94a1916a305bc8849e147573a6c1fd56..8d5049e9b097aed3801562a25b29240a8d0bdf7b 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -323,7 +323,6 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
|
| RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget,
|
| bool threaded)
|
| : threaded_(threaded),
|
| - suppress_schedule_composite_(false),
|
| widget_(widget) {
|
| }
|
|
|
| @@ -335,16 +334,7 @@ RenderWidgetCompositor::GetInputHandler() {
|
| }
|
|
|
| void RenderWidgetCompositor::SetSuppressScheduleComposite(bool suppress) {
|
| - if (suppress_schedule_composite_ == suppress)
|
| - return;
|
| -
|
| - if (suppress)
|
| - TRACE_EVENT_ASYNC_BEGIN0("gpu",
|
| - "RenderWidgetCompositor::SetSuppressScheduleComposite", this);
|
| - else
|
| - TRACE_EVENT_ASYNC_END0("gpu",
|
| - "RenderWidgetCompositor::SetSuppressScheduleComposite", this);
|
| - suppress_schedule_composite_ = suppress;
|
| + layer_tree_host_->SetDeferCommits(suppress);
|
| }
|
|
|
| bool RenderWidgetCompositor::BeginMainFrameRequested() const {
|
| @@ -687,15 +677,6 @@ void RenderWidgetCompositor::DidCompleteSwapBuffers() {
|
| widget_->OnSwapBuffersComplete();
|
| }
|
|
|
| -void RenderWidgetCompositor::ScheduleComposite() {
|
| - if (!suppress_schedule_composite_)
|
| - widget_->scheduleComposite();
|
| -}
|
| -
|
| -void RenderWidgetCompositor::ScheduleAnimation() {
|
| - widget_->scheduleAnimation();
|
| -}
|
| -
|
| void RenderWidgetCompositor::DidPostSwapBuffers() {
|
| widget_->OnSwapBuffersPosted();
|
| }
|
|
|