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

Unified Diff: cc/render_pass_unittest.cc

Issue 11175009: Implement SkImageFilter support in the compositor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add TODOs; comment out OVERRIDE. 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_unittest.cc
diff --git a/cc/render_pass_unittest.cc b/cc/render_pass_unittest.cc
index 6a3a0ec617ba6ddba13c9e7e157b0284f9d4d860..2a81550d8bf95e31d0165e2351a4e739e8a9d6c8 100644
--- a/cc/render_pass_unittest.cc
+++ b/cc/render_pass_unittest.cc
@@ -11,6 +11,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebFilterOperations.h>
#include <public/WebTransformationMatrix.h>
+#include "SkBlurImageFilter.h"
using WebKit::WebFilterOperation;
using WebKit::WebFilterOperations;
@@ -38,6 +39,7 @@ struct CCRenderPassSize {
bool m_hasOcclusionFromOutsideTargetSurface;
WebKit::WebFilterOperations m_filters;
WebKit::WebFilterOperations m_backgroundFilters;
+ SkImageFilter* m_filter;
};
TEST(CCRenderPassTest, copyShouldBeIdenticalExceptIdAndQuads)
@@ -56,12 +58,14 @@ TEST(CCRenderPassTest, copyShouldBeIdenticalExceptIdAndQuads)
filters.append(WebFilterOperation::createGrayscaleFilter(0.2f));
backgroundFilters.append(WebFilterOperation::createInvertFilter(0.2f));
+ SkAutoTUnref<SkBlurImageFilter> filter(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1));
pass->setDamageRect(damageRect);
pass->setHasTransparentBackground(hasTransparentBackground);
pass->setHasOcclusionFromOutsideTargetSurface(hasOcclusionFromOutsideTargetSurface);
pass->setFilters(filters);
pass->setBackgroundFilters(backgroundFilters);
+ pass->setFilter(filter);
// Stick a quad in the pass, this should not get copied.
CCTestRenderPass* testPass = static_cast<CCTestRenderPass*>(pass.get());
@@ -79,6 +83,7 @@ TEST(CCRenderPassTest, copyShouldBeIdenticalExceptIdAndQuads)
EXPECT_EQ(pass->hasOcclusionFromOutsideTargetSurface(), copy->hasOcclusionFromOutsideTargetSurface());
EXPECT_EQ(pass->filters(), copy->filters());
EXPECT_EQ(pass->backgroundFilters(), copy->backgroundFilters());
+ EXPECT_EQ(pass->filter(), copy->filter());
EXPECT_EQ(0u, copy->quadList().size());
EXPECT_EQ(sizeof(CCRenderPassSize), sizeof(CCRenderPass));

Powered by Google App Engine
This is Rietveld 408576698