Attachment 358054 Details for Bug 193030 – Patch

[patch] Patch

bug-193030-20181225160051.patch (text/plain), 3.88 KB, created by Fujii Hironori on 2018-12-24 23:00:52 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-12-24 23:00:52 PST

Size: 3.88 KB

patch

obsolete

>Subversion Revision: 239551
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 9953c891b096f4757a281467b7e7b315ccba7707..8855ec5aa929e39f582c00768018a9a7d751ec62 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-12-24  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [MSVC] error C2381: 'WebKit::NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker': redefinition; '__declspec(noreturn)' or '[[noreturn]]' differs
>+        https://bugs.webkit.org/show_bug.cgi?id=193030
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Windows Debug builds are failing to compile due to
>+        NO_RETURN_DUE_TO_ASSERT inconsistency of
>+        NetworkHTTPSUpgradeChecker destructor's definition and
>+        declaration.
>+
>+        * NetworkProcess/NetworkHTTPSUpgradeChecker.h: Added
>+        NO_RETURN_DUE_TO_ASSERT to NetworkHTTPSUpgradeChecker destructor
>+        declaration.
>+        * UIProcess/WebPageProxy.cpp: Removed "#if !COMPILER(MSVC)" hacks.
>+        * UIProcess/WebPageProxy.h: Added NO_RETURN_DUE_TO_ASSERT to
>+        declarations of didFailToSuspendAfterProcessSwap and
>+        didSuspendAfterProcessSwap.
>+
> 2018-12-24  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [WebKit][Win] Remove using namespace in the global scope
>diff --git a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h
>index 3837e677b7305e65e0d5dc5d29438d9a1594c49e..afae1dcdf6a7ee233ba483d28f7afa9ba1c6a443 100644
>--- a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h
>+++ b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.h
>@@ -45,7 +45,7 @@ namespace WebKit {
> class NetworkHTTPSUpgradeChecker {
> public:
>     NetworkHTTPSUpgradeChecker();
>-    ~NetworkHTTPSUpgradeChecker();
>+    NO_RETURN_DUE_TO_ASSERT ~NetworkHTTPSUpgradeChecker();
> 
>     // Returns `true` after internal setup is successfully completed. If there is an error with setup, or if setup is in-progress, it will return `false`.
>     bool didSetupCompleteSuccessfully() const { return m_didSetupCompleteSuccessfully; };
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index 9db70710d990100c5cb058bfde92bc77ea51b11d..0a6884f31c23015f30c595dd0d583a77fcb50979 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -2839,20 +2839,14 @@ bool WebPageProxy::isPageOpenedByDOMShowingInitialEmptyDocument() const
>     return openedByDOM() && !hasCommittedAnyProvisionalLoads();
> }
> 
>-// 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();
> }
> 
>-#if !COMPILER(MSVC)
> NO_RETURN_DUE_TO_ASSERT
>-#endif
> void WebPageProxy::didSuspendAfterProcessSwap()
> {
>     // Only the SuspendedPageProxy should be getting this call.
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
>index 01bea50d4f2f281903dd61f9cfe408dfcc02b3ad..0278802335af56f47ba09f257497dd1f995c680a 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit/UIProcess/WebPageProxy.h
>@@ -1568,8 +1568,8 @@ private:
> 
>     void reattachToWebProcess();
>     void swapToWebProcess(Ref<WebProcessProxy>&&, std::unique_ptr<SuspendedPageProxy>&&, ShouldDelayAttachingDrawingArea);
>-    void didFailToSuspendAfterProcessSwap();
>-    void didSuspendAfterProcessSwap();
>+    NO_RETURN_DUE_TO_ASSERT void didFailToSuspendAfterProcessSwap();
>+    NO_RETURN_DUE_TO_ASSERT void didSuspendAfterProcessSwap();
> 
>     void finishAttachingToWebProcess(ShouldDelayAttachingDrawingArea = ShouldDelayAttachingDrawingArea::No);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 193030: 358054 | 358089 | 358093