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

Unified Diff: cc/render_pass.cc

Issue 11175009: Implement SkImageFilter support in the compositor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated to ToT Created 8 years, 2 months 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/render_pass.cc
diff --git a/cc/render_pass.cc b/cc/render_pass.cc
index c14a51ad21900058e9f29baf6fd9fb3e6e9b2c99..e89187e9890dc9957337f6e689381b3eadbbcab4 100644
--- a/cc/render_pass.cc
+++ b/cc/render_pass.cc
@@ -12,6 +12,9 @@
#include "cc/quad_culler.h"
#include "cc/shared_quad_state.h"
#include "cc/solid_color_draw_quad.h"
+#include "SkImageFilter.h"
danakj 2012/10/22 18:00:43 nit: sorting after rebase
+#include "cc/shared_quad_state.h"
+#include "cc/solid_color_draw_quad.h"
using WebKit::WebTransformationMatrix;
@@ -28,6 +31,7 @@ CCRenderPass::CCRenderPass(Id id, gfx::Rect outputRect, const WebKit::WebTransfo
, m_outputRect(outputRect)
, m_hasTransparentBackground(true)
, m_hasOcclusionFromOutsideTargetSurface(false)
+ , m_filter(0)
{
DCHECK(id.layerId > 0);
DCHECK(id.index >= 0);
@@ -35,6 +39,7 @@ CCRenderPass::CCRenderPass(Id id, gfx::Rect outputRect, const WebKit::WebTransfo
CCRenderPass::~CCRenderPass()
{
+ SkSafeUnref(m_filter);
}
scoped_ptr<CCRenderPass> CCRenderPass::copy(Id newId) const
@@ -47,6 +52,7 @@ scoped_ptr<CCRenderPass> CCRenderPass::copy(Id newId) const
copyPass->setHasOcclusionFromOutsideTargetSurface(m_hasOcclusionFromOutsideTargetSurface);
copyPass->setFilters(m_filters);
copyPass->setBackgroundFilters(m_backgroundFilters);
+ copyPass->setFilter(m_filter);
return copyPass.Pass();
}
@@ -103,4 +109,8 @@ void CCRenderPass::appendQuadsToFillScreen(CCLayerImpl* rootLayer, SkColor scree
}
}
+void CCRenderPass::setFilter(SkImageFilter* filter) {
+ SkRefCnt_SafeAssign(m_filter, filter);
+}
+
} // namespace cc
« cc/render_pass.h ('K') | « cc/render_pass.h ('k') | cc/render_pass_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698