Move filters to RenderPassDrawQuad

cc/software_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/software_renderer.h"
 
 #include "cc/compositor_frame_metadata.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass.h"
 #include "cc/render_pass_draw_quad.h"
@@ skipping 72 matching lines @@
     scoped_ptr<TestRenderPass> rootRenderPass = TestRenderPass::Create();
     rootRenderPass->SetNew(rootRenderPassId, outerRect, gfx::Rect(), gfx::Transform());
     scoped_ptr<SolidColorDrawQuad> outerQuad = SolidColorDrawQuad::Create();
     outerQuad->SetNew(sharedQuadState.get(), outerRect, SK_ColorYELLOW);
     scoped_ptr<SolidColorDrawQuad> innerQuad = SolidColorDrawQuad::Create();
     innerQuad->SetNew(sharedQuadState.get(), innerRect, SK_ColorCYAN);
     rootRenderPass->AppendQuad(innerQuad.PassAs<DrawQuad>());
     rootRenderPass->AppendQuad(outerQuad.PassAs<DrawQuad>());
 
     RenderPassList list;
-    RenderPassIdHashMap hashmap;
-    list.push_back(rootRenderPass.get());
-    hashmap.add(rootRenderPassId, rootRenderPass.PassAs<RenderPass>());
-    renderer()->drawFrame(list, hashmap);
+    list.append(rootRenderPass.PassAs<RenderPass>());
+    renderer()->drawFrame(list);
 
     scoped_array<SkColor> pixels(new SkColor[deviceViewportSize().width() * deviceViewportSize().height()]);
     renderer()->getFramebufferPixels(pixels.get(), outerRect);
 
 // FIXME: This fails on Android. Endianness maybe?
 // Yellow: expects 0xFFFFFF00, was 0xFF00FFFF on android.
 // Cyan:   expects 0xFF00FFFF, was 0xFFFFFF00 on android.
 // http://crbug.com/154528
 #ifndef OS_ANDROID
     EXPECT_EQ(SK_ColorYELLOW, pixels[0]);
@@ skipping 37 matching lines @@
     scoped_ptr<TestRenderPass> rootRenderPass = TestRenderPass::Create();
     rootRenderPass->SetNew(rootRenderPassId, gfx::Rect(gfx::Point(), deviceViewportSize()), gfx::Rect(), gfx::Transform());
     scoped_ptr<TileDrawQuad> outerQuad = TileDrawQuad::Create();
     outerQuad->SetNew(sharedQuadState.get(), outerRect, outerRect, resourceYellow, gfx::RectF(gfx::PointF(), outerSize), outerSize, false, false, false, false, false);
     scoped_ptr<TileDrawQuad> innerQuad = TileDrawQuad::Create();
     innerQuad->SetNew(sharedQuadState.get(), innerRect, innerRect, resourceCyan, gfx::RectF(gfx::PointF(), innerSize), innerSize, false, false, false, false, false);
     rootRenderPass->AppendQuad(innerQuad.PassAs<DrawQuad>());
     rootRenderPass->AppendQuad(outerQuad.PassAs<DrawQuad>());
 
     RenderPassList list;
-    RenderPassIdHashMap hashmap;
-    list.push_back(rootRenderPass.get());
-    hashmap.add(rootRenderPassId, rootRenderPass.PassAs<RenderPass>());
-    renderer()->drawFrame(list, hashmap);
+    list.append(rootRenderPass.PassAs<RenderPass>());
+    renderer()->drawFrame(list);
 
     scoped_array<SkColor> pixels(new SkColor[deviceViewportSize().width() * deviceViewportSize().height()]);
     renderer()->getFramebufferPixels(pixels.get(), outerRect);
 
     EXPECT_EQ(SK_ColorYELLOW, pixels[0]);
     EXPECT_EQ(SK_ColorYELLOW, pixels[outerPixels - 1]);
     EXPECT_EQ(SK_ColorCYAN, pixels[outerSize.width() + 1]);
     EXPECT_EQ(SK_ColorCYAN, pixels[outerPixels - outerSize.width() - 2]);
 }
 
 TEST_F(SoftwareRendererTest, shouldClearRootRenderPass)
 {
     gfx::Rect viewportRect(gfx::Size(100, 100));
     size_t viewportPixels = viewportRect.width() * viewportRect.height();
     setViewportSize(viewportRect.size());
     setShouldClearRootRenderPass(false);
     initializeRenderer();
 
     RenderPassList list;
-    RenderPassIdHashMap hashmap;
-    ScopedPtrVector<RenderPass> renderPasses;
     scoped_array<SkColor> pixels(new SkColor[viewportPixels]);
 
     // Draw a fullscreen green quad in a first frame.
     RenderPass::Id rootClearPassId(1, 0);
-    TestRenderPass* rootClearPass = addRenderPass(renderPasses, rootClearPassId, viewportRect, gfx::Transform());
+    TestRenderPass* rootClearPass = addRenderPass(list, rootClearPassId, viewportRect, gfx::Transform());
     addQuad(rootClearPass, viewportRect, SK_ColorGREEN);
 
-    list.push_back(rootClearPass);
-    hashmap.set(rootClearPassId, renderPasses.take(0));
-
     renderer()->decideRenderPassAllocationsForFrame(list);
-    renderer()->drawFrame(list, hashmap);
+    renderer()->drawFrame(list);
     renderer()->getFramebufferPixels(pixels.get(), viewportRect);
 
     EXPECT_EQ(SK_ColorGREEN, pixels[0]);
     EXPECT_EQ(SK_ColorGREEN, pixels[viewportPixels - 1]);
 
-    renderPasses.clear();
-    hashmap.clear();
     list.clear();
 
     // Draw a smaller magenta rect without filling the viewport in a separate frame.
     gfx::Rect smallerRect(20, 20, 60, 60);
 
     RenderPass::Id rootSmallerPassId(2, 0);
-    TestRenderPass* rootSmallerPass = addRenderPass(renderPasses, rootSmallerPassId, viewportRect, gfx::Transform());
+    TestRenderPass* rootSmallerPass = addRenderPass(list, rootSmallerPassId, viewportRect, gfx::Transform());
     addQuad(rootSmallerPass, smallerRect, SK_ColorMAGENTA);
 
-    list.push_back(rootSmallerPass);
-    hashmap.set(rootSmallerPassId, renderPasses.take(0));
-
     renderer()->decideRenderPassAllocationsForFrame(list);
-    renderer()->drawFrame(list, hashmap);
+    renderer()->drawFrame(list);
     renderer()->getFramebufferPixels(pixels.get(), viewportRect);
 
     // If we didn't clear, the borders should still be green.
     EXPECT_EQ(SK_ColorGREEN, pixels[0]);
     EXPECT_EQ(SK_ColorGREEN, pixels[viewportPixels - 1]);
 
     EXPECT_EQ(SK_ColorMAGENTA, pixels[smallerRect.y() * viewportRect.width() + smallerRect.x()]);
     EXPECT_EQ(SK_ColorMAGENTA, pixels[(smallerRect.bottom() - 1) * viewportRect.width() + smallerRect.right() - 1]);
 }
 
 }  // namespace
 }  // namespace cc