Avoid redundantly setting tex parameters

cc/gl_renderer_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/gl_renderer.h"
 
 #include "cc/draw_quad.h"
 #include "cc/prioritized_resource_manager.h"
 #include "cc/resource_provider.h"
 #include "cc/settings.h"
@@ skipping 467 matching lines @@
     // them both a pointer to a variable on the stack.
     context->setLastCallWasSetVisibilityPointer(&lastCallWasSetVisiblity);
     mockClient.setLastCallWasSetVisibilityPointer(&lastCallWasSetVisiblity);
     renderer.setVisible(true);
     renderer.drawFrame(mockClient.renderPassesInDrawOrder(), mockClient.renderPasses());
     renderer.setVisible(false);
     EXPECT_TRUE(lastCallWasSetVisiblity);
 }
 
 
-class ActiveTextureTrackingContext : public FakeWebGraphicsContext3D {
+class TextureStateTrackingContext : public FakeWebGraphicsContext3D {
 public:
-    ActiveTextureTrackingContext()
+    TextureStateTrackingContext()
         : m_activeTexture(GL_INVALID_ENUM)
+        , m_inDraw(false)
     {
     }
 
     virtual WebString getString(WGC3Denum name)
     {
         if (name == GL_EXTENSIONS)
             return WebString("GL_OES_EGL_image_external");
         return WebString();
     }
 
+    // We shouldn't set any texture parameters during the draw sequence, although
+    // we might when creating the quads.
+    void setInDraw() { m_inDraw = true; }
+
+    virtual void texParameteri(WGC3Denum target, WGC3Denum pname, WGC3Dint param)
+    {
+        if (m_inDraw)
+            ADD_FAILURE();
+    }
+
     virtual void activeTexture(WGC3Denum texture)
     {
         EXPECT_NE(texture, m_activeTexture);
         m_activeTexture = texture;
     }
 
     WGC3Denum activeTexture() const { return m_activeTexture; }
 
 private:
+    bool m_inDraw;
     WGC3Denum m_activeTexture;
 };
 
 TEST(GLRendererTest2, activeTextureState)
 {
     FakeRendererClient fakeClient;
-    scoped_ptr<GraphicsContext> outputSurface(FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new ActiveTextureTrackingContext)));
-    ActiveTextureTrackingContext* context = static_cast<ActiveTextureTrackingContext*>(outputSurface->context3D());
+    scoped_ptr<GraphicsContext> outputSurface(FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new TextureStateTrackingContext)));
+    TextureStateTrackingContext* context = static_cast<TextureStateTrackingContext*>(outputSurface->context3D());
     scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(outputSurface.get()));
     FakeRendererGL renderer(&fakeClient, resourceProvider.get());
 
     EXPECT_TRUE(renderer.initialize());
 
     cc::RenderPass::Id id(1, 1);
     scoped_ptr<TestRenderPass> pass = TestRenderPass::create(id, gfx::Rect(0, 0, 100, 100), WebTransformationMatrix());
     pass->appendOneOfEveryQuadType(resourceProvider.get());
 
+    context->setInDraw();
+
     cc::DirectRenderer::DrawingFrame drawingFrame;
     renderer.beginDrawingFrame(drawingFrame);
     EXPECT_EQ(context->activeTexture(), GL_TEXTURE0);
 
     for (cc::QuadList::backToFrontIterator it = pass->quadList().backToFrontBegin();
          it != pass->quadList().backToFrontEnd(); ++it) {
         renderer.drawQuad(drawingFrame, *it);
     }
     EXPECT_EQ(context->activeTexture(), GL_TEXTURE0);
 }
 
 }  // namespace
 }  // namespace cc