[MSVC] Unreviewed build fix for r239080.
authorross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Dec 2018 02:28:52 +0000 (02:28 +0000)
committerross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Dec 2018 02:28:52 +0000 (02:28 +0000)
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didFailToSuspendAfterProcessSwap):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239144 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/WebPageProxy.cpp

index 91a0a64..fbb4e95 100644 (file)
@@ -1,3 +1,10 @@
+2018-12-12  Ross Kirsling  <ross.kirsling@sony.com>
+
+        [MSVC] Unreviewed build fix for r239080.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didFailToSuspendAfterProcessSwap):
+
 2018-12-12  Chris Fleizach  <cfleizach@apple.com>
 
         [meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for unified source builds
index 74495e4..052361f 100644 (file)
@@ -2759,7 +2759,12 @@ void WebPageProxy::continueNavigationInNewProcess(API::Navigation& navigation, s
     };
 }
 
-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();