Merge 174073

cc/content_layer.cc

 // Copyright 2010 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/content_layer.h"
 
+#include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "cc/bitmap_content_layer_updater.h"
 #include "cc/bitmap_skpicture_content_layer_updater.h"
 #include "cc/content_layer_client.h"
 #include "cc/layer_painter.h"
 #include "cc/layer_tree_host.h"
 
 namespace cc {
@@ skipping 45 matching lines @@
 void ContentLayer::setTexturePriorities(const PriorityCalculator& priorityCalc)
 {
     // Update the tile data before creating all the layer's tiles.
     updateTileSizeAndTilingOption();
 
     TiledLayer::setTexturePriorities(priorityCalc);
 }
 
 void ContentLayer::update(ResourceUpdateQueue& queue, const OcclusionTracker* occlusion, RenderingStats& stats)
 {
-    createUpdaterIfNeeded();
-    updateUseLCDText();
+    {
+        base::AutoReset<bool> ignoreSetNeedsCommit(&m_ignoreSetNeedsCommit, true);
+
+        createUpdaterIfNeeded();
+        updateUseLCDText();
+    }
 
     TiledLayer::update(queue, occlusion, stats);
     m_needsDisplay = false;
 }
 
 bool ContentLayer::needMoreUpdates()
 {
     return needsIdlePaint();
 }
 
@@ skipping 54 matching lines @@
         // it does not really cause any invalidation.
         TRACE_EVENT_INSTANT0("cc", "ContentLayer::canUseLCDTextDidChange");
     }
     ++m_lcdTextChangeCount;
  
     // Need to repaint the layer with different text AA setting.
     setNeedsDisplay();
 }
 
 }  // namespace cc