Title: [193528] branches/safari-601-branch/Source/WebCore
- Revision
- 193528
- Author
- matthew_han...@apple.com
- Date
- 2015-12-05 11:54:34 -0800 (Sat, 05 Dec 2015)
Log Message
Merge r191201. rdar://problem/23772907
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193527 => 193528)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-05 19:54:32 UTC (rev 193527)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-05 19:54:34 UTC (rev 193528)
@@ -1,5 +1,22 @@
2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+ Merge r191201. rdar://problem/23772907
+
+ 2015-10-16 David Hyatt <hy...@apple.com>
+
+ 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 Matthew Hanson <matthew_han...@apple.com>
+
Merge r191178. rdar://problem/23772788
2015-10-16 David Hyatt <hy...@apple.com>
Modified: branches/safari-601-branch/Source/WebCore/css/CSSValue.cpp (193527 => 193528)
--- branches/safari-601-branch/Source/WebCore/css/CSSValue.cpp 2015-12-05 19:54:32 UTC (rev 193527)
+++ branches/safari-601-branch/Source/WebCore/css/CSSValue.cpp 2015-12-05 19:54:34 UTC (rev 193528)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
