Title: [239144] trunk/Source/WebKit
- Revision
- 239144
- Author
- ross.kirsl...@sony.com
- Date
- 2018-12-12 18:28:52 -0800 (Wed, 12 Dec 2018)
Log Message
[MSVC] Unreviewed build fix for r239080.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didFailToSuspendAfterProcessSwap):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (239143 => 239144)
--- trunk/Source/WebKit/ChangeLog 2018-12-13 02:19:24 UTC (rev 239143)
+++ trunk/Source/WebKit/ChangeLog 2018-12-13 02:28:52 UTC (rev 239144)
@@ -1,3 +1,10 @@
+2018-12-12 Ross Kirsling <ross.kirsl...@sony.com>
+
+ [MSVC] Unreviewed build fix for r239080.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didFailToSuspendAfterProcessSwap):
+
2018-12-12 Chris Fleizach <cfleiz...@apple.com>
[meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for unified source builds
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (239143 => 239144)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-12-13 02:19:24 UTC (rev 239143)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-12-13 02:28:52 UTC (rev 239144)
@@ -2759,7 +2759,12 @@
};
}
-NO_RETURN_DUE_TO_ASSERT void WebPageProxy::didFailToSuspendAfterProcessSwap()
+// MSVC gives a redeclaration error if noreturn is used on the definition and not the declaration, while
+// Cocoa tests segfault if it is moved to the declaration site (even if we move the definition with it!).
+#if !COMPILER(MSVC)
+NO_RETURN_DUE_TO_ASSERT
+#endif
+void WebPageProxy::didFailToSuspendAfterProcessSwap()
{
// Only the SuspendedPageProxy should be getting this call.
ASSERT_NOT_REACHED();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
