Title: [239129] trunk/Source/WebKit
- Revision
- 239129
- Author
- ross.kirsl...@sony.com
- Date
- 2018-12-12 13:44:07 -0800 (Wed, 12 Dec 2018)
Log Message
Unreviewed build fix for WinCairo Debug after r239080(?).
MSVC gives a redefinition error if noreturn is specified on the definition instead of the declaration.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didFailToSuspendAfterProcessSwap):
* UIProcess/WebPageProxy.h:
Move NO_RETURN_DUE_TO_ASSERT to the declaration site.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (239128 => 239129)
--- trunk/Source/WebKit/ChangeLog 2018-12-12 21:21:55 UTC (rev 239128)
+++ trunk/Source/WebKit/ChangeLog 2018-12-12 21:44:07 UTC (rev 239129)
@@ -1,3 +1,14 @@
+2018-12-12 Ross Kirsling <ross.kirsl...@sony.com>
+
+ Unreviewed build fix for WinCairo Debug after r239080(?).
+
+ MSVC gives a redefinition error if noreturn is specified on the definition instead of the declaration.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didFailToSuspendAfterProcessSwap):
+ * UIProcess/WebPageProxy.h:
+ Move NO_RETURN_DUE_TO_ASSERT to the declaration site.
+
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 (239128 => 239129)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-12-12 21:21:55 UTC (rev 239128)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-12-12 21:44:07 UTC (rev 239129)
@@ -2759,7 +2759,7 @@
};
}
-NO_RETURN_DUE_TO_ASSERT void WebPageProxy::didFailToSuspendAfterProcessSwap()
+void WebPageProxy::didFailToSuspendAfterProcessSwap()
{
// Only the SuspendedPageProxy should be getting this call.
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (239128 => 239129)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-12-12 21:21:55 UTC (rev 239128)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-12-12 21:44:07 UTC (rev 239129)
@@ -1566,7 +1566,7 @@
void reattachToWebProcess();
void swapToWebProcess(Ref<WebProcessProxy>&&, std::unique_ptr<SuspendedPageProxy>&&, ShouldDelayAttachingDrawingArea);
- void didFailToSuspendAfterProcessSwap();
+ NO_RETURN_DUE_TO_ASSERT void didFailToSuspendAfterProcessSwap();
void finishAttachingToWebProcess(ShouldDelayAttachingDrawingArea = ShouldDelayAttachingDrawingArea::No);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
