Title: [228915] trunk/Source
Revision
228915
Author
ms2...@igalia.com
Date
2018-02-22 01:31:02 -0800 (Thu, 22 Feb 2018)

Log Message

[GTK][WPE] Fix some build errors in service workers code
https://bugs.webkit.org/show_bug.cgi?id=182966

Reviewed by Žan Doberšek.

Source/WebCore:

No new tests: no change in behavior.

* workers/service/ServiceWorkerProvider.h: add missing forward declaration.

Source/WebKit:

* CMakeLists.txt: add missing files.
* StorageProcess/ServiceWorker/WebSWServerConnection.cpp: add missing includes.
* UIProcess/ServiceWorkerProcessProxy.cpp: use #include rather than #import in C++; add missing ifdef.
* UIProcess/ServiceWorkerProcessProxy.h: add missing ifdef.
* WebProcess/Storage/WebSWClientConnection.cpp: add missing includes.
* WebProcess/Storage/WebSWContextManagerConnection.cpp: add missing includes.
(WebKit::WebSWContextManagerConnection::WebSWContextManagerConnection):
  call the function that exists outside cocoa.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (228914 => 228915)


--- trunk/Source/WebCore/ChangeLog	2018-02-22 06:17:45 UTC (rev 228914)
+++ trunk/Source/WebCore/ChangeLog	2018-02-22 09:31:02 UTC (rev 228915)
@@ -1,3 +1,14 @@
+2018-02-22  Ms2ger  <ms2...@igalia.com>
+
+        [GTK][WPE] Fix some build errors in service workers code
+        https://bugs.webkit.org/show_bug.cgi?id=182966
+
+        Reviewed by Žan Doberšek.
+
+        No new tests: no change in behavior.
+
+        * workers/service/ServiceWorkerProvider.h: add missing forward declaration.
+
 2018-02-21  Zalan Bujtas  <za...@apple.com>
 
         [RenderTreeBuilder] Move RenderObject::insertedInto() mutation logic to RenderTreeBuilder

Modified: trunk/Source/WebCore/workers/service/ServiceWorkerProvider.h (228914 => 228915)


--- trunk/Source/WebCore/workers/service/ServiceWorkerProvider.h	2018-02-22 06:17:45 UTC (rev 228914)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerProvider.h	2018-02-22 09:31:02 UTC (rev 228915)
@@ -34,6 +34,7 @@
 namespace WebCore {
 
 class SWClientConnection;
+class SecurityOrigin;
 class ServiceWorkerJob;
 
 class WEBCORE_EXPORT ServiceWorkerProvider {

Modified: trunk/Source/WebKit/CMakeLists.txt (228914 => 228915)


--- trunk/Source/WebKit/CMakeLists.txt	2018-02-22 06:17:45 UTC (rev 228914)
+++ trunk/Source/WebKit/CMakeLists.txt	2018-02-22 09:31:02 UTC (rev 228915)
@@ -287,6 +287,7 @@
 
     StorageProcess/ServiceWorker/WebSWOriginStore.cpp
     StorageProcess/ServiceWorker/WebSWServerConnection.cpp
+    StorageProcess/ServiceWorker/WebSWServerToContextConnection.cpp
 
     UIProcess/BackgroundProcessResponsivenessTimer.cpp
     UIProcess/ChildProcessProxy.cpp
@@ -300,6 +301,7 @@
     UIProcess/RemoteWebInspectorProxy.cpp
     UIProcess/ResourceLoadStatisticsPersistentStorage.cpp
     UIProcess/ResponsivenessTimer.cpp
+    UIProcess/ServiceWorkerProcessProxy.cpp
     UIProcess/StatisticsRequest.cpp
     UIProcess/TextCheckerCompletion.cpp
     UIProcess/UIMessagePortChannelProvider.cpp
@@ -630,6 +632,7 @@
     StorageProcess/IndexedDB/WebIDBConnectionToClient.messages.in
 
     StorageProcess/ServiceWorker/WebSWServerConnection.messages.in
+    StorageProcess/ServiceWorker/WebSWServerToContextConnection.messages.in
 
     UIProcess/DrawingAreaProxy.messages.in
     UIProcess/RemoteWebInspectorProxy.messages.in

Modified: trunk/Source/WebKit/ChangeLog (228914 => 228915)


--- trunk/Source/WebKit/ChangeLog	2018-02-22 06:17:45 UTC (rev 228914)
+++ trunk/Source/WebKit/ChangeLog	2018-02-22 09:31:02 UTC (rev 228915)
@@ -1,3 +1,19 @@
+2018-02-22  Ms2ger  <ms2...@igalia.com>
+
+        [GTK][WPE] Fix some build errors in service workers code
+        https://bugs.webkit.org/show_bug.cgi?id=182966
+
+        Reviewed by Žan Doberšek.
+
+        * CMakeLists.txt: add missing files.
+        * StorageProcess/ServiceWorker/WebSWServerConnection.cpp: add missing includes.
+        * UIProcess/ServiceWorkerProcessProxy.cpp: use #include rather than #import in C++; add missing ifdef.
+        * UIProcess/ServiceWorkerProcessProxy.h: add missing ifdef.
+        * WebProcess/Storage/WebSWClientConnection.cpp: add missing includes.
+        * WebProcess/Storage/WebSWContextManagerConnection.cpp: add missing includes.
+        (WebKit::WebSWContextManagerConnection::WebSWContextManagerConnection):
+          call the function that exists outside cocoa.
+
 2018-02-21  Per Arne Vollan  <pvol...@apple.com>
 
         The WebContent process should not use NSScreen in the screenAvailableRect/screenRect implementations.

Modified: trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp (228914 => 228915)


--- trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp	2018-02-22 06:17:45 UTC (rev 228914)
+++ trunk/Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp	2018-02-22 09:31:02 UTC (rev 228915)
@@ -41,6 +41,7 @@
 #include "WebSWServerConnectionMessages.h"
 #include "WebSWServerToContextConnection.h"
 #include "WebToStorageProcessConnection.h"
+#include <WebCore/DocumentIdentifier.h>
 #include <WebCore/ExceptionData.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/SWServerRegistration.h>
@@ -49,6 +50,7 @@
 #include <WebCore/ServiceWorkerClientIdentifier.h>
 #include <WebCore/ServiceWorkerContextData.h>
 #include <WebCore/ServiceWorkerJobData.h>
+#include <WebCore/ServiceWorkerUpdateViaCache.h>
 #include <wtf/MainThread.h>
 
 using namespace PAL;

Modified: trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.cpp (228914 => 228915)


--- trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.cpp	2018-02-22 06:17:45 UTC (rev 228914)
+++ trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.cpp	2018-02-22 09:31:02 UTC (rev 228915)
@@ -23,9 +23,11 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "config.h"
+#include "config.h"
 #include "ServiceWorkerProcessProxy.h"
 
+#if ENABLE(SERVICE_WORKER)
+
 #include "AuthenticationChallengeProxy.h"
 #include "WebCredential.h"
 #include "WebPageGroup.h"
@@ -100,3 +102,5 @@
 }
 
 } // namespace WebKit
+
+#endif // ENABLE(SERVICE_WORKER)

Modified: trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.h (228914 => 228915)


--- trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.h	2018-02-22 06:17:45 UTC (rev 228914)
+++ trunk/Source/WebKit/UIProcess/ServiceWorkerProcessProxy.h	2018-02-22 09:31:02 UTC (rev 228915)
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#if ENABLE(SERVICE_WORKER)
+
 #include "WebProcessProxy.h"
 
 namespace WebKit {
@@ -57,3 +59,5 @@
 };
 
 } // namespace WebKit
+
+#endif // ENABLE(SERVICE_WORKER)

Modified: trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp (228914 => 228915)


--- trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp	2018-02-22 06:17:45 UTC (rev 228914)
+++ trunk/Source/WebKit/WebProcess/Storage/WebSWClientConnection.cpp	2018-02-22 09:31:02 UTC (rev 228915)
@@ -44,6 +44,7 @@
 #include <WebCore/ServiceWorkerFetchResult.h>
 #include <WebCore/ServiceWorkerJobData.h>
 #include <WebCore/ServiceWorkerRegistrationData.h>
+#include <WebCore/ServiceWorkerRegistrationKey.h>
 
 using namespace PAL;
 using namespace WebCore;

Modified: trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp (228914 => 228915)


--- trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp	2018-02-22 06:17:45 UTC (rev 228914)
+++ trunk/Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp	2018-02-22 09:31:02 UTC (rev 228915)
@@ -53,6 +53,8 @@
 #include <WebCore/SerializedScriptValue.h>
 #include <WebCore/ServiceWorkerClientData.h>
 #include <WebCore/ServiceWorkerClientIdentifier.h>
+#include <WebCore/ServiceWorkerClientQueryOptions.h>
+#include <WebCore/ServiceWorkerJobDataIdentifier.h>
 #include <WebCore/UserAgent.h>
 #include <pal/SessionID.h>
 
@@ -107,7 +109,11 @@
     : m_connectionToStorageProcess(WTFMove(connection))
     , m_pageGroupID(pageGroupID)
     , m_pageID(pageID)
+#if PLATFORM(COCOA)
     , m_userAgent(standardUserAgentWithApplicationName({ }))
+#else
+    , m_userAgent(standardUserAgent())
+#endif
 {
     updatePreferencesStore(store);
 }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to