| Index: cc/test/layer_test_common.cc
|
| diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
|
| index 685c0fbc7e8466761976cd5f3e0480865cd7cdf9..17efedf79668d67fc597097107526527381a06d1 100644
|
| --- a/cc/test/layer_test_common.cc
|
| +++ b/cc/test/layer_test_common.cc
|
| @@ -9,6 +9,7 @@
|
| #include "cc/layers/append_quads_data.h"
|
| #include "cc/quads/draw_quad.h"
|
| #include "cc/quads/render_pass.h"
|
| +#include "cc/quads/render_pass_draw_quad.h"
|
| #include "cc/test/fake_output_surface.h"
|
| #include "cc/test/mock_occlusion_tracker.h"
|
| #include "cc/trees/layer_tree_host_common.h"
|
| @@ -40,8 +41,10 @@ void LayerTestCommon::VerifyQuadsExactlyCoverRect(const QuadList& quads,
|
| const gfx::Rect& rect) {
|
| Region remaining = rect;
|
|
|
| - for (size_t i = 0; i < quads.size(); ++i) {
|
| - DrawQuad* quad = quads[i];
|
| + size_t i = 0;
|
| + for (QuadList::ConstIterator iter = quads.begin(); iter != quads.end();
|
| + ++iter) {
|
| + const DrawQuad* quad = &*iter;
|
| gfx::RectF quad_rectf =
|
| MathUtil::MapClippedRect(quad->quadTransform(), gfx::RectF(quad->rect));
|
|
|
| @@ -58,6 +61,8 @@ void LayerTestCommon::VerifyQuadsExactlyCoverRect(const QuadList& quads,
|
| << quad_string << i << " remaining: " << remaining.ToString()
|
| << " quad: " << quad_rect.ToString();
|
| remaining.Subtract(quad_rect);
|
| +
|
| + ++i;
|
| }
|
|
|
| EXPECT_TRUE(remaining.IsEmpty());
|
| @@ -68,15 +73,17 @@ void LayerTestCommon::VerifyQuadsAreOccluded(const QuadList& quads,
|
| const gfx::Rect& occluded,
|
| size_t* partially_occluded_count) {
|
| // No quad should exist if it's fully occluded.
|
| - for (size_t i = 0; i < quads.size(); ++i) {
|
| + for (QuadList::ConstIterator iter = quads.begin(); iter != quads.end();
|
| + ++iter) {
|
| gfx::Rect target_visible_rect = MathUtil::MapEnclosingClippedRect(
|
| - quads[i]->quadTransform(), quads[i]->visible_rect);
|
| + iter->quadTransform(), iter->visible_rect);
|
| EXPECT_FALSE(occluded.Contains(target_visible_rect));
|
| }
|
|
|
| // Quads that are fully occluded on one axis only should be shrunken.
|
| - for (size_t i = 0; i < quads.size(); ++i) {
|
| - DrawQuad* quad = quads[i];
|
| + for (QuadList::ConstIterator iter = quads.begin(); iter != quads.end();
|
| + ++iter) {
|
| + const DrawQuad* quad = &*iter;
|
| DCHECK(quad->quadTransform().IsIdentityOrIntegerTranslation());
|
| gfx::Rect target_rect =
|
| MathUtil::MapEnclosingClippedRect(quad->quadTransform(), quad->rect);
|
|
|