Commit 8d6ebf2f authored by Rune Lillesveen's avatar Rune Lillesveen Committed by Commit Bot

No longer a need to propagate column-gap to viewport.

This was only necessary for paged overflow for the viewport with
-webkit-paged-x which is now removed.

Bug: 940652
Change-Id: Id1d4a5b77fa1836106b677324450a3c06b331125
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1548473
Commit-Queue: Rune Lillesveen <futhark@chromium.org>
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: default avatarIan Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646600}
parent 78bcd491
...@@ -2050,10 +2050,6 @@ void Document::PropagateStyleToViewport() { ...@@ -2050,10 +2050,6 @@ void Document::PropagateStyleToViewport() {
overflow_y = EOverflow::kAuto; overflow_y = EOverflow::kAuto;
if (overflow_anchor == EOverflowAnchor::kVisible) if (overflow_anchor == EOverflowAnchor::kVisible)
overflow_anchor = EOverflowAnchor::kAuto; 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.
GapLength column_gap = overflow_style->ColumnGap();
cc::ScrollSnapType snap_type = overflow_style->GetScrollSnapType(); cc::ScrollSnapType snap_type = overflow_style->GetScrollSnapType();
ScrollBehavior scroll_behavior = document_element_style->GetScrollBehavior(); ScrollBehavior scroll_behavior = document_element_style->GetScrollBehavior();
...@@ -2085,7 +2081,6 @@ void Document::PropagateStyleToViewport() { ...@@ -2085,7 +2081,6 @@ void Document::PropagateStyleToViewport() {
viewport_style.OverflowAnchor() != overflow_anchor || viewport_style.OverflowAnchor() != overflow_anchor ||
viewport_style.OverflowX() != overflow_x || viewport_style.OverflowX() != overflow_x ||
viewport_style.OverflowY() != overflow_y || viewport_style.OverflowY() != overflow_y ||
viewport_style.ColumnGap() != column_gap ||
viewport_style.GetScrollSnapType() != snap_type || viewport_style.GetScrollSnapType() != snap_type ||
viewport_style.GetScrollBehavior() != scroll_behavior || viewport_style.GetScrollBehavior() != scroll_behavior ||
viewport_style.OverscrollBehaviorX() != overscroll_behavior_x || viewport_style.OverscrollBehaviorX() != overscroll_behavior_x ||
...@@ -2106,7 +2101,6 @@ void Document::PropagateStyleToViewport() { ...@@ -2106,7 +2101,6 @@ void Document::PropagateStyleToViewport() {
new_style->SetOverflowAnchor(overflow_anchor); new_style->SetOverflowAnchor(overflow_anchor);
new_style->SetOverflowX(overflow_x); new_style->SetOverflowX(overflow_x);
new_style->SetOverflowY(overflow_y); new_style->SetOverflowY(overflow_y);
new_style->SetColumnGap(column_gap);
new_style->SetScrollSnapType(snap_type); new_style->SetScrollSnapType(snap_type);
new_style->SetScrollBehavior(scroll_behavior); new_style->SetScrollBehavior(scroll_behavior);
new_style->SetOverscrollBehaviorX(overscroll_behavior_x); new_style->SetOverscrollBehaviorX(overscroll_behavior_x);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment