Merge 174073

cc/tiled_layer.cc

 // Copyright 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.
 
 #include "cc/tiled_layer.h"
 
+#include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "build/build_config.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_host.h"
 #include "cc/overdraw_metrics.h"
 #include "cc/tiled_layer_impl.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/rect_conversions.h"
 
 using namespace std;
@@ skipping 610 matching lines @@
         m_predictedVisibleRect.Intersect(bound);
     }
     m_previousContentBounds = contentBounds();
     m_previousVisibleRect = visibleContentRect();
 }
 
 void TiledLayer::update(ResourceUpdateQueue& queue, const OcclusionTracker* occlusion, RenderingStats& stats)
 {
     DCHECK(!m_skipsDraw && !m_failedUpdate); // Did resetUpdateState get skipped?
 
-    ContentsScalingLayer::update(queue, occlusion, stats);
+    {
+        base::AutoReset<bool> ignoreSetNeedsCommit(&m_ignoreSetNeedsCommit, true);
 
-    updateBounds();
+        ContentsScalingLayer::update(queue, occlusion, stats);
+        updateBounds();
+    }
+
     if (m_tiler->hasEmptyBounds() || !drawsContent())
         return;
 
     bool didPaint = false;
 
     // Animation pre-paint. If the layer is small, try to paint it all
     // immediately whether or not it is occluded, to avoid paint/upload
     // hiccups while it is animating.
     if (isSmallAnimatedLayer()) {
         int left, top, right, bottom;
@@ skipping 110 matching lines @@
     gfx::Rect prepaintRect = visibleContentRect();
     prepaintRect.Inset(-m_tiler->tileSize().width() * prepaintColumns,
                        -m_tiler->tileSize().height() * prepaintRows);
     gfx::Rect contentRect(gfx::Point(), contentBounds());
     prepaintRect.Intersect(contentRect);
 
     return prepaintRect;
 }
 
 }  // namespace cc