First Implementation of Snapped Points

cc/blink/web_layer_impl.cc

 // Copyright 2014 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.
 
 #include "cc/blink/web_layer_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/trace_event_impl.h"
 #include "cc/base/region.h"
 #include "cc/base/switches.h"
 #include "cc/blink/web_blend_mode.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_position_constraint.h"
+#include "cc/layers/snap_point_list.h"
 #include "cc/trees/element_id.h"
 #include "cc/trees/layer_tree_host.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h"
 #include "third_party/WebKit/public/platform/WebLayerScrollClient.h"
 #include "third_party/WebKit/public/platform/WebLayerStickyPositionConstraint.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
+#include "third_party/WebKit/public/platform/WebSnapPointList.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
 
 using cc::Layer;
 using blink::WebLayer;
 using blink::WebFloatPoint;
 using blink::WebVector;
 using blink::WebRect;
 using blink::WebSize;
@@ skipping 364 matching lines @@
   constraint.scroll_container_relative_sticky_box_rect =
       web_constraint.scroll_container_relative_sticky_box_rect;
   constraint.scroll_container_relative_containing_block_rect =
       web_constraint.scroll_container_relative_containing_block_rect;
   constraint.nearest_layer_shifting_sticky_box =
       web_constraint.nearest_layer_shifting_sticky_box;
   constraint.nearest_layer_shifting_containing_block =
       web_constraint.nearest_layer_shifting_containing_block;
   return constraint;
 }
+static cc::SnapPointList ToSnapPointList(
+    const blink::WebSnapPointList& web_list) {
+  cc::SnapPointList list;
+  for (blink::WebSnapPoint point : web_list.HorizontalOffsets()) {
+    /*LOG(ERROR) << point.offset << " " << point.must_snap << " "
+      << point.is_start << " " << point.is_end;*/
+    list.horizontal.push_back(cc::SnapPoint(point.offset, point.must_snap,
+                                            point.is_start, point.is_end));
+  }
+  for (blink::WebSnapPoint point : web_list.VerticalOffsets()) {
+    list.vertical.push_back(cc::SnapPoint(point.offset, point.must_snap,
+                                          point.is_start, point.is_end));
+  }
+  return list;
+}
 void WebLayerImpl::SetStickyPositionConstraint(
     const blink::WebLayerStickyPositionConstraint& constraint) {
   layer_->SetStickyPositionConstraint(ToStickyPositionConstraint(constraint));
 }
 blink::WebLayerStickyPositionConstraint WebLayerImpl::StickyPositionConstraint()
     const {
   return ToWebLayerStickyPositionConstraint(
       layer_->sticky_position_constraint());
 }
 
 void WebLayerImpl::SetScrollClient(blink::WebLayerScrollClient* scroll_client) {
   if (scroll_client) {
     layer_->set_did_scroll_callback(
         base::Bind(&blink::WebLayerScrollClient::DidScroll,
                    base::Unretained(scroll_client)));
   } else {
     layer_->set_did_scroll_callback(
         base::Callback<void(const gfx::ScrollOffset&)>());
   }
 }
 
+void WebLayerImpl::SetScrollSnapOffsets(
+    const blink::WebSnapPointList& offsets) {
+  layer_->SetScrollSnapOffsets(ToSnapPointList(offsets));
+}
+
 void WebLayerImpl::SetLayerClient(cc::LayerClient* client) {
   layer_->SetLayerClient(client);
 }
 
 const cc::Layer* WebLayerImpl::CcLayer() const {
   return layer_.get();
 }
 
 cc::Layer* WebLayerImpl::CcLayer() {
   return layer_.get();
@@ skipping 39 matching lines @@
 
 void WebLayerImpl::SetHasWillChangeTransformHint(bool has_will_change) {
   layer_->SetHasWillChangeTransformHint(has_will_change);
 }
 
 void WebLayerImpl::ShowScrollbars() {
   layer_->ShowScrollbars();
 }
 
 }  // namespace cc_blink