Correct the code that suppresses multiple paint rects to avoid the

single-core perf regressions.

TBR=chase
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/501151

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35093 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index 8a3513c..03beb8f 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -455,12 +455,6 @@ void RenderWidget::DoDeferredUpdate() {
 
   HISTOGRAM_COUNTS_100("MPArch.RW_PaintRectCount", update.paint_rects.size());
 
-  // The scroll damage is just another rectangle to paint and copy.
-  std::vector<gfx::Rect> copy_rects;
-  copy_rects.swap(update.paint_rects);
-  if (!scroll_damage.IsEmpty())
-    copy_rects.push_back(scroll_damage);
-
   // TODO(darin): Re-enable painting multiple damage rects once the
   // page-cycler regressions are resolved.  See bug 29589.
   if (update.scroll_rect.IsEmpty()) {
@@ -468,6 +462,12 @@ void RenderWidget::DoDeferredUpdate() {
     update.paint_rects.push_back(bounds);
   }
 
+  // The scroll damage is just another rectangle to paint and copy.
+  std::vector<gfx::Rect> copy_rects;
+  copy_rects.swap(update.paint_rects);
+  if (!scroll_damage.IsEmpty())
+    copy_rects.push_back(scroll_damage);
+
   for (size_t i = 0; i < copy_rects.size(); ++i)
     PaintRect(copy_rects[i], bounds.origin(), canvas.get());