diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 16:35:04 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 16:35:04 +0000 |
| commit | 060448534ff6b708ec19220c63c4d86efbe87b50 (patch) | |
| tree | 047be1f580e7da573c772006cdd5290ba1cdf824 /cc/quads | |
| parent | ed3e277f57affc9b369cb65e3720a1a8ee39b6e1 (diff) | |
| download | chromium_src-060448534ff6b708ec19220c63c4d86efbe87b50.zip chromium_src-060448534ff6b708ec19220c63c4d86efbe87b50.tar.gz chromium_src-060448534ff6b708ec19220c63c4d86efbe87b50.tar.bz2 | |
Revert 191364 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."
> cc: Add ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp
>
> And fix compile errors that it causes.
>
> Review URL: https://codereview.chromium.org/13206004
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/13316003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/quads')
| -rw-r--r-- | cc/quads/draw_quad_unittest.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc index 7177e6b..043a785 100644 --- a/cc/quads/draw_quad_unittest.cc +++ b/cc/quads/draw_quad_unittest.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "base/bind.h" -#include "base/compiler_specific.h" #include "cc/base/math_util.h" #include "cc/quads/checkerboard_draw_quad.h" #include "cc/quads/debug_border_draw_quad.h" @@ -89,13 +88,13 @@ void CompareDrawQuad(DrawQuad* quad, #define QUAD_DATA \ gfx::Rect quad_rect(30, 40, 50, 60); \ gfx::Rect quad_visible_rect(40, 50, 30, 20); \ - gfx::Rect ALLOW_UNUSED quad_opaque_rect(60, 55, 10, 10); \ - bool ALLOW_UNUSED needs_blending = true; + gfx::Rect quad_opaque_rect(60, 55, 10, 10); \ + bool needs_blending = true; #define SETUP_AND_COPY_QUAD_NEW(Type, quad) \ scoped_ptr<DrawQuad> copy_new(quad_new->Copy(copy_shared_state.get())); \ CompareDrawQuad(quad_new.get(), copy_new.get(), copy_shared_state.get()); \ - const Type* ALLOW_UNUSED copy_quad = Type::MaterialCast(copy_new.get()); + const Type* copy_quad = Type::MaterialCast(copy_new.get()); #define SETUP_AND_COPY_QUAD_ALL(Type, quad) \ scoped_ptr<DrawQuad> copy_all(quad_all->Copy(copy_shared_state.get())); \ @@ -105,7 +104,7 @@ void CompareDrawQuad(DrawQuad* quad, #define SETUP_AND_COPY_QUAD_NEW_1(Type, quad, a) \ scoped_ptr<DrawQuad> copy_new(quad_new->Copy(copy_shared_state.get(), a)); \ CompareDrawQuad(quad_new.get(), copy_new.get(), copy_shared_state.get()); \ - const Type* ALLOW_UNUSED copy_quad = Type::MaterialCast(copy_new.get()); + const Type* copy_quad = Type::MaterialCast(copy_new.get()); #define SETUP_AND_COPY_QUAD_ALL_1(Type, quad, a) \ scoped_ptr<DrawQuad> copy_all(quad_all->Copy(copy_shared_state.get(), a)); \ @@ -662,6 +661,7 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) { TEST(DrawQuadTest, CopyPictureDrawQuad) { gfx::Rect opaque_rect(33, 44, 22, 33); + unsigned resource_id = 104; gfx::RectF tex_coord_rect(31.f, 12.f, 54.f, 20.f); gfx::Size texture_size(85, 32); bool swizzle_contents = true; @@ -874,6 +874,7 @@ TEST_F(DrawQuadIteratorTest, YUVVideoDrawQuad) { TEST_F(DrawQuadIteratorTest, PictureDrawQuad) { gfx::Rect opaque_rect(33, 44, 22, 33); + unsigned resource_id = 104; gfx::RectF tex_coord_rect(31.f, 12.f, 54.f, 20.f); gfx::Size texture_size(85, 32); bool swizzle_contents = true; |