Revert 191364 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."

trunk/src/cc/quads/draw_quad_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/quads/draw_quad.h"
 
 #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"
 #include "cc/quads/io_surface_draw_quad.h"
 #include "cc/quads/picture_draw_quad.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/stream_video_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
@@ skipping 61 matching lines @@
   EXPECT_EQ(copy_shared_state, copy->shared_quad_state);
 }
 
 #define CREATE_SHARED_STATE() \
     scoped_ptr<SharedQuadState> shared_state(CreateSharedQuadState()); \
     scoped_ptr<SharedQuadState> copy_shared_state(shared_state->Copy()); \
 
 #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())); \
     CompareDrawQuad(quad_all.get(), copy_all.get(), copy_shared_state.get()); \
     copy_quad = Type::MaterialCast(copy_all.get());
 
 #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)); \
     CompareDrawQuad(quad_all.get(), copy_all.get(), copy_shared_state.get()); \
     copy_quad = Type::MaterialCast(copy_all.get());
 
 #define CREATE_QUAD_1_NEW(Type, a) \
     scoped_ptr<Type> quad_new(Type::Create()); \
     { \
       QUAD_DATA \
@@ skipping 536 matching lines @@
   EXPECT_EQ(u_plane.resource_id, copy_quad->u_plane.resource_id);
   EXPECT_EQ(u_plane.size, copy_quad->u_plane.size);
   EXPECT_EQ(u_plane.format, copy_quad->u_plane.format);
   EXPECT_EQ(v_plane.resource_id, copy_quad->v_plane.resource_id);
   EXPECT_EQ(v_plane.size, copy_quad->v_plane.size);
   EXPECT_EQ(v_plane.format, copy_quad->v_plane.format);
 }
 
 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;
   gfx::Rect content_rect(30, 40, 20, 30);
   float contents_scale = 3.141592f;
   scoped_refptr<PicturePileImpl> picture_pile = PicturePileImpl::Create(false);
   CREATE_SHARED_STATE();
 
   CREATE_QUAD_7_NEW(PictureDrawQuad,
                     opaque_rect,
@@ skipping 192 matching lines @@
   EXPECT_EQ(u_plane.resource_id, quad_new->u_plane.resource_id);
   EXPECT_EQ(v_plane.resource_id, quad_new->v_plane.resource_id);
   EXPECT_EQ(3, IterateAndCount(quad_new.get()));
   EXPECT_EQ(y_plane.resource_id + 1, quad_new->y_plane.resource_id);
   EXPECT_EQ(u_plane.resource_id + 1, quad_new->u_plane.resource_id);
   EXPECT_EQ(v_plane.resource_id + 1, quad_new->v_plane.resource_id);
 }
 
 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;
   gfx::Rect content_rect(30, 40, 20, 30);
   float contents_scale = 3.141592f;
   scoped_refptr<PicturePileImpl> picture_pile = PicturePileImpl::Create(false);
 
   CREATE_SHARED_STATE();
   CREATE_QUAD_7_NEW(PictureDrawQuad,
                     opaque_rect,
                     tex_coord_rect,
                     texture_size,
                     swizzle_contents,
                     content_rect,
                     contents_scale,
                     picture_pile);
   EXPECT_EQ(0, IterateAndCount(quad_new.get()));
 }
 
 }  // namespace
 }  // namespace cc