diff options
Diffstat (limited to 'chromium/cc/trees/layer_tree_host_pixeltest_filters.cc')
-rw-r--r-- | chromium/cc/trees/layer_tree_host_pixeltest_filters.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/chromium/cc/trees/layer_tree_host_pixeltest_filters.cc b/chromium/cc/trees/layer_tree_host_pixeltest_filters.cc index d2a6507f940..c8c8c7adf3f 100644 --- a/chromium/cc/trees/layer_tree_host_pixeltest_filters.cc +++ b/chromium/cc/trees/layer_tree_host_pixeltest_filters.cc @@ -110,12 +110,19 @@ TEST_F(LayerTreeHostFiltersPixelTest, BackgroundFilterBlurOffAxis) { background->AddChild(green); background->AddChild(blur); - background->SetPreserves3d(true); + background->SetShouldFlattenTransform(false); + background->Set3dSortingContextId(1); + green->SetShouldFlattenTransform(false); + green->Set3dSortingContextId(1); gfx::Transform background_transform; background_transform.ApplyPerspectiveDepth(200.0); background->SetTransform(background_transform); - blur->SetPreserves3d(true); + blur->SetShouldFlattenTransform(false); + blur->Set3dSortingContextId(1); + for (size_t i = 0; i < blur->children().size(); ++i) + blur->children()[i]->Set3dSortingContextId(1); + gfx::Transform blur_transform; blur_transform.Translate(55.0, 65.0); blur_transform.RotateAboutXAxis(85.0); @@ -169,7 +176,7 @@ class ImageFilterClippedPixelTest : public LayerTreeHostFiltersPixelTest { // This filter does a red-blue swap, so the foreground becomes blue. matrix[2] = matrix[6] = matrix[10] = matrix[18] = SK_Scalar1; skia::RefPtr<SkColorFilter> colorFilter( - skia::AdoptRef(new SkColorMatrixFilter(matrix))); + skia::AdoptRef(SkColorMatrixFilter::Create(matrix))); // We filter only the bottom 200x100 pixels of the foreground. SkImageFilter::CropRect crop_rect(SkRect::MakeXYWH(0, 100, 200, 100)); skia::RefPtr<SkImageFilter> filter = skia::AdoptRef( |