Title: [184473] branches/safari-601.1.32-branch/Source/WebKit2
- Revision
- 184473
- Author
- [email protected]
- Date
- 2015-05-18 07:21:58 -0700 (Mon, 18 May 2015)
Log Message
Merge r184012. rdar://problem/19790341
Modified Paths
Diff
Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184472 => 184473)
--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:21:53 UTC (rev 184472)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:21:58 UTC (rev 184473)
@@ -1,5 +1,16 @@
2015-05-18 Matthew Hanson <[email protected]>
+ Merge r184012. 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 r184011. rdar://problem/19790341
2015-05-08 Timothy Horton <[email protected]>
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm (184472 => 184473)
--- branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-05-18 14:21:53 UTC (rev 184472)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-05-18 14:21:58 UTC (rev 184473)
@@ -118,7 +118,7 @@
ASSERT_NOT_REACHED();
}
-NO_RETURN_DUE_TO_ASSERT const MachSendRight& LayerHostingContext::createFencePort()
+NO_RETURN_DUE_TO_ASSERT MachSendRight LayerHostingContext::createFencePort()
{
ASSERT_NOT_REACHED();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
