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

Side by Side Diff: third_party/WebKit/Source/core/style/StyleScrollSnapData.h

Issue 2932593004: Update the snap points css properties (Closed)
Patch Set: Fix nits 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2014 Apple Inc. All rights reserved. 2 * Copyright (C) 2014 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef StyleScrollSnapData_h 26 #ifndef StyleScrollSnapData_h
27 #define StyleScrollSnapData_h 27 #define StyleScrollSnapData_h
28 28
29 #include "core/style/ScrollSnapPoints.h" 29 #include "core/style/ComputedStyleConstants.h"
30 #include "core/style/QuadLengthValue.h"
30 #include "platform/LengthPoint.h" 31 #include "platform/LengthPoint.h"
31 #include "platform/wtf/Allocator.h" 32 #include "platform/wtf/Allocator.h"
32 #include "platform/wtf/RefCounted.h" 33 #include "platform/wtf/RefCounted.h"
33 #include "platform/wtf/Vector.h" 34 #include "platform/wtf/Vector.h"
34 35
35 namespace blink { 36 namespace blink {
36 37
38 using ScrollPadding = QuadLengthValue;
39 using ScrollSnapMargin = QuadLengthValue;
40
41 struct ScrollSnapType {
42 DISALLOW_NEW();
43
44 ScrollSnapType()
45 : is_none(true),
46 axis(kSnapAxisBoth),
47 strictness(kSnapStrictnessProximity) {}
48
49 ScrollSnapType(const ScrollSnapType& other)
50 : is_none(other.is_none),
51 axis(other.axis),
52 strictness(other.strictness) {}
53
54 bool operator==(const ScrollSnapType& other) const {
55 return is_none == other.is_none && axis == other.axis &&
56 strictness == other.strictness;
57 }
58
59 bool operator!=(const ScrollSnapType& other) const {
60 return !(*this == other);
61 }
62
63 bool is_none;
64 SnapAxis axis;
65 SnapStrictness strictness;
66 };
67
68 struct ScrollSnapAlign {
69 DISALLOW_NEW();
70
71 ScrollSnapAlign()
72 : alignmentX(kSnapAlignmentNone), alignmentY(kSnapAlignmentNone) {}
73
74 ScrollSnapAlign(const ScrollSnapAlign& other)
75 : alignmentX(other.alignmentX), alignmentY(other.alignmentY) {}
76
77 bool operator==(const ScrollSnapAlign& other) const {
78 return alignmentX == other.alignmentX && alignmentY == other.alignmentY;
79 }
80
81 bool operator!=(const ScrollSnapAlign& other) const {
82 return !(*this == other);
83 }
84
85 SnapAlignment alignmentX;
86 SnapAlignment alignmentY;
87 };
88
37 class StyleScrollSnapData : public RefCounted<StyleScrollSnapData> { 89 class StyleScrollSnapData : public RefCounted<StyleScrollSnapData> {
38 public: 90 public:
39 static PassRefPtr<StyleScrollSnapData> Create() { 91 static PassRefPtr<StyleScrollSnapData> Create() {
40 return AdoptRef(new StyleScrollSnapData); 92 return AdoptRef(new StyleScrollSnapData);
41 } 93 }
42 PassRefPtr<StyleScrollSnapData> Copy() { 94 PassRefPtr<StyleScrollSnapData> Copy() {
43 return AdoptRef(new StyleScrollSnapData(*this)); 95 return AdoptRef(new StyleScrollSnapData(*this));
44 } 96 }
45 97
46 ScrollSnapPoints x_points_; 98 ScrollSnapType type_;
47 ScrollSnapPoints y_points_; 99 ScrollSnapAlign align_;
48 LengthPoint destination_; 100 ScrollPadding padding_;
49 Vector<LengthPoint> coordinates_; 101 ScrollSnapMargin margin_;
50 102
51 private: 103 private:
52 StyleScrollSnapData(); 104 StyleScrollSnapData();
53 StyleScrollSnapData(const StyleScrollSnapData&); 105 StyleScrollSnapData(const StyleScrollSnapData& other);
54 }; 106 };
55 107
56 bool operator==(const StyleScrollSnapData&, const StyleScrollSnapData&); 108 bool operator==(const StyleScrollSnapData&, const StyleScrollSnapData&);
57 inline bool operator!=(const StyleScrollSnapData& a, 109 inline bool operator!=(const StyleScrollSnapData& a,
58 const StyleScrollSnapData& b) { 110 const StyleScrollSnapData& b) {
59 return !(a == b); 111 return !(a == b);
60 } 112 }
61 113
62 } // namespace blink 114 } // namespace blink
63 115
64 #endif // StyleScrollSnapData_h 116 #endif // StyleScrollSnapData_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698