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

Unified Diff: cc/resources/picture_layer_tiling_set.cc

Issue 13206004: cc: Fix build issues for adding ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months 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
Index: cc/resources/picture_layer_tiling_set.cc
diff --git a/cc/resources/picture_layer_tiling_set.cc b/cc/resources/picture_layer_tiling_set.cc
index 67173baf947d8a56b20aa9bab783dbead8c826f0..1f22961afc599b60a1c0b984e32de4715555239a 100644
--- a/cc/resources/picture_layer_tiling_set.cc
+++ b/cc/resources/picture_layer_tiling_set.cc
@@ -4,6 +4,8 @@
#include "cc/resources/picture_layer_tiling_set.h"
+#include <limits>
+
namespace cc {
namespace {
@@ -133,7 +135,11 @@ PictureLayerTilingSet::Iterator::Iterator(
}
}
- if (ideal_tiling_ == set_->tilings_.size() && ideal_tiling_ > 0)
+ DCHECK_LE(set_->tilings_.size(),
+ static_cast<size_t>(std::numeric_limits<int>::max()));
+
+ int num_tilings = set_->tilings_.size();
+ if (ideal_tiling_ == num_tilings && ideal_tiling_ > 0)
ideal_tiling_--;
++(*this);

Powered by Google App Engine
This is Rietveld 408576698