Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(309)

Unified Diff: cc/tiled_layer.cc

Issue 11644036: cc: Don't let invalidations that we're going to handle immediately cause an extra commit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ignoreSetNeedsCommit Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layer_tree_host_unittest_animation.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiled_layer.cc
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index f69411f9fc1606ff0f450abac87a24a29c20b69c..5033a2d66bb6c781782f5b77cb89a050229e7cb0 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -4,6 +4,7 @@
#include "cc/tiled_layer.h"
+#include "base/auto_reset.h"
#include "base/basictypes.h"
#include "build/build_config.h"
#include "cc/layer_impl.h"
@@ -634,9 +635,13 @@ void TiledLayer::update(ResourceUpdateQueue& queue, const OcclusionTracker* occl
{
DCHECK(!m_skipsDraw && !m_failedUpdate); // Did resetUpdateState get skipped?
- ContentsScalingLayer::update(queue, occlusion, stats);
+ {
+ base::AutoReset<bool> ignoreSetNeedsCommit(&m_ignoreSetNeedsCommit, true);
+
+ ContentsScalingLayer::update(queue, occlusion, stats);
+ updateBounds();
+ }
- updateBounds();
if (m_tiler->hasEmptyBounds() || !drawsContent())
return;
« no previous file with comments | « cc/layer_tree_host_unittest_animation.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698