Title: [193563] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 193563
- Author
- [email protected]
- Date
- 2015-12-05 23:08:10 -0800 (Sat, 05 Dec 2015)
Log Message
Merged r191201. rdar://problem/23772887
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193562 => 193563)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 07:07:13 UTC (rev 193562)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 07:08:10 UTC (rev 193563)
@@ -1,5 +1,22 @@
2015-12-05 Babak Shafiei <[email protected]>
+ Merge r191201.
+
+ 2015-10-16 David Hyatt <[email protected]>
+
+ ASSERT in imported/blink/fast/block/float/overhanging-float-crashes-when-sibling-becomes-formatting-context.html
+ https://bugs.webkit.org/show_bug.cgi?id=150249
+
+ Reviewed by Myles Maxfield.
+
+ Covered by existing tests.
+
+ * css/CSSValue.cpp:
+ (WebCore::CSSValue::equals):
+ Make sure the "unset" value has an equals implementation.
+
+2015-12-05 Babak Shafiei <[email protected]>
+
Merge r191178.
2015-10-16 David Hyatt <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSValue.cpp (193562 => 193563)
--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSValue.cpp 2015-12-06 07:07:13 UTC (rev 193562)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSValue.cpp 2015-12-06 07:08:10 UTC (rev 193563)
@@ -201,6 +201,8 @@
return compareCSSValues<CSSInheritedValue>(*this, other);
case InitialClass:
return compareCSSValues<CSSInitialValue>(*this, other);
+ case UnsetClass:
+ return compareCSSValues<CSSUnsetValue>(*this, other);
#if ENABLE(CSS_GRID_LAYOUT)
case GridLineNamesClass:
return compareCSSValues<CSSGridLineNamesValue>(*this, other);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
