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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/tiled_layer.cc

Issue 11618032: Merge 174073 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: 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.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
===================================================================
--- cc/tiled_layer.cc (revision 174074)
+++ cc/tiled_layer.cc (working copy)
@@ -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 @@
{
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;
« no previous file with comments | « cc/layer_tree_host_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698