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

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

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

1 files changed, 7 insertions, 3 deletions

diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 1c0f27c..c85cd83 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -318,8 +318,11 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
   void SetDoubleSided(bool double_sided);
   bool double_sided() const { return double_sided_; }
 
-  void SetPreserves3d(bool preserves_3d) { preserves_3d_ = preserves_3d; }
-  bool preserves_3d() const { return preserves_3d_; }
+  void SetShouldFlattenTransform(bool flatten);
+  bool should_flatten_transform() const { return should_flatten_transform_; }
+
+  void SetIs3dSorted(bool sorted);
+  bool is_3d_sorted() const { return is_3d_sorted_; }
 
   void set_use_parent_backface_visibility(bool use) {
     use_parent_backface_visibility_ = use;
@@ -579,10 +582,11 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
   bool masks_to_bounds_ : 1;
   bool contents_opaque_ : 1;
   bool double_sided_ : 1;
-  bool preserves_3d_ : 1;
+  bool should_flatten_transform_ : 1;
   bool use_parent_backface_visibility_ : 1;
   bool draw_checkerboard_for_missing_tiles_ : 1;
   bool force_render_surface_ : 1;
+  bool is_3d_sorted_ : 1;
   Region non_fast_scrollable_region_;
   Region touch_event_handler_region_;
   gfx::PointF position_;