Attachment 362460 Details for Bug 188318 – Patch

[patch] Patch

bug-188318.diff (text/plain), 10.25 KB, created by Don Olmstead on 2019-02-19 17:38:56 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-02-19 17:38:56 PST

Size: 10.25 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 031b5e2547a..b8ce0ee71f8 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-02-19  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [WinCairo] Enable service worker
>+        https://bugs.webkit.org/show_bug.cgi?id=188318
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/OptionsWin.cmake:
>+
> 2019-02-11  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [GTK][WPE] Add content extensions support in WKTR and unskip layout tests
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c25dffb4f40..bd386add2d0 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-02-19  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [WinCairo] Enable service worker
>+        https://bugs.webkit.org/show_bug.cgi?id=188318
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests (OOPS!).
>+
>+        * WebCorePrefix.h:
>+        * testing/ServiceWorkerInternals.h:
>+        * workers/service/context/SWContextManager.cpp:
>+        (WebCore::SWContextManager::serviceWorkerFailedToTerminate):
>+        * workers/service/context/SWContextManager.h:
>+
> 2019-02-19  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         REGRESSION(r240909): Release assertion in FrameLoader::loadPostRequest when opening new window
>diff --git a/Source/WebCore/WebCorePrefix.h b/Source/WebCore/WebCorePrefix.h
>index 41bee2c95b3..c5a68ffc2ef 100644
>--- a/Source/WebCore/WebCorePrefix.h
>+++ b/Source/WebCore/WebCorePrefix.h
>@@ -41,12 +41,14 @@
> #endif
> #endif
> 
>-#if OS(WINDOWS)
>+#if PLATFORM(WIN)
> #undef WEBCORE_EXPORT
> #define WEBCORE_EXPORT WTF_EXPORT_DECLARATION
>+#undef WEBCORE_TESTSUPPORT_EXPORT
>+#define WEBCORE_TESTSUPPORT_EXPORT WTF_EXPORT_DECLARATION
> #else
> #include <pthread.h>
>-#endif // OS(WINDOWS)
>+#endif // PLATFORM(WIN)
> 
> #include <sys/types.h>
> #include <fcntl.h>
>diff --git a/Source/WebCore/testing/ServiceWorkerInternals.h b/Source/WebCore/testing/ServiceWorkerInternals.h
>index da287e1ef5e..01de501920f 100644
>--- a/Source/WebCore/testing/ServiceWorkerInternals.h
>+++ b/Source/WebCore/testing/ServiceWorkerInternals.h
>@@ -37,7 +37,7 @@ class FetchEvent;
> class FetchResponse;
> class ScriptExecutionContext;
> 
>-class WEBCORE_EXPORT ServiceWorkerInternals : public RefCounted<ServiceWorkerInternals> {
>+class WEBCORE_TESTSUPPORT_EXPORT ServiceWorkerInternals : public RefCounted<ServiceWorkerInternals> {
> public:
>     static Ref<ServiceWorkerInternals> create(ServiceWorkerIdentifier identifier) { return adoptRef(*new ServiceWorkerInternals { identifier }); }
>     ~ServiceWorkerInternals();
>diff --git a/Source/WebCore/workers/service/context/SWContextManager.cpp b/Source/WebCore/workers/service/context/SWContextManager.cpp
>index 89a849ee4de..edbc8f91ee4 100644
>--- a/Source/WebCore/workers/service/context/SWContextManager.cpp
>+++ b/Source/WebCore/workers/service/context/SWContextManager.cpp
>@@ -151,7 +151,7 @@ bool SWContextManager::postTaskToServiceWorker(ServiceWorkerIdentifier identifie
>     return true;
> }
> 
>-NO_RETURN_DUE_TO_CRASH void SWContextManager::serviceWorkerFailedToTerminate(ServiceWorkerIdentifier serviceWorkerIdentifier)
>+void SWContextManager::serviceWorkerFailedToTerminate(ServiceWorkerIdentifier serviceWorkerIdentifier)
> {
>     UNUSED_PARAM(serviceWorkerIdentifier);
>     RELEASE_LOG_ERROR(ServiceWorker, "Failed to terminate service worker with identifier %s, killing the service worker process", serviceWorkerIdentifier.loggingString().utf8().data());
>diff --git a/Source/WebCore/workers/service/context/SWContextManager.h b/Source/WebCore/workers/service/context/SWContextManager.h
>index f97ee6a1a91..7607a8639b4 100644
>--- a/Source/WebCore/workers/service/context/SWContextManager.h
>+++ b/Source/WebCore/workers/service/context/SWContextManager.h
>@@ -87,7 +87,7 @@ private:
>     SWContextManager() = default;
> 
>     void startedServiceWorker(Optional<ServiceWorkerJobDataIdentifier>, ServiceWorkerIdentifier, const String& exceptionMessage);
>-    void serviceWorkerFailedToTerminate(ServiceWorkerIdentifier);
>+    NO_RETURN_DUE_TO_CRASH void serviceWorkerFailedToTerminate(ServiceWorkerIdentifier);
> 
>     HashMap<ServiceWorkerIdentifier, RefPtr<ServiceWorkerThreadProxy>> m_workerMap;
>     std::unique_ptr<Connection> m_connection;
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 91019bbd17a..41e2b471f25 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-02-19  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [WinCairo] Enable service worker
>+        https://bugs.webkit.org/show_bug.cgi?id=188318
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebProcess/Storage/WebSWContextManagerConnection.cpp:
>+        (WebKit::WebSWContextManagerConnection::terminateProcess):
>+        * WebProcess/Storage/WebSWContextManagerConnection.h:
>+        * config.h:
>+
> 2019-02-19  Antti Koivisto  <antti@apple.com>
> 
>         Pass rootContentsLayer to Mac remote layer tree
>diff --git a/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp b/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp
>index 5bd823f7774..4db7a8c306f 100644
>--- a/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp
>+++ b/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp
>@@ -357,7 +357,7 @@ void WebSWContextManagerConnection::didFinishSkipWaiting(uint64_t callbackID)
>         callback();
> }
> 
>-NO_RETURN void WebSWContextManagerConnection::terminateProcess()
>+void WebSWContextManagerConnection::terminateProcess()
> {
>     RELEASE_LOG(ServiceWorker, "Service worker process is exiting because it is no longer needed");
>     _exit(EXIT_SUCCESS);
>diff --git a/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.h b/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.h
>index 9460f0e2c9c..f71af45e682 100644
>--- a/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.h
>+++ b/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.h
>@@ -90,7 +90,7 @@ private:
>     void claimCompleted(uint64_t claimRequestIdentifier);
>     void didFinishSkipWaiting(uint64_t callbackID);
>     void setUserAgent(String&& userAgent);
>-    void terminateProcess();
>+    NO_RETURN void terminateProcess();
> 
>     Ref<IPC::Connection> m_connectionToNetworkProcess;
>     uint64_t m_pageGroupID;
>diff --git a/Source/WebKit/config.h b/Source/WebKit/config.h
>index 65dcb3b0ff5..2c24c7f3382 100644
>--- a/Source/WebKit/config.h
>+++ b/Source/WebKit/config.h
>@@ -36,6 +36,8 @@
> #if PLATFORM(WIN)
> #undef WEBCORE_EXPORT
> #define WEBCORE_EXPORT WTF_EXPORT_DECLARATION
>+#undef WEBCORE_TESTSUPPORT_EXPORT
>+#define WEBCORE_TESTSUPPORT_EXPORT WTF_EXPORT_DECLARATION
> #endif // PLATFORM(WIN)
> 
> #ifdef __cplusplus
>diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
>index 6847b484132..27377283a47 100644
>--- a/Source/cmake/OptionsWin.cmake
>+++ b/Source/cmake/OptionsWin.cmake
>@@ -83,6 +83,9 @@ if (${WTF_PLATFORM_WIN_CAIRO})
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)
> 
>+    # Experimental features
>+    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
>+
>     # FIXME: Implement plugin process on Modern WebKit. https://bugs.webkit.org/show_bug.cgi?id=185313
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF)
> else ()
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 288e9fa4d9f..7ad20063a4d 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-02-19  Don Olmstead  <don.olmstead@sony.com>
>+
>+        [WinCairo] Enable service worker
>+        https://bugs.webkit.org/show_bug.cgi?id=188318
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DumpRenderTree/DumpRenderTreePrefix.h:
>+        * TestWebKitAPI/PlatformWin.cmake:
>+        * TestWebKitAPI/win/TestWebKitAPIPrefix.h:
>+        * WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h:
>+        * WebKitTestRunner/WebKitTestRunnerPrefix.h:
>+
> 2019-02-19  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][Floats] Remove redundant intersecting logic
>diff --git a/Tools/DumpRenderTree/DumpRenderTreePrefix.h b/Tools/DumpRenderTree/DumpRenderTreePrefix.h
>index 105b54356a9..63eea7316be 100644
>--- a/Tools/DumpRenderTree/DumpRenderTreePrefix.h
>+++ b/Tools/DumpRenderTree/DumpRenderTreePrefix.h
>@@ -39,4 +39,6 @@
> #if OS(WINDOWS)
> #undef WEBCORE_EXPORT
> #define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
>+#undef WEBCORE_TESTSUPPORT_EXPORT
>+#define WEBCORE_TESTSUPPORT_EXPORT
> #endif
>diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
>index 4fbcbc4b589..24194a96090 100644
>--- a/Tools/TestWebKitAPI/PlatformWin.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
>@@ -18,7 +18,7 @@ include_directories(
>     ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
> )
> 
>-add_definitions(-DWEBCORE_EXPORT=)
>+add_definitions(-DWEBCORE_EXPORT= -DWEBCORE_TESTSUPPORT_EXPORT=)
> 
> set(test_webcore_LIBRARIES
>     Crypt32
>diff --git a/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h b/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h
>index 8b655f09736..9f6c4ff1311 100644
>--- a/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h
>+++ b/Tools/TestWebKitAPI/win/TestWebKitAPIPrefix.h
>@@ -28,3 +28,5 @@
> 
> #undef WEBCORE_EXPORT
> #define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
>+#undef WEBCORE_TESTSUPPORT_EXPORT
>+#define WEBCORE_TESTSUPPORT_EXPORT WTF_IMPORT_DECLARATION
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h b/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h
>index 78fe41c25cd..3142550dca1 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h
>+++ b/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerInjectedBundlePrefix.h
>@@ -25,3 +25,5 @@
> 
> #undef WEBCORE_EXPORT
> #define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
>+#undef WEBCORE_TESTSUPPORT_EXPORT
>+#define WEBCORE_TESTSUPPORT_EXPORT WTF_IMPORT_DECLARATION
>diff --git a/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h b/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
>index 78ee765cfbf..5cab12d7a13 100644
>--- a/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
>+++ b/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
>@@ -51,4 +51,6 @@
> #if OS(WINDOWS)
> #undef WEBCORE_EXPORT
> #define WEBCORE_EXPORT WTF_IMPORT_DECLARATION
>+#undef WEBCORE_TESTSUPPORT_EXPORT
>+#define WEBCORE_TESTSUPPORT_EXPORT WTF_IMPORT_DECLARATION
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 188318: 362460 | 363293 | 363327 | 363340