diff options
| author | adamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 18:27:21 +0000 |
|---|---|---|
| committer | adamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 18:27:21 +0000 |
| commit | e586cd5b219471f1133e0e58af02d05ce7677cc7 (patch) | |
| tree | ef78d59e360b25afcf7237238c8eaaf1b2627cdc | |
| parent | 3afd25e007e53469c2312cc180f089b868bf9b06 (diff) | |
| download | chromium_src-e586cd5b219471f1133e0e58af02d05ce7677cc7.zip chromium_src-e586cd5b219471f1133e0e58af02d05ce7677cc7.tar.gz chromium_src-e586cd5b219471f1133e0e58af02d05ce7677cc7.tar.bz2 | |
Remove old WEBWIDGET_HAS_ANIMATE_CHANGES ifdefs.
R=nduca@chromium.org
Review URL: http://codereview.chromium.org/7982015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102314 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/renderer/render_widget.cc | 4 | ||||
| -rw-r--r-- | content/renderer/render_widget_fullscreen_pepper.cc | 5 | ||||
| -rw-r--r-- | webkit/tools/test_shell/mac/webwidget_host.mm | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/webwidget_host_gtk.cc | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/webwidget_host_win.cc | 4 |
5 files changed, 0 insertions, 21 deletions
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 3f02e07..ce3ba1b 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -644,11 +644,7 @@ void RenderWidget::AnimateIfNeeded() { this, &RenderWidget::AnimationCallback), animationInterval); animation_task_posted_ = true; animation_update_pending_ = false; -#ifdef WEBWIDGET_HAS_ANIMATE_CHANGES webwidget_->animate(0.0); -#else - webwidget_->animate(); -#endif return; } TRACE_EVENT0("renderer", "EarlyOut_AnimatedTooRecently"); diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index 74dc9e3..22a94fe 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc @@ -65,13 +65,8 @@ class PepperWidget : public WebWidget { virtual void willEndLiveResize() { } -#ifndef WEBWIDGET_HAS_ANIMATE_CHANGES - virtual void animate() { - } -#else virtual void animate(double frameBeginTime) { } -#endif virtual void layout() { } diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm index a6e1e9c..47a9d07 100644 --- a/webkit/tools/test_shell/mac/webwidget_host.mm +++ b/webkit/tools/test_shell/mac/webwidget_host.mm @@ -184,11 +184,7 @@ void WebWidgetHost::Paint() { [NSGraphicsContext graphicsContextWithGraphicsPort:bitmap_context flipped:YES]]; -#ifdef WEBWIDGET_HAS_ANIMATE_CHANGES webwidget_->animate(0.0); -#else - webwidget_->animate(); -#endif // This may result in more invalidation webwidget_->layout(); diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc index adc81c4..6480b38 100644 --- a/webkit/tools/test_shell/webwidget_host_gtk.cc +++ b/webkit/tools/test_shell/webwidget_host_gtk.cc @@ -365,11 +365,7 @@ void WebWidgetHost::Paint() { } } -#ifdef WEBWIDGET_HAS_ANIMATE_CHANGES webwidget_->animate(0.0); -#else - webwidget_->animate(); -#endif // This may result in more invalidation webwidget_->layout(); diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc index 6afd48a..0d06d6c 100644 --- a/webkit/tools/test_shell/webwidget_host_win.cc +++ b/webkit/tools/test_shell/webwidget_host_win.cc @@ -243,11 +243,7 @@ void WebWidgetHost::Paint() { paint_rect_.width(), paint_rect_.height(), true)); } -#ifdef WEBWIDGET_HAS_ANIMATE_CHANGES webwidget_->animate(0.0); -#else - webwidget_->animate(); -#endif // This may result in more invalidation webwidget_->layout(); |