Title: [153412] trunk/Source/WebCore
- Revision
- 153412
- Author
- wei...@apple.com
- Date
- 2013-07-28 16:36:18 -0700 (Sun, 28 Jul 2013)
Log Message
Clean up CSSPrimitiveValue::equals a bit
https://bugs.webkit.org/show_bug.cgi?id=119195
Reviewed by Andreas Kling.
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::equals):
This should not change behavior, but is quite a bit clearer.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (153411 => 153412)
--- trunk/Source/WebCore/ChangeLog 2013-07-28 22:08:58 UTC (rev 153411)
+++ trunk/Source/WebCore/ChangeLog 2013-07-28 23:36:18 UTC (rev 153412)
@@ -1,3 +1,14 @@
+2013-07-28 Sam Weinig <s...@webkit.org>
+
+ Clean up CSSPrimitiveValue::equals a bit
+ https://bugs.webkit.org/show_bug.cgi?id=119195
+
+ Reviewed by Andreas Kling.
+
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::equals):
+ This should not change behavior, but is quite a bit clearer.
+
2013-07-27 Ryuan Choi <ryuan.c...@samsung.com>
[EFL] Bump required version of EFL to 1.7
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (153411 => 153412)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2013-07-28 22:08:58 UTC (rev 153411)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2013-07-28 23:36:18 UTC (rev 153412)
@@ -1382,14 +1382,11 @@
case CSS_PAIR:
return m_value.pair && other.m_value.pair && m_value.pair->equals(*other.m_value.pair);
#if ENABLE(DASHBOARD_SUPPORT)
- case CSS_DASHBOARD_REGION: {
- DashboardRegion* region = getDashboardRegionValue();
- DashboardRegion* otherRegion = other.getDashboardRegionValue();
- return region ? otherRegion && region->equals(*otherRegion) : !otherRegion;
- }
+ case CSS_DASHBOARD_REGION:
+ return m_value.region && other.m_value.region && m_value.region->equals(*other.m_value.region);
#endif
case CSS_PARSER_OPERATOR:
- return m_value.valueID == other.m_value.valueID;
+ return m_value.parserOperator == other.m_value.parserOperator;
case CSS_CALC:
return m_value.calc && other.m_value.calc && m_value.calc->equals(*other.m_value.calc);
case CSS_SHAPE:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
