summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-19 05:01:20 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-19 05:01:20 +0000
commitce65fb78f81b40e8e87c7308ab72b4a6927e71f3 (patch)
treea6581684f4590985482dbe9d935b21324a07d6be /content
parent81cdf3a2cd5a8c9a7f25aeb8964e451c5764aaea (diff)
downloadchromium_src-ce65fb78f81b40e8e87c7308ab72b4a6927e71f3.zip
chromium_src-ce65fb78f81b40e8e87c7308ab72b4a6927e71f3.tar.gz
chromium_src-ce65fb78f81b40e8e87c7308ab72b4a6927e71f3.tar.bz2
Move scheduleAnimation trace event until after we check for update pending. This avoids spamming tracing with tons of scheduleAnimation calls.
R=jamesr@chromium.org Review URL: http://codereview.chromium.org/10065024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132952 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/render_widget.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 3ef0b9f..c4de4d2 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1169,13 +1169,14 @@ void RenderWidget::scheduleComposite() {
}
void RenderWidget::scheduleAnimation() {
+ if (animation_update_pending_)
+ return;
+
TRACE_EVENT0("gpu", "RenderWidget::scheduleAnimation");
- if (!animation_update_pending_) {
- animation_update_pending_ = true;
- if (!animation_timer_.IsRunning()) {
- animation_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(0), this,
- &RenderWidget::AnimationCallback);
- }
+ animation_update_pending_ = true;
+ if (!animation_timer_.IsRunning()) {
+ animation_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(0), this,
+ &RenderWidget::AnimationCallback);
}
}