diff options
| author | clholgat@chromium.org <clholgat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 22:47:24 +0000 |
|---|---|---|
| committer | clholgat@chromium.org <clholgat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 22:47:24 +0000 |
| commit | 1ab91054908884d72b418b24e533dc02fc3dc46e (patch) | |
| tree | f53fb0078a105ada06bb9a2eaaa3ebccdacfe87c /ui | |
| parent | 833c1dab9e02316e31804e3049169b7ceb5c6495 (diff) | |
| download | chromium_src-1ab91054908884d72b418b24e533dc02fc3dc46e.zip chromium_src-1ab91054908884d72b418b24e533dc02fc3dc46e.tar.gz chromium_src-1ab91054908884d72b418b24e533dc02fc3dc46e.tar.bz2 | |
Optimize SkColorFilters when drawing RenderPassQuads
Pull the color transformation matrix from the SkImageFilter if possible
and apply with a shader. Handles all permutations of shaders.
BUG=168719
Review URL: https://chromiumcodereview.appspot.com/12803003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/compositor/layer_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc index aaba292..5dda85f 100644 --- a/ui/compositor/layer_unittest.cc +++ b/ui/compositor/layer_unittest.cc @@ -919,35 +919,35 @@ TEST_F(LayerWithRealCompositorTest, MAYBE_ModifyHierarchy) { ASSERT_TRUE(ReadPixels(&bitmap)); ASSERT_FALSE(bitmap.empty()); // WritePNGFile(bitmap, ref_img1); - EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img1)); + EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img1, true)); l0->StackAtTop(l11.get()); DrawTree(l0.get()); ASSERT_TRUE(ReadPixels(&bitmap)); ASSERT_FALSE(bitmap.empty()); // WritePNGFile(bitmap, ref_img2); - EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img2)); + EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img2, true)); // l11 is already at the front, should have no effect. l0->StackAtTop(l11.get()); DrawTree(l0.get()); ASSERT_TRUE(ReadPixels(&bitmap)); ASSERT_FALSE(bitmap.empty()); - EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img2)); + EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img2, true)); // l11 is already at the front, should have no effect. l0->StackAbove(l11.get(), l12.get()); DrawTree(l0.get()); ASSERT_TRUE(ReadPixels(&bitmap)); ASSERT_FALSE(bitmap.empty()); - EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img2)); + EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img2, true)); // should restore to original configuration l0->StackAbove(l12.get(), l11.get()); DrawTree(l0.get()); ASSERT_TRUE(ReadPixels(&bitmap)); ASSERT_FALSE(bitmap.empty()); - EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img1)); + EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img1, true)); } // Opacity is rendered correctly. @@ -971,7 +971,7 @@ TEST_F(LayerWithRealCompositorTest, MAYBE_Opacity) { ASSERT_TRUE(ReadPixels(&bitmap)); ASSERT_FALSE(bitmap.empty()); // WritePNGFile(bitmap, ref_img); - EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img)); + EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img, true)); } namespace { |