Avoid setting activeTexture redundantly

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 "config.h"
 #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"
 #include "cc/test/fake_web_compositor_output_surface.h"
 #include "cc/test/fake_web_graphics_context_3d.h"
 #include "cc/test/test_common.h"
+#include "cc/test/render_pass_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include <public/WebTransformationMatrix.h>
 
 using namespace cc;
 using namespace WebKit;
 using namespace WebKitTests;
 
 namespace {
@@ skipping 72 matching lines @@
 
 class FakeRendererGL : public GLRenderer {
 public:
     FakeRendererGL(RendererClient* client, ResourceProvider* resourceProvider) : GLRenderer(client, resourceProvider) { }
 
     // GLRenderer methods.
 
     // Changing visibility to public.
     using GLRenderer::initialize;
     using GLRenderer::isFramebufferDiscarded;
+    using GLRenderer::drawQuad;
+    using GLRenderer::beginDrawingFrame;
 };
 
 class GLRendererTest : public testing::Test {
 protected:
     GLRendererTest()
         : m_suggestHaveBackbufferYes(1, true)
         , m_suggestHaveBackbufferNo(1, false)
         , m_context(FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new FrameCountingMemoryAllocationSettingContext())))
         , m_resourceProvider(ResourceProvider::create(m_context.get()))
         , m_renderer(&m_mockClient, m_resourceProvider.get())
@@ skipping 358 matching lines @@
     // is called. Plumb this tracking between both the RenderClient and the Context by giving
     // 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 {
+public:
+    ActiveTextureTrackingContext()
+        : m_activeTexture(GL_TEXTURE1)

[enne (OOO), 2012/11/09 06:14:55]

Maybe this should be GL_INVALID (or whatever the bogus enum is) just to avoid
any future reordering issues?

+    {
+    }
+
+    virtual WebString getString(WGC3Denum name)
+    {
+        if (name == GL_EXTENSIONS)
+            return "GL_OES_EGL_image_external";
+        return "";
+    }
+
+    virtual void activeTexture(WGC3Denum texture)
+    {
+        EXPECT_NE(texture, m_activeTexture);
+        m_activeTexture = texture;
+    }
+
+    WGC3Denum activeTexture() const { return m_activeTexture; }
+
+private:
+    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<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());
+
+    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);
+}
+
 }  // anonymous namespace