third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp - Issue 2767213003: First Implementation of Snapped Points

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/style/StyleRareNonInheritedData.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

« no previous file with comments | « third_party/WebKit/Source/core/style/StyleRareNonInheritedData.h ('k') | third_party/WebKit/Source/core/style/StyleScrollSnapData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp

diff --git a/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp

index fb6615bcb9bf3e46bbe9df34f18ecd6d97b5d4ef..825545e283804c01a00d7b795cf124f35a4f2595 100644

--- a/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp

+++ b/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp

@@ -23,12 +23,13 @@

#include "core/animation/css/CSSAnimationData.h"

#include "core/animation/css/CSSTransitionData.h"

+#include "core/style/ComputedStyle.h"

#include "core/style/ContentData.h"

#include "core/style/DataEquivalency.h"

-#include "core/style/ComputedStyle.h"

#include "core/style/ShadowList.h"

#include "core/style/StyleFilterData.h"

#include "core/style/StyleNonInheritedVariables.h"

+#include "core/style/StyleScrollSnapData.h"

#include "core/style/StyleTransformData.h"

namespace blink {

@@ -124,7 +125,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()

isolation_(ComputedStyle::InitialIsolation()),

contain_(ComputedStyle::InitialContain()),

scroll_behavior_(ComputedStyle::InitialScrollBehavior()),

- scroll_snap_type_(ComputedStyle::InitialScrollSnapType()),

requires_accelerated_compositing_for_external_reasons_(false),

has_inline_transform_(false),

resize_(ComputedStyle::InitialResize()),

@@ -217,7 +217,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(

isolation_(o.isolation_),

contain_(o.contain_),

scroll_behavior_(o.scroll_behavior_),

- scroll_snap_type_(o.scroll_snap_type_),

requires_accelerated_compositing_for_external_reasons_(

o.requires_accelerated_compositing_for_external_reasons_),

has_inline_transform_(o.has_inline_transform_),

@@ -291,7 +290,6 @@ bool StyleRareNonInheritedData::operator==(

touch_action_ == o.touch_action_ && object_fit_ == o.object_fit_ &&

isolation_ == o.isolation_ && contain_ == o.contain_ &&

scroll_behavior_ == o.scroll_behavior_ &&

- scroll_snap_type_ == o.scroll_snap_type_ &&

requires_accelerated_compositing_for_external_reasons_ ==

o.requires_accelerated_compositing_for_external_reasons_ &&

has_inline_transform_ == o.has_inline_transform_ &&