diff options
author | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 04:45:45 +0000 |
---|---|---|
committer | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 04:45:45 +0000 |
commit | 4000abf6e302ba8ad6129b2e21e0261b197a561f (patch) | |
tree | a2e2f6131d620d29f2e8e304fe289b6921ac787d /cc/layer_impl_unittest.cc | |
parent | 17b0006c5d67977ef7acb21fde2a2dc19dd4e32c (diff) | |
download | chromium_src-4000abf6e302ba8ad6129b2e21e0261b197a561f.zip chromium_src-4000abf6e302ba8ad6129b2e21e0261b197a561f.tar.gz chromium_src-4000abf6e302ba8ad6129b2e21e0261b197a561f.tar.bz2 |
Implement SkImageFilter support in the compositor.
Review URL: https://chromiumcodereview.appspot.com/11175009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_impl_unittest.cc')
-rw-r--r-- | cc/layer_impl_unittest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cc/layer_impl_unittest.cc b/cc/layer_impl_unittest.cc index 2e3ccec..def19a9 100644 --- a/cc/layer_impl_unittest.cc +++ b/cc/layer_impl_unittest.cc @@ -9,6 +9,7 @@ #include "cc/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/skia/include/effects/SkBlurImageFilter.h" #include <public/WebFilterOperation.h> #include <public/WebFilterOperations.h> @@ -82,6 +83,7 @@ TEST(LayerImplTest, verifyLayerChangesAreTrackedProperly) arbitraryTransform.scale3d(0.1, 0.2, 0.3); WebFilterOperations arbitraryFilters; arbitraryFilters.append(WebFilterOperation::createOpacityFilter(0.5)); + SkAutoTUnref<SkImageFilter> arbitraryFilter(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1)); // These properties are internal, and should not be considered "change" when they are used. EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setUseLCDText(true)); @@ -98,6 +100,8 @@ TEST(LayerImplTest, verifyLayerChangesAreTrackedProperly) EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setAnchorPoint(arbitraryFloatPoint)); EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setAnchorPointZ(arbitraryNumber)); EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setFilters(arbitraryFilters)); + EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setFilters(WebFilterOperations())); + EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setFilter(arbitraryFilter)); EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setMaskLayer(LayerImpl::create(4))); EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setMasksToBounds(true)); EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setContentsOpaque(true)); |