Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Unified Diff: cc/software_renderer.cc

Issue 11618026: Move filters to RenderPassDrawQuad (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/software_renderer.cc
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 9ebd7802af74d9a323aae6cbc565ecdefc323887..dc84fea6af38625f08fc73a4ba78395cb0589ef3 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -286,11 +286,6 @@ void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende
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());
@@ -311,7 +306,7 @@ void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende
shader->setLocalMatrix(contentMat);
m_skCurrentPaint.setShader(shader.get());
- SkImageFilter* filter = renderPass->filter.get();
+ SkImageFilter* filter = quad->filter.get();
if (filter)
m_skCurrentPaint.setImageFilter(filter);

Powered by Google App Engine
This is Rietveld 408576698