First Implementation of Snapped Points

third_party/WebKit/Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 1926 matching lines @@
     if (overflow_y == EOverflow::kVisible)
       overflow_y = EOverflow::kAuto;
     if (overflow_anchor == EOverflowAnchor::kVisible)
       overflow_anchor = EOverflowAnchor::kAuto;
     // Column-gap is (ab)used by the current paged overflow implementation (in
     // lack of other ways to specify gaps between pages), so we have to
     // propagate it too.
     column_gap = overflow_style->ColumnGap();
   }
 
+  ScrollSnapAlign snap_align = overflow_style->GetScrollSnapAlign();
   ScrollSnapType snap_type = overflow_style->GetScrollSnapType();
   const LengthPoint& snap_destination = overflow_style->ScrollSnapDestination();
 
   RefPtr<ComputedStyle> document_style = GetLayoutViewItem().MutableStyle();
   if (document_style->GetWritingMode() != root_writing_mode ||
       document_style->Direction() != root_direction ||
       document_style->VisitedDependentColor(CSSPropertyBackgroundColor) !=
           background_color ||
       document_style->BackgroundLayers() != background_layers ||
       document_style->ImageRendering() != image_rendering ||
       document_style->OverflowAnchor() != overflow_anchor ||
       document_style->OverflowX() != overflow_x ||
       document_style->OverflowY() != overflow_y ||
       document_style->ColumnGap() != column_gap ||
+      document_style->GetScrollSnapAlign() != snap_align ||
       document_style->GetScrollSnapType() != snap_type ||
       document_style->ScrollSnapDestination() != snap_destination) {
     RefPtr<ComputedStyle> new_style = ComputedStyle::Clone(*document_style);
     new_style->SetWritingMode(root_writing_mode);
     new_style->SetDirection(root_direction);
     new_style->SetBackgroundColor(background_color);
     new_style->AccessBackgroundLayers() = background_layers;
     new_style->SetImageRendering(image_rendering);
     new_style->SetOverflowAnchor(overflow_anchor);
     new_style->SetOverflowX(overflow_x);
     new_style->SetOverflowY(overflow_y);
     new_style->SetColumnGap(column_gap);
+    new_style->SetScrollSnapAlign(snap_align);
     new_style->SetScrollSnapType(snap_type);
     new_style->SetScrollSnapDestination(snap_destination);
     GetLayoutViewItem().SetStyle(new_style);
     SetupFontBuilder(*new_style);
   }
 
   if (body) {
     if (const ComputedStyle* style = body->GetComputedStyle()) {
       if (style->Direction() != root_direction ||
           style->GetWritingMode() != root_writing_mode)
@@ skipping 4342 matching lines @@
 
 void Document::SetThreadedParsingEnabledForTesting(bool enabled) {
   g_threaded_parsing_enabled_for_testing = enabled;
 }
 
 bool Document::ThreadedParsingEnabledForTesting() {
   return g_threaded_parsing_enabled_for_testing;
 }
 
 SnapCoordinator* Document::GetSnapCoordinator() {
-  if (RuntimeEnabledFeatures::cssScrollSnapPointsEnabled() &&
-      !snap_coordinator_)
+  if (/*RuntimeEnabledFeatures::cssScrollSnapPointsEnabled() &&*/
+      !snap_coordinator_) {
     snap_coordinator_ = SnapCoordinator::Create();
+  }
 
   return snap_coordinator_.Get();
 }
 
 void Document::SetContextFeatures(ContextFeatures& features) {
   context_features_ = &features;
 }
 
 // TODO(mustaq) |request| parameter maybe a misuse of HitTestRequest in
 // updateHoverActiveState() since the function doesn't bother with hit-testing.
@@ skipping 471 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (blink::Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->Url().GetString().Utf8().data());
 }
 #endif