Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Unified Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 2767213003: First Implementation of Snapped Points
Patch Set: Rebase and format Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/dom/Document.cpp
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index ff4bf9a2741cf9bc1748f99e20f21ab33d2da48a..d48ce667413a6042682bee0553b5afb20eb03c7b 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -1944,6 +1944,7 @@ void Document::InheritHtmlAndBodyElementStyles(StyleRecalcChange change) {
column_gap = overflow_style->ColumnGap();
}
+ ScrollSnapAlign snap_align = overflow_style->GetScrollSnapAlign();
ScrollSnapType snap_type = overflow_style->GetScrollSnapType();
const LengthPoint& snap_destination = overflow_style->ScrollSnapDestination();
@@ -1958,6 +1959,7 @@ void Document::InheritHtmlAndBodyElementStyles(StyleRecalcChange change) {
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);
@@ -1970,6 +1972,7 @@ void Document::InheritHtmlAndBodyElementStyles(StyleRecalcChange change) {
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);
@@ -6332,9 +6335,10 @@ bool Document::ThreadedParsingEnabledForTesting() {
}
SnapCoordinator* Document::GetSnapCoordinator() {
- if (RuntimeEnabledFeatures::cssScrollSnapPointsEnabled() &&
- !snap_coordinator_)
+ if (/*RuntimeEnabledFeatures::cssScrollSnapPointsEnabled() &&*/
+ !snap_coordinator_) {
snap_coordinator_ = SnapCoordinator::Create();
+ }
return snap_coordinator_.Get();
}

Powered by Google App Engine
This is Rietveld 408576698