summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-25 04:41:35 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-25 04:41:35 +0000
commit9a039aead5c77431a21db52692970a0d3e63f1fc (patch)
tree566d27a00970390640674dcfac0b265003b190a8 /webkit
parent41b323300dbf64476470f1a8dc0ac5844ddb6d4a (diff)
downloadchromium_src-9a039aead5c77431a21db52692970a0d3e63f1fc.zip
chromium_src-9a039aead5c77431a21db52692970a0d3e63f1fc.tar.gz
chromium_src-9a039aead5c77431a21db52692970a0d3e63f1fc.tar.bz2
Prepare test shell for animate changes.
R=jamesr@chromium.org Review URL: http://codereview.chromium.org/7261006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/mac/webwidget_host.mm6
-rw-r--r--webkit/tools/test_shell/webwidget_host_gtk.cc6
-rw-r--r--webkit/tools/test_shell/webwidget_host_win.cc4
3 files changed, 14 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm
index 7610644..1afefdc 100644
--- a/webkit/tools/test_shell/mac/webwidget_host.mm
+++ b/webkit/tools/test_shell/mac/webwidget_host.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -184,7 +184,11 @@ 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 b16ea3b..3287752 100644
--- a/webkit/tools/test_shell/webwidget_host_gtk.cc
+++ b/webkit/tools/test_shell/webwidget_host_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -365,7 +365,11 @@ 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 005c888..6afd48a 100644
--- a/webkit/tools/test_shell/webwidget_host_win.cc
+++ b/webkit/tools/test_shell/webwidget_host_win.cc
@@ -243,7 +243,11 @@ 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();