Index: chrome/renderer/render_widget.cc |
=================================================================== |
--- chrome/renderer/render_widget.cc (revision 68349) |
+++ chrome/renderer/render_widget.cc (working copy) |
@@ -467,8 +467,8 @@ |
// OK, save the pending update to a local since painting may cause more |
// invalidation. Some WebCore rendering objects only layout when painted. |
- PaintAggregator::PendingUpdate update = paint_aggregator_.GetPendingUpdate(); |
- paint_aggregator_.ClearPendingUpdate(); |
+ PaintAggregator::PendingUpdate update; |
+ paint_aggregator_.PopPendingUpdate(&update); |
gfx::Rect scroll_damage = update.GetScrollDamage(); |
gfx::Rect bounds = update.GetPaintBounds().Union(scroll_damage); |
@@ -505,13 +505,6 @@ |
HISTOGRAM_COUNTS_100("MPArch.RW_PaintRectCount", update.paint_rects.size()); |
- // TODO(darin): Re-enable painting multiple damage rects once the |
- // page-cycler regressions are resolved. See bug 29589. |
- if (update.scroll_rect.IsEmpty()) { |
- update.paint_rects.clear(); |
- update.paint_rects.push_back(bounds); |
- } |
- |
// The scroll damage is just another rectangle to paint and copy. |
copy_rects.swap(update.paint_rects); |
if (!scroll_damage.IsEmpty()) |