Replace blink::SnapContainerData wrapper with cc::SnapContainerData

Replace uses of SnapContainerData from
third_party/blink/renderer/platform/scroll_snap_data.h with the
unwrapped type from cc/input/scroll_snap_data.h.

This is part of a series of CLs to remove platform/scroll.

Bug: 922111
Change-Id: Id900c7fc7cbe1a50e16fdffcd0ff78e031548ba1
Reviewed-on: https://chromium-review.googlesource.com/c/1479994
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#634391}

third_party/blink/renderer/core/page/scrolling/snap_coordinator.cc

@@ -111,7 +111,8 @@ void SnapCoordinator::UpdateSnapContainerData(const LayoutBox& snap_container) {
   if (snap_container.Style()->GetScrollSnapType().is_none)
     return;
 
-  SnapContainerData snap_container_data(GetPhysicalSnapType(snap_container));
+  cc::SnapContainerData snap_container_data(
+      GetPhysicalSnapType(snap_container));
 
   ScrollableArea* scrollable_area = ScrollableAreaForSnapping(snap_container);
   if (!scrollable_area)
@@ -244,7 +245,7 @@ base::Optional<FloatPoint> SnapCoordinator::GetSnapPosition(
   if (iter == snap_container_map_.end())
     return base::nullopt;
 
-  const SnapContainerData& data = iter->value;
+  const cc::SnapContainerData& data = iter->value;
   if (!data.size())
     return base::nullopt;
 
@@ -347,7 +348,7 @@ void SnapCoordinator::SnapContainerDidChange(
   // container or from existing areas in orphan pool.
 }
 
-base::Optional<SnapContainerData> SnapCoordinator::GetSnapContainerData(
+base::Optional<cc::SnapContainerData> SnapCoordinator::GetSnapContainerData(
     const LayoutBox& snap_container) const {
   auto iter = snap_container_map_.find(&snap_container);
   if (iter != snap_container_map_.end()) {

third_party/blink/renderer/core/page/scrolling/snap_coordinator.h

@@ -42,7 +42,7 @@ class CORE_EXPORT SnapCoordinator final
   void SnapAreaDidChange(LayoutBox&, cc::ScrollSnapAlign);
 
   // Returns the SnapContainerData if the snap container has one.
-  base::Optional<SnapContainerData> GetSnapContainerData(
+  base::Optional<cc::SnapContainerData> GetSnapContainerData(
       const LayoutBox& snap_container) const;
 
   // Calculate the SnapAreaData for the specific snap area in its snap
@@ -87,7 +87,7 @@ class CORE_EXPORT SnapCoordinator final
   bool PerformSnapping(const LayoutBox& snap_container,
                        const cc::SnapSelectionStrategy& strategy) const;
 
-  HashMap<const LayoutBox*, SnapContainerData> snap_container_map_;
+  HashMap<const LayoutBox*, cc::SnapContainerData> snap_container_map_;
   DISALLOW_COPY_AND_ASSIGN(SnapCoordinator);
 };
 

third_party/blink/renderer/core/page/scrolling/snap_coordinator_test.cc

@@ -325,16 +325,16 @@ TEST_F(SnapCoordinatorTest, SnapDataCalculation) {
   GetDocument().UpdateStyleAndLayout();
   SnapCoordinator* snap_coordinator = GetDocument().GetSnapCoordinator();
 
-  base::Optional<SnapContainerData> data =
+  base::Optional<cc::SnapContainerData> data =
       snap_coordinator->GetSnapContainerData(*scroller_element->GetLayoutBox());
   EXPECT_TRUE(data.has_value());
-  SnapContainerData actual_container = data.value();
+  cc::SnapContainerData actual_container = data.value();
   FloatPoint max_position = scrollable_area->ScrollOffsetToPosition(
       scrollable_area->MaximumScrollOffset());
 
   double width = scroller_element->clientWidth();
   double height = scroller_element->clientHeight();
-  SnapContainerData expected_container(
+  cc::SnapContainerData expected_container(
       cc::ScrollSnapType(false, cc::SnapAxis::kBoth,
                          cc::SnapStrictness::kMandatory),
       gfx::RectF(10, 10, width - 20, height - 20),
@@ -359,16 +359,16 @@ TEST_F(SnapCoordinatorTest, ScrolledSnapDataCalculation) {
   GetDocument().UpdateStyleAndLayout();
   SnapCoordinator* snap_coordinator = GetDocument().GetSnapCoordinator();
 
-  base::Optional<SnapContainerData> data =
+  base::Optional<cc::SnapContainerData> data =
       snap_coordinator->GetSnapContainerData(*scroller_element->GetLayoutBox());
   EXPECT_TRUE(data.has_value());
-  SnapContainerData actual_container = data.value();
+  cc::SnapContainerData actual_container = data.value();
   FloatPoint max_position = scrollable_area->ScrollOffsetToPosition(
       scrollable_area->MaximumScrollOffset());
 
   double width = scroller_element->clientWidth();
   double height = scroller_element->clientHeight();
-  SnapContainerData expected_container(
+  cc::SnapContainerData expected_container(
       cc::ScrollSnapType(false, cc::SnapAxis::kBoth,
                          cc::SnapStrictness::kMandatory),
       gfx::RectF(10, 10, width - 20, height - 20),
@@ -416,17 +416,17 @@ TEST_F(SnapCoordinatorTest, ScrolledSnapDataCalculationOnViewport) {
   area_element->setAttribute(kStyleAttr, "scroll-snap-align: start;");
   GetDocument().UpdateStyleAndLayout();
   SnapCoordinator* snap_coordinator = GetDocument().GetSnapCoordinator();
-  base::Optional<SnapContainerData> data =
+  base::Optional<cc::SnapContainerData> data =
       snap_coordinator->GetSnapContainerData(*GetDocument().GetLayoutView());
   EXPECT_TRUE(data.has_value());
-  SnapContainerData actual_container = data.value();
+  cc::SnapContainerData actual_container = data.value();
 
   FloatPoint max_position = scrollable_area->ScrollOffsetToPosition(
       scrollable_area->MaximumScrollOffset());
 
   double width = body->clientWidth();
   double height = body->clientHeight();
-  SnapContainerData expected_container(
+  cc::SnapContainerData expected_container(
       cc::ScrollSnapType(false, cc::SnapAxis::kBoth,
                          cc::SnapStrictness::kMandatory),
       gfx::RectF(0, 0, width, height),
@@ -451,10 +451,10 @@ TEST_F(SnapCoordinatorTest, SnapDataCalculationWithBoxModel) {
       kStyleAttr, "margin: 3px; border: 10px solid; padding: 4px;");
   GetDocument().UpdateStyleAndLayout();
   SnapCoordinator* snap_coordinator = GetDocument().GetSnapCoordinator();
-  base::Optional<SnapContainerData> data =
+  base::Optional<cc::SnapContainerData> data =
       snap_coordinator->GetSnapContainerData(*scroller_element->GetLayoutBox());
   EXPECT_TRUE(data.has_value());
-  SnapContainerData actual_container = data.value();
+  cc::SnapContainerData actual_container = data.value();
 
   ScrollableArea* scrollable_area =
       scroller_element->GetLayoutBox()->GetScrollableArea();
@@ -465,7 +465,7 @@ TEST_F(SnapCoordinatorTest, SnapDataCalculationWithBoxModel) {
   double height = scroller_element->clientHeight();
 
   // rect.x = rect.y = scroller.border + scroller.scroll-padding
-  SnapContainerData expected_container(
+  cc::SnapContainerData expected_container(
       cc::ScrollSnapType(false, cc::SnapAxis::kBoth,
                          cc::SnapStrictness::kMandatory),
       gfx::RectF(20, 20, width - 20, height - 20),
@@ -494,10 +494,10 @@ TEST_F(SnapCoordinatorTest, NegativeMarginSnapDataCalculation) {
   GetDocument().UpdateStyleAndLayout();
   Element* scroller_element = GetDocument().getElementById("scroller");
   SnapCoordinator* snap_coordinator = GetDocument().GetSnapCoordinator();
-  base::Optional<SnapContainerData> data =
+  base::Optional<cc::SnapContainerData> data =
       snap_coordinator->GetSnapContainerData(*scroller_element->GetLayoutBox());
   EXPECT_TRUE(data.has_value());
-  SnapContainerData actual_container = data.value();
+  cc::SnapContainerData actual_container = data.value();
 
   ScrollableArea* scrollable_area =
       scroller_element->GetLayoutBox()->GetScrollableArea();
@@ -507,7 +507,7 @@ TEST_F(SnapCoordinatorTest, NegativeMarginSnapDataCalculation) {
   double width = scroller_element->clientWidth();
   double height = scroller_element->clientHeight();
 
-  SnapContainerData expected_container(
+  cc::SnapContainerData expected_container(
       cc::ScrollSnapType(false, cc::SnapAxis::kBoth,
                          cc::SnapStrictness::kMandatory),
       gfx::RectF(10, 10, width - 20, height - 20),
@@ -541,10 +541,10 @@ TEST_F(SnapCoordinatorTest, AsymmetricalSnapDataCalculation) {
       )HTML");
   GetDocument().UpdateStyleAndLayout();
   SnapCoordinator* snap_coordinator = GetDocument().GetSnapCoordinator();
-  base::Optional<SnapContainerData> data =
+  base::Optional<cc::SnapContainerData> data =
       snap_coordinator->GetSnapContainerData(*scroller_element->GetLayoutBox());
   EXPECT_TRUE(data.has_value());
-  SnapContainerData actual_container = data.value();
+  cc::SnapContainerData actual_container = data.value();
 
   ScrollableArea* scrollable_area =
       scroller_element->GetLayoutBox()->GetScrollableArea();
@@ -554,7 +554,7 @@ TEST_F(SnapCoordinatorTest, AsymmetricalSnapDataCalculation) {
   double width = scroller_element->clientWidth();
   double height = scroller_element->clientHeight();
 
-  SnapContainerData expected_container(
+  cc::SnapContainerData expected_container(
       cc::ScrollSnapType(false, cc::SnapAxis::kBoth,
                          cc::SnapStrictness::kMandatory),
       gfx::RectF(16, 10, width - 28, height - 24),
@@ -576,10 +576,10 @@ TEST_F(SnapCoordinatorTest, ScaledSnapDataCalculation) {
   GetDocument().UpdateStyleAndLayout();
   Element* scroller_element = GetDocument().getElementById("scroller");
   SnapCoordinator* snap_coordinator = GetDocument().GetSnapCoordinator();
-  base::Optional<SnapContainerData> data =
+  base::Optional<cc::SnapContainerData> data =
       snap_coordinator->GetSnapContainerData(*scroller_element->GetLayoutBox());
   EXPECT_TRUE(data.has_value());
-  SnapContainerData actual_container = data.value();
+  cc::SnapContainerData actual_container = data.value();
 
   ScrollableArea* scrollable_area =
       scroller_element->GetLayoutBox()->GetScrollableArea();
@@ -588,7 +588,7 @@ TEST_F(SnapCoordinatorTest, ScaledSnapDataCalculation) {
 
   double width = scroller_element->clientWidth();
   double height = scroller_element->clientHeight();
-  SnapContainerData expected_container(
+  cc::SnapContainerData expected_container(
       cc::ScrollSnapType(false, cc::SnapAxis::kBoth,
                          cc::SnapStrictness::kMandatory),
       gfx::RectF(10, 10, width - 20, height - 20),
@@ -613,10 +613,10 @@ TEST_F(SnapCoordinatorTest, VerticalRlSnapDataCalculation) {
   scroller_element->setAttribute(kStyleAttr, "writing-mode: vertical-rl;");
   GetDocument().UpdateStyleAndLayout();
   SnapCoordinator* snap_coordinator = GetDocument().GetSnapCoordinator();
-  base::Optional<SnapContainerData> data =
+  base::Optional<cc::SnapContainerData> data =
       snap_coordinator->GetSnapContainerData(*scroller_element->GetLayoutBox());
   EXPECT_TRUE(data.has_value());
-  SnapContainerData actual_container = data.value();
+  cc::SnapContainerData actual_container = data.value();
 
   ScrollableArea* scrollable_area =
       scroller_element->GetLayoutBox()->GetScrollableArea();
@@ -626,7 +626,7 @@ TEST_F(SnapCoordinatorTest, VerticalRlSnapDataCalculation) {
   double width = scroller_element->clientWidth();
   double height = scroller_element->clientHeight();
 
-  SnapContainerData expected_container(
+  cc::SnapContainerData expected_container(
       cc::ScrollSnapType(false, cc::SnapAxis::kBoth,
                          cc::SnapStrictness::kMandatory),
       gfx::RectF(10, 10, width - 20, height - 20),

third_party/blink/renderer/platform/graphics/graphics_layer.cc

@@ -138,7 +138,7 @@ void GraphicsLayer::SetOverscrollBehavior(
 }
 
 void GraphicsLayer::SetSnapContainerData(
-    base::Optional<SnapContainerData> data) {
+    base::Optional<cc::SnapContainerData> data) {
   CcLayer()->SetSnapContainerData(std::move(data));
 }
 

third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h

@@ -6,6 +6,7 @@
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_PAINT_SCROLL_PAINT_PROPERTY_NODE_H_
 
 #include "base/optional.h"
+#include "cc/input/scroll_snap_data.h"
 #include "third_party/blink/renderer/platform/geometry/float_point.h"
 #include "third_party/blink/renderer/platform/geometry/float_size.h"
 #include "third_party/blink/renderer/platform/geometry/int_rect.h"
@@ -52,7 +53,7 @@ class PLATFORM_EXPORT ScrollPaintPropertyNode
     CompositorElementId compositor_element_id;
     OverscrollBehavior overscroll_behavior = blink::OverscrollBehavior(
         blink::OverscrollBehavior::kOverscrollBehaviorTypeAuto);
-    base::Optional<SnapContainerData> snap_container_data;
+    base::Optional<cc::SnapContainerData> snap_container_data;
 
     bool operator==(const State& o) const {
       return container_rect == o.container_rect &&
@@ -105,7 +106,7 @@ class PLATFORM_EXPORT ScrollPaintPropertyNode
     return state_.overscroll_behavior.y;
   }
 
-  base::Optional<SnapContainerData> GetSnapContainerData() const {
+  base::Optional<cc::SnapContainerData> GetSnapContainerData() const {
     return state_.snap_container_data;
   }
 

third_party/blink/renderer/platform/scroll/scroll_snap_data.h

@@ -14,7 +14,6 @@
 namespace blink {
 
 using SearchAxis = cc::SearchAxis;
-using SnapContainerData = cc::SnapContainerData;
 using SnapFlingController = cc::SnapFlingController;
 using SnapFlingClient = cc::SnapFlingClient;
 

third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py

@@ -239,6 +239,7 @@ _CONFIG = [
             'cc::SnapAlignment',
             'cc::SnapAreaData',
             'cc::SnapAxis',
+            'cc::SnapContainerData',
             'cc::SnapSelectionStrategy',
             'cc::SnapStrictness',
             'gfx::RectToSkRect',