Move filters to RenderPassDrawQuad

cc/software_renderer.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 <public/WebImage.h>
 
 #include "base/debug/trace_event.h"
 #include "cc/debug_border_draw_quad.h"
@@ skipping 268 matching lines @@
                                             gfx::RectFToSkRect(quadVertexRect()),
                                             &m_skCurrentPaint);
 }
 
 void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const RenderPassDrawQuad* quad)
 {
     CachedResource* contentTexture = m_renderPassTextures.get(quad->render_pass_id);
     if (!contentTexture || !contentTexture->id())
         return;
 
-    const RenderPass* renderPass = frame.renderPassesById->get(quad->render_pass_id);
-    DCHECK(renderPass);
-    if (!renderPass)
-        return;
-
     DCHECK(isSoftwareResource(contentTexture->id()));
     ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, contentTexture->id());
 
     SkRect destRect = gfx::RectFToSkRect(quadVertexRect());
 
     const SkBitmap* content = lock.skBitmap();
 
     SkRect contentRect;
     content->getBounds(&contentRect);
 
     SkMatrix contentMat;
     contentMat.setRectToRect(contentRect, destRect, SkMatrix::kFill_ScaleToFit);
 
     skia::RefPtr<SkShader> shader = skia::AdoptRef(
         SkShader::CreateBitmapShader(*content,
                                      SkShader::kClamp_TileMode,
                                      SkShader::kClamp_TileMode));
     shader->setLocalMatrix(contentMat);
     m_skCurrentPaint.setShader(shader.get());
 
-    SkImageFilter* filter = renderPass->filter.get();
+    SkImageFilter* filter = quad->filter.get();
     if (filter)
         m_skCurrentPaint.setImageFilter(filter);
 
     if (quad->mask_resource_id) {
         ResourceProvider::ScopedReadLockSoftware maskLock(m_resourceProvider, quad->mask_resource_id);
 
         const SkBitmap* mask = maskLock.skBitmap();
 
         SkRect maskRect = SkRect::MakeXYWH(
             quad->mask_uv_rect.x() * mask->width(),
@@ skipping 50 matching lines @@
 }
 
 void SoftwareRenderer::setVisible(bool visible)
 {
     if (m_visible == visible)
         return;
     m_visible = visible;
 }
 
 }  // namespace cc