Title: [184477] branches/safari-601.1.32-branch/Source/WebKit2
- Revision
- 184477
- Author
- [email protected]
- Date
- 2015-05-18 07:22:23 -0700 (Mon, 18 May 2015)
Log Message
Merge r184024. rdar://problem/19790341
Modified Paths
Diff
Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184476 => 184477)
--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:22:17 UTC (rev 184476)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:22:23 UTC (rev 184477)
@@ -1,5 +1,16 @@
2015-05-18 Matthew Hanson <[email protected]>
+ Merge r184024. rdar://problem/19790341
+
+ 2015-05-08 Timothy Horton <[email protected]>
+
+ Fix the build.
+
+ * Platform/mac/LayerHostingContext.mm:
+ (WebKit::LayerHostingContext::createFencePort):
+
+2015-05-18 Matthew Hanson <[email protected]>
+
Merge r184022. rdar://problem/19790341
2015-05-08 Timothy Horton <[email protected]>
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm (184476 => 184477)
--- branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-05-18 14:22:17 UTC (rev 184476)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-05-18 14:22:23 UTC (rev 184477)
@@ -121,7 +121,9 @@
NO_RETURN_DUE_TO_ASSERT MachSendRight LayerHostingContext::createFencePort()
{
ASSERT_NOT_REACHED();
+#if ASSERT_DISABLED
return MachSendRight();
+#endif
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
