1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
commit c97894b
Author: L. David Baron <dbaron@dbaron.org>
Date: Sun Oct 19 23:31:39 2014 -0400
Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers. r=bzbarsky approval-mozilla-esr31=bkerensa
---
layout/style/nsCSSValue.cpp | 28 ++++++++++++++++------------
layout/style/nsCSSValue.h | 22 ++++++++++++++++------
layout/style/nsStyleAnimation.cpp | 6 ++++--
3 files changed, 36 insertions(+), 20 deletions(-)
diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp
index 781ef65..4bbc979 100644
--- mozilla/layout/style/nsCSSValue.cpp
+++ mozilla/layout/style/nsCSSValue.cpp
@@ -253,13 +253,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const
return *mValue.mRect == *aOther.mValue.mRect;
}
else if (eCSSUnit_List == mUnit) {
- return *mValue.mList == *aOther.mValue.mList;
+ return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList);
}
else if (eCSSUnit_SharedList == mUnit) {
return *mValue.mSharedList == *aOther.mValue.mSharedList;
}
else if (eCSSUnit_PairList == mUnit) {
- return *mValue.mPairList == *aOther.mValue.mPairList;
+ return nsCSSValuePairList::Equal(mValue.mPairList,
+ aOther.mValue.mPairList);
}
else if (eCSSUnit_GridTemplateAreas == mUnit) {
return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas;
@@ -1740,13 +1741,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult,
}
}
-bool
-nsCSSValueList::operator==(const nsCSSValueList& aOther) const
+/* static */ bool
+nsCSSValueList::Equal(const nsCSSValueList* aList1,
+ const nsCSSValueList* aList2)
{
- if (this == &aOther)
+ if (aList1 == aList2) {
return true;
+ }
- const nsCSSValueList *p1 = this, *p2 = &aOther;
+ const nsCSSValueList *p1 = aList1, *p2 = aList2;
for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) {
if (p1->mValue != p2->mValue)
return false;
@@ -1799,8 +1802,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult
bool
nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const
{
- return !mHead == !aOther.mHead &&
- (!mHead || *mHead == *aOther.mHead);
+ return nsCSSValueList::Equal(mHead, aOther.mHead);
}
size_t
@@ -2010,13 +2012,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty,
}
}
-bool
-nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const
+/* static */ bool
+nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1,
+ const nsCSSValuePairList* aList2)
{
- if (this == &aOther)
+ if (aList1 == aList2) {
return true;
+ }
- const nsCSSValuePairList *p1 = this, *p2 = &aOther;
+ const nsCSSValuePairList *p1 = aList1, *p2 = aList2;
for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) {
if (p1->mXValue != p2->mXValue ||
p1->mYValue != p2->mYValue)
diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h
index 753938c..77eeef0 100644
--- mozilla/layout/style/nsCSSValue.h
+++ mozilla/layout/style/nsCSSValue.h
@@ -806,9 +806,8 @@ struct nsCSSValueList {
void AppendToString(nsCSSProperty aProperty, nsAString& aResult,
nsCSSValue::Serialization aValueSerialization) const;
- bool operator==(nsCSSValueList const& aOther) const;
- bool operator!=(const nsCSSValueList& aOther) const
- { return !(*this == aOther); }
+ static bool Equal(const nsCSSValueList* aList1,
+ const nsCSSValueList* aList2);
size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
@@ -821,6 +820,12 @@ private:
{
MOZ_COUNT_CTOR(nsCSSValueList);
}
+
+ // We don't want operator== or operator!= because they wouldn't be
+ // null-safe, which is generally what we need. Use |Equal| method
+ // above instead.
+ bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE;
+ bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE;
};
// nsCSSValueList_heap differs from nsCSSValueList only in being
@@ -1199,9 +1204,8 @@ struct nsCSSValuePairList {
void AppendToString(nsCSSProperty aProperty, nsAString& aResult,
nsCSSValue::Serialization aValueSerialization) const;
- bool operator==(const nsCSSValuePairList& aOther) const;
- bool operator!=(const nsCSSValuePairList& aOther) const
- { return !(*this == aOther); }
+ static bool Equal(const nsCSSValuePairList* aList1,
+ const nsCSSValuePairList* aList2);
size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
@@ -1215,6 +1219,12 @@ private:
{
MOZ_COUNT_CTOR(nsCSSValuePairList);
}
+
+ // We don't want operator== or operator!= because they wouldn't be
+ // null-safe, which is generally what we need. Use |Equal| method
+ // above instead.
+ bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE;
+ bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE;
};
// nsCSSValuePairList_heap differs from nsCSSValuePairList only in being
diff --git layout/style/nsStyleAnimation.cpp layout/style/nsStyleAnimation.cpp
index 6c2ccb0..8dbe404 100644
--- mozilla/layout/style/nsStyleAnimation.cpp
+++ mozilla/layout/style/nsStyleAnimation.cpp
@@ -3816,11 +3816,13 @@ nsStyleAnimation::Value::operator==(const Value& aOther) const
case eUnit_Filter:
case eUnit_Shadow:
case eUnit_BackgroundPosition:
- return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList;
+ return nsCSSValueList::Equal(mValue.mCSSValueList,
+ aOther.mValue.mCSSValueList);
case eUnit_Transform:
return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList;
case eUnit_CSSValuePairList:
- return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList;
+ return nsCSSValuePairList::Equal(mValue.mCSSValuePairList,
+ aOther.mValue.mCSSValuePairList);
case eUnit_UnparsedString:
return (NS_strcmp(GetStringBufferValue(),
aOther.GetStringBufferValue()) == 0);
|
