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

Unified Diff: cc/software_renderer.cc

Issue 11618026: Move filters to RenderPassDrawQuad (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « cc/scoped_ptr_vector.h ('k') | cc/software_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/software_renderer.cc
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 3aef94903e5b9a70be07a9fb48fd30042ae8ef0f..44e758d101b116e1e0b33738f71427e887435d99 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -285,11 +285,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());
@@ -310,7 +305,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);
« no previous file with comments | « cc/scoped_ptr_vector.h ('k') | cc/software_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698