Avoid redundantly setting tex parameters

cc/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/draw_quad.h"
 
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/debug_border_draw_quad.h"
 #include "cc/io_surface_draw_quad.h"
 #include "cc/render_pass_draw_quad.h"
@@ skipping 132 matching lines @@
 #define CREATE_QUAD_8_1(Type, a, b, c, d, e, f, g, h, copyA) \
     QUAD_DATA \
     scoped_ptr<Type> quad(Type::create(sharedState.get(), quadRect, a, b, c, d, e, f, g, h)); \
     SETUP_AND_COPY_QUAD_1(Type, quad, copyA);
 
 #define CREATE_QUAD_9(Type, a, b, c, d, e, f, g, h, i) \
     QUAD_DATA \
     scoped_ptr<Type> quad(Type::create(sharedState.get(), quadRect, a, b, c, d, e, f, g, h, i)); \
     SETUP_AND_COPY_QUAD(Type, quad);
 
-#define CREATE_QUAD_10(Type, a, b, c, d, e, f, g, h, i, j) \
-    QUAD_DATA \
-    scoped_ptr<Type> quad(Type::create(sharedState.get(), quadRect, a, b, c, d, e, f, g, h, i, j)); \
-    SETUP_AND_COPY_QUAD(Type, quad);
-
 TEST(DrawQuadTest, copyCheckerboardDrawQuad)
 {
     SkColor color = 0xfabb0011;
     CREATE_SHARED_STATE();
     CREATE_QUAD_1(CheckerboardDrawQuad, color);
     EXPECT_EQ(color, copyQuad->color());
 }
 
 TEST(DrawQuadTest, copyDebugBorderDrawQuad)
 {
@@ skipping 77 matching lines @@
     EXPECT_FLOAT_RECT_EQ(uvRect, copyQuad->uvRect());
     EXPECT_EQ(flipped, copyQuad->flipped());
 }
 
 TEST(DrawQuadTest, copyTileDrawQuad)
 {
     gfx::Rect opaqueRect(33, 44, 22, 33);
     unsigned resourceId = 104;
     gfx::Vector2d textureOffset(-31, 47);
     gfx::Size textureSize(85, 32);
-    GLint textureFilter = 82;
     bool swizzleContents = true;
     bool leftEdgeAA = true;
     bool topEdgeAA = true;
     bool rightEdgeAA = false;
     bool bottomEdgeAA = true;
 
     CREATE_SHARED_STATE();
-    CREATE_QUAD_10(TileDrawQuad, opaqueRect, resourceId, textureOffset, textureSize, textureFilter, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA);
+    CREATE_QUAD_9(TileDrawQuad, opaqueRect, resourceId, textureOffset, textureSize, swizzleContents, leftEdgeAA, topEdgeAA, rightEdgeAA, bottomEdgeAA);
     EXPECT_RECT_EQ(opaqueRect, copyQuad->opaqueRect());
     EXPECT_EQ(resourceId, copyQuad->resourceId());
     EXPECT_EQ(textureOffset, copyQuad->textureOffset());
     EXPECT_EQ(textureSize, copyQuad->textureSize());
-    EXPECT_EQ(textureFilter, copyQuad->textureFilter());
     EXPECT_EQ(swizzleContents, copyQuad->swizzleContents());
     EXPECT_EQ(leftEdgeAA, copyQuad->leftEdgeAA());
     EXPECT_EQ(topEdgeAA, copyQuad->topEdgeAA());
     EXPECT_EQ(rightEdgeAA, copyQuad->rightEdgeAA());
     EXPECT_EQ(bottomEdgeAA, copyQuad->bottomEdgeAA());
 }
 
 TEST(DrawQuadTest, copyYUVVideoDrawQuad)
 {
     gfx::SizeF texScale(0.75, 0.5);
@@ skipping 19 matching lines @@
     EXPECT_EQ(uPlane.resourceId, copyQuad->uPlane().resourceId);
     EXPECT_EQ(uPlane.size, copyQuad->uPlane().size);
     EXPECT_EQ(uPlane.format, copyQuad->uPlane().format);
     EXPECT_EQ(vPlane.resourceId, copyQuad->vPlane().resourceId);
     EXPECT_EQ(vPlane.size, copyQuad->vPlane().size);
     EXPECT_EQ(vPlane.format, copyQuad->vPlane().format);
 }
 
 }  // namespace
 }  // namespace cc