From 632bd76644c0bdce0a7223f15fa3be75648e66fd Mon Sep 17 00:00:00 2001 From: "skaslev@chromium.org" Date: Wed, 14 Nov 2012 21:21:54 +0000 Subject: Added support for CSS filters to the software compositor. BUG=160302 Review URL: https://chromiumcodereview.appspot.com/11362235 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167747 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/software_renderer.cc | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'cc/software_renderer.cc') diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc index 5c31d7b..ed37af6 100644 --- a/cc/software_renderer.cc +++ b/cc/software_renderer.cc @@ -268,6 +268,11 @@ void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende if (!contentTexture || !contentTexture->id()) return; + const RenderPass* renderPass = frame.renderPassesById->get(quad->renderPassId()); + DCHECK(renderPass); + if (!renderPass) + return; + DCHECK(isSoftwareResource(contentTexture->id())); ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, contentTexture->id()); @@ -287,6 +292,10 @@ void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende shader->setLocalMatrix(contentMat); m_skCurrentPaint.setShader(shader); + SkImageFilter* filter = renderPass->filter(); + if (filter) + m_skCurrentPaint.setImageFilter(filter); + if (quad->maskResourceId()) { ResourceProvider::ScopedReadLockSoftware maskLock(m_resourceProvider, quad->maskResourceId()); -- cgit v1.1