Revert of Split preserve3d into: "should-flatten" and "is-3d-sorted" (https://codereview.chromium.org/147833003/)

Reason for revert:
Introduces flakiness in Blink layout tests:

http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%2540ToT%2520Blink&tests=compositing%252Fbackface-visibility-transformed

Original issue's description:
> Split preserve3d into: "should-flatten" and "is-3d-sorted"
> 
> Preserve3d has implications for both sorting and flattening of
> transforms. This is a bummer. Sometimes we want to allow a transform to
> remain unflattened, but we don't want that to affect 3d sorting. With
> this CL, we will have the ability to do that.
> 
> Note: this is essentially this cl
> https://codereview.chromium.org/100393005/
> 
> ..minus the generalizations to sorting that were being attempted in that
> patch.
> 
> Note, this CL is gated on https://codereview.chromium.org/98373011/ 
> 
> R=enne@chromium.org
> BUG=338980
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=249974

TBR=enne@chromium.org,shawnsingh@chromium.org,vollick@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=338980

Review URL: https://codereview.chromium.org/158563003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250031 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 9 deletions

diff --git a/cc/trees/layer_tree_host_pixeltest_filters.cc b/cc/trees/layer_tree_host_pixeltest_filters.cc
index 3d52efa..d2a6507f9 100644
--- a/cc/trees/layer_tree_host_pixeltest_filters.cc
+++ b/cc/trees/layer_tree_host_pixeltest_filters.cc
@@ -110,19 +110,12 @@ TEST_F(LayerTreeHostFiltersPixelTest, BackgroundFilterBlurOffAxis) {
   background->AddChild(green);
   background->AddChild(blur);
 
-  background->SetShouldFlattenTransform(false);
-  background->SetIs3dSorted(true);
-  green->SetShouldFlattenTransform(false);
-  green->SetIs3dSorted(true);
+  background->SetPreserves3d(true);
   gfx::Transform background_transform;
   background_transform.ApplyPerspectiveDepth(200.0);
   background->SetTransform(background_transform);
 
-  blur->SetShouldFlattenTransform(false);
-  blur->SetIs3dSorted(true);
-  for (size_t i = 0; i < blur->children().size(); ++i)
-    blur->children()[i]->SetIs3dSorted(true);
-
+  blur->SetPreserves3d(true);
   gfx::Transform blur_transform;
   blur_transform.Translate(55.0, 65.0);
   blur_transform.RotateAboutXAxis(85.0);