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, 10 insertions, 21 deletions

diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc
index 59261f3..9c6fa45 100644
--- a/cc/trees/occlusion_tracker_unittest.cc
+++ b/cc/trees/occlusion_tracker_unittest.cc
@@ -1962,10 +1962,7 @@ class OcclusionTrackerTestUnsorted3dLayers
                                  gfx::PointF(50.f, 50.f),
                                  gfx::Size(100, 100),
                                  true);
-    parent->SetShouldFlattenTransform(false);
-    parent->SetIs3dSorted(true);
-    child1->SetIs3dSorted(true);
-    child2->SetIs3dSorted(true);
+    parent->SetPreserves3d(true);
 
     this->CalcDrawEtc(parent);
 
@@ -2009,11 +2006,8 @@ class OcclusionTrackerTestPerspectiveTransform
                                  gfx::PointF(100.f, 100.f),
                                  gfx::Size(200, 200),
                                  true);
-    container->SetShouldFlattenTransform(false);
-    container->SetIs3dSorted(true);
-    layer->SetIs3dSorted(true);
-    layer->SetShouldFlattenTransform(false);
-
+    container->SetPreserves3d(true);
+    layer->SetPreserves3d(true);
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType,
@@ -2031,6 +2025,7 @@ class OcclusionTrackerTestPerspectiveTransform
 // the occlusion tracker on the main thread. So this test should run on the impl
 // thread.
 IMPL_THREAD_TEST(OcclusionTrackerTestPerspectiveTransform);
+
 template <class Types>
 class OcclusionTrackerTestPerspectiveTransformBehindCamera
     : public OcclusionTrackerTest<Types> {
@@ -2055,10 +2050,8 @@ class OcclusionTrackerTestPerspectiveTransformBehindCamera
         parent, this->identity_matrix, gfx::PointF(), gfx::Size(500, 500));
     typename Types::ContentLayerType* layer = this->CreateDrawingLayer(
         container, transform, gfx::PointF(), gfx::Size(500, 500), true);
-    container->SetShouldFlattenTransform(false);
-    container->SetIs3dSorted(true);
-    layer->SetShouldFlattenTransform(false);
-    layer->SetIs3dSorted(true);
+    container->SetPreserves3d(true);
+    layer->SetPreserves3d(true);
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType,
@@ -2099,10 +2092,8 @@ class OcclusionTrackerTestLayerBehindCameraDoesNotOcclude
         this->identity_matrix, gfx::PointF(), gfx::Size(100, 100));
     typename Types::ContentLayerType* layer = this->CreateDrawingLayer(
         parent, transform, gfx::PointF(), gfx::Size(100, 100), true);
-    parent->SetShouldFlattenTransform(false);
-    parent->SetIs3dSorted(true);
-    layer->SetShouldFlattenTransform(false);
-    layer->SetIs3dSorted(true);
+    parent->SetPreserves3d(true);
+    layer->SetPreserves3d(true);
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType,
@@ -2141,10 +2132,8 @@ class OcclusionTrackerTestLargePixelsOccludeInsideClipRect
     parent->SetMasksToBounds(true);
     typename Types::ContentLayerType* layer = this->CreateDrawingLayer(
         parent, transform, gfx::PointF(), gfx::Size(100, 100), true);
-    parent->SetShouldFlattenTransform(false);
-    parent->SetIs3dSorted(true);
-    layer->SetShouldFlattenTransform(false);
-    layer->SetIs3dSorted(true);
+    parent->SetPreserves3d(true);
+    layer->SetPreserves3d(true);
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType,