Add a cache of LayerImpl's viewport layer type

cc/layers/layer_impl.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 52 matching lines @@
 class Tile;
 
 
 enum DrawMode {
   DRAW_MODE_NONE,
   DRAW_MODE_HARDWARE,
   DRAW_MODE_SOFTWARE,
   DRAW_MODE_RESOURCELESS_SOFTWARE
 };
 
+enum ViewportLayerType {
+  NOT_VIEWPORT_LAYER,
+  INNER_VIEWPORT_CONTAINER,
+  OUTER_VIEWPORT_CONTAINER,
+  INNER_VIEWPORT_SCROLL,
+  OUTER_VIEWPORT_SCROLL,
+  // If values are added or removed, ensure LayerImpl::viewport_layer_type_ is

[enne (OOO), 2017/05/09 17:08:29]

Can you static assert this instead of leaving a comment? Maybe down below saying
static_assert(2<<bitfieldsize > LAST_VIEWPORT_LAYER_TYPE)?

[pdr., 2017/05/09 22:20:07]

Done, I went with:
  static_assert(OUTER_VIEWPORT_SCROLL< (1u << 3),
                "enough bits for ViewportLayerType (viewport_layer_type_)");

+  // updated to use more or less bits as needed.
+};
+
 class CC_EXPORT LayerImpl {
  public:
   static std::unique_ptr<LayerImpl> Create(LayerTreeImpl* tree_impl, int id) {
     return base::WrapUnique(new LayerImpl(tree_impl, id));
   }
 
   virtual ~LayerImpl();
 
   int id() const { return layer_id_; }
 
@@ skipping 174 matching lines @@
   // The client should be responsible for setting bounds, content bounds and
   // contents scale to appropriate values. LayerImpl doesn't calculate any of
   // them from the other values.
 
   void SetBounds(const gfx::Size& bounds);
   gfx::Size bounds() const;
   // Like bounds() but doesn't snap to int. Lossy on giant pages (e.g. millions
   // of pixels) due to use of single precision float.
   gfx::SizeF BoundsForScrolling() const;
 
-  // Viewport bounds delta are used for viewport layers and accounts for changes
-  // in the viewport layers from browser controls and page scale factors. These
-  // deltas are only set on the active tree.
+  // Viewport bounds delta are only used for viewport layers and account for
+  // changes in the viewport layers from browser controls and page scale
+  // factors. These deltas are only set on the active tree.
   void SetViewportBoundsDelta(const gfx::Vector2dF& bounds_delta);
   gfx::Vector2dF ViewportBoundsDelta() const;
 
+  void SetViewportLayerType(ViewportLayerType type) {
+    // Once set as a viewport layer type, the viewport type should not change.

[enne (OOO), 2017/05/09 17:08:29]

Can you leave a "why" here as well? Or a quick pointer at which code assumes
this?

[pdr., 2017/05/09 22:20:07]

This appears to be how the system works (we don't shuffle around viewport
layers) but I haven't seen that stated anywhere.

The new code in this patch doesn't unset the viewport layer types on the old
layers if a different layer becomes the viewport layer, so that would break if
this assumption changes. Do you think it would be useful to include that info
here as a comment? Or did you mean to include something else here?

[enne (OOO), 2017/05/09 22:31:52]

Hmm ok ok.  This is fine as-is.

+    DCHECK(viewport_layer_type() == NOT_VIEWPORT_LAYER ||
+           viewport_layer_type() == type);
+    viewport_layer_type_ = type;
+  }
+  ViewportLayerType viewport_layer_type() const {
+    return static_cast<ViewportLayerType>(viewport_layer_type_);
+  }
+
   void SetCurrentScrollOffset(const gfx::ScrollOffset& scroll_offset);
   gfx::ScrollOffset CurrentScrollOffset() const;
 
   gfx::ScrollOffset MaxScrollOffset() const;
   gfx::ScrollOffset ClampScrollOffsetToLimits(gfx::ScrollOffset offset) const;
   gfx::Vector2dF ClampScrollToMaxScrollOffset();
 
   // Returns the delta of the scroll that was outside of the bounds of the
   // initial scroll
   gfx::Vector2dF ScrollBy(const gfx::Vector2dF& scroll);
@@ skipping 213 matching lines @@
   bool use_parent_backface_visibility_ : 1;
   bool use_local_transform_for_backface_visibility_ : 1;
   bool should_check_backface_visibility_ : 1;
   bool draws_content_ : 1;
   bool contributes_to_drawn_render_surface_ : 1;
 
   // This is true if and only if the layer was ever ready since it last animated
   // (all content was complete).
   bool was_ever_ready_since_last_transform_animation_ : 1;
 
+  unsigned viewport_layer_type_ : 3;  // ViewportLayerType

[enne (OOO), 2017/05/09 17:08:29]

s/unsigned/uint8_t/

[pdr., 2017/05/09 22:20:07]

Done

+
   Region non_fast_scrollable_region_;
   Region touch_event_handler_region_;
   SkColor background_color_;
   SkColor safe_opaque_background_color_;
 
   gfx::PointF position_;
 
   gfx::Rect clip_rect_in_target_space_;
   int transform_tree_index_;
   int effect_tree_index_;
@@ skipping 42 matching lines @@
   bool needs_show_scrollbars_ : 1;
 
   bool raster_even_if_not_in_rsll_ : 1;
 
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_