Title: [192977] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 192977
- Author
- matthew_han...@apple.com
- Date
- 2015-12-02 15:04:24 -0800 (Wed, 02 Dec 2015)
Log Message
Merge r192368. rdar://problem/23189763
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (192976 => 192977)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-02 23:04:21 UTC (rev 192976)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-02 23:04:24 UTC (rev 192977)
@@ -1,3 +1,16 @@
+2015-12-02 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r192368. rdar://problem/23189763
+
+ 2015-11-12 Csaba Osztrogonác <o...@webkit.org>
+
+ Fix build failure due to missing NeverDestroyed.h include after r192169
+ https://bugs.webkit.org/show_bug.cgi?id=151186
+
+ Reviewed by Darin Adler.
+
+ * rendering/RenderCombineText.cpp:
+
2015-12-01 Matthew Hanson <matthew_han...@apple.com>
Merge r192169. rdar://problem/23189763
Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderCombineText.cpp (192976 => 192977)
--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderCombineText.cpp 2015-12-02 23:04:21 UTC (rev 192976)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderCombineText.cpp 2015-12-02 23:04:24 UTC (rev 192977)
@@ -23,6 +23,7 @@
#include "RenderBlock.h"
#include "StyleInheritedData.h"
+#include <wtf/NeverDestroyed.h>
namespace WebCore {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
