Avoid setting activeTexture redundantly

cc/direct_renderer.h

 // 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.
 
 #ifndef CC_DIRECT_RENDERER_H_
 #define CC_DIRECT_RENDERER_H_
 
 #include "base/basictypes.h"
 #include "cc/cc_export.h"
 #include "cc/renderer.h"
@@ skipping 10 matching lines @@
 class CC_EXPORT DirectRenderer : public Renderer {
 public:
     virtual ~DirectRenderer();
 
     ResourceProvider* resourceProvider() const { return m_resourceProvider; }
 
     virtual void decideRenderPassAllocationsForFrame(const RenderPassList& renderPassesInDrawOrder) OVERRIDE;
     virtual bool haveCachedResourcesForRenderPassId(RenderPass::Id) const OVERRIDE;
     virtual void drawFrame(const RenderPassList& renderPassesInDrawOrder, const RenderPassIdHashMap& renderPassesById) OVERRIDE;
 
-protected:
-    DirectRenderer(RendererClient* client, ResourceProvider* resourceProvider);
-
     struct DrawingFrame {
         DrawingFrame();
         ~DrawingFrame();
 
         const RenderPassIdHashMap* renderPassesById;
         const RenderPass* rootRenderPass;
         const RenderPass* currentRenderPass;
         const ScopedResource* currentTexture;
 
         gfx::RectF rootDamageRect;
 
         WebKit::WebTransformationMatrix projectionMatrix;
         WebKit::WebTransformationMatrix windowMatrix;
         bool flippedY;
         gfx::RectF scissorRectInRenderPassSpace;
     };
 
+protected:
+    DirectRenderer(RendererClient* client, ResourceProvider* resourceProvider);
+
     class CachedResource : public ScopedResource {
     public:
         static scoped_ptr<CachedResource> create(ResourceProvider* resourceProvider) {
           return make_scoped_ptr(new CachedResource(resourceProvider));
         }
         virtual ~CachedResource() {}
 
         bool isComplete() const { return m_isComplete; }
         void setIsComplete(bool isComplete) { m_isComplete = isComplete; }
 
@@ skipping 35 matching lines @@
     ScopedPtrHashMap<RenderPass::Id, CachedResource> m_renderPassTextures;
     ResourceProvider* m_resourceProvider;
 
 private:
     DISALLOW_COPY_AND_ASSIGN(DirectRenderer);
 };
 
 }  // namespace cc
 
 #endif  // CC_DIRECT_RENDERER_H_