Index: content/renderer/render_widget.cc |
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc |
index 6f3af3212d31e77316d8b2e00e04096865a6f29b..c9747a950ca7c3273cd96c917b3ae1c73f8d2e1b 100644 |
--- a/content/renderer/render_widget.cc |
+++ b/content/renderer/render_widget.cc |
@@ -386,7 +386,6 @@ RenderWidget::RenderWidget(blink::WebPopupType popup_type, |
pending_window_rect_count_(0), |
suppress_next_char_events_(false), |
is_accelerated_compositing_active_(false), |
- animation_update_pending_(false), |
invalidation_task_posted_(false), |
screen_info_(screen_info), |
device_scale_factor_(screen_info_.deviceScaleFactor), |
@@ -1144,15 +1143,6 @@ void RenderWidget::ClearFocus() { |
webwidget_->setFocus(false); |
} |
-void RenderWidget::AnimationCallback() { |
- TRACE_EVENT0("renderer", "RenderWidget::AnimationCallback"); |
- if (!animation_update_pending_) { |
- TRACE_EVENT0("renderer", "EarlyOut_NoAnimationUpdatePending"); |
- return; |
- } |
- FlushPendingInputEventAck(); |
-} |
- |
void RenderWidget::InvalidationCallback() { |
TRACE_EVENT0("renderer", "RenderWidget::InvalidationCallback"); |
invalidation_task_posted_ = false; |
@@ -1179,13 +1169,6 @@ void RenderWidget::didInvalidateRect(const WebRect& rect) { |
if (invalidation_task_posted_) |
return; |
- // When GPU rendering, combine pending animations and invalidations into |
- // a single update. |
- if (is_accelerated_compositing_active_ && |
- animation_update_pending_ && |
- animation_timer_.IsRunning()) |
- return; |
- |
// Perform updating asynchronously. This serves two purposes: |
// 1) Ensures that we call WebView::Paint without a bunch of other junk |
// on the call stack. |
@@ -1213,13 +1196,6 @@ void RenderWidget::didScrollRect(int dx, int dy, |
if (invalidation_task_posted_) |
return; |
- // When GPU rendering, combine pending animations and invalidations into |
- // a single update. |
- if (is_accelerated_compositing_active_ && |
- animation_update_pending_ && |
- animation_timer_.IsRunning()) |
- return; |
- |
// Perform updating asynchronously. This serves two purposes: |
// 1) Ensures that we call WebView::Paint without a bunch of other junk |
// on the call stack. |
@@ -1384,18 +1360,6 @@ void RenderWidget::scheduleComposite() { |
} |
} |
-void RenderWidget::scheduleAnimation() { |
- if (animation_update_pending_) |
- return; |
- |
- TRACE_EVENT0("gpu", "RenderWidget::scheduleAnimation"); |
- animation_update_pending_ = true; |
- if (!animation_timer_.IsRunning()) { |
- animation_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(0), this, |
- &RenderWidget::AnimationCallback); |
- } |
-} |
- |
void RenderWidget::didChangeCursor(const WebCursorInfo& cursor_info) { |
// TODO(darin): Eliminate this temporary. |
WebCursor cursor; |