Changeset 226979 in webkit

Timestamp:

Jan 16, 2018 10:55:09 AM (6 years ago)

Author:

achristensen@apple.com

Message:

[CMake][Mac] Fix the build errors
​https://bugs.webkit.org/show_bug.cgi?id=181665

Patch by Fujii Hironori <Fujii Hironori> on 2018-01-16
Reviewed by Alex Christensen.

Source/WebCore:

No new tests (No behavior change)

• CMakeLists.txt: Added Modules/paymentrequest/MerchantValidationEvent.idl to compile.
• PlatformMac.cmake: Added Modules/paymentrequest/MerchantValidationEvent.cpp to compile.

Added workers/service/context and Modules/applicationmanifest as forwarding header paths.

Source/WebKit:

• CMakeLists.txt: Added TouchBarMenuData.cpp and TouchBarMenuItemData.cpp to compile.
• PlatformMac.cmake: Added _WKApplicationManifest.mm, WKInspectorWKWebView.mm and WKInspectorWindow.mm to compile.
• UIProcess/API/Cocoa/WKProcessPool.mm:

(-[WKProcessPool _webPageContentProcessCount]): Call WebProcessPool::serviceWorkerProxy() only if ENABLE(SERVICE_WORKER).

Location:

trunk/Source

Files:

• WebCore/CMakeLists.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/PlatformMac.cmake (modified) (2 diffs)
• WebKit/CMakeLists.txt (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/PlatformMac.cmake (modified) (2 diffs)
• WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (modified) (2 diffs)

trunk/Source/WebCore/CMakeLists.txt

@@ -336 +336 @@
     Modules/notifications/NotificationPermissionCallback.idl
 
+    Modules/paymentrequest/MerchantValidationEvent.idl
     Modules/paymentrequest/PaymentAddress.idl
     Modules/paymentrequest/PaymentComplete.idl

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-16  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [CMake][Mac] Fix the build errors
+        https://bugs.webkit.org/show_bug.cgi?id=181665
+
+        Reviewed by Alex Christensen.
+
+        No new tests (No behavior change)
+
+        * CMakeLists.txt: Added Modules/paymentrequest/MerchantValidationEvent.idl to compile.
+        * PlatformMac.cmake: Added Modules/paymentrequest/MerchantValidationEvent.cpp to compile.
+        Added workers/service/context and Modules/applicationmanifest as forwarding header paths.
+
 2018-01-16  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/PlatformMac.cmake

@@ -146 +146 @@
 
 list(APPEND WebCore_SOURCES
+    Modules/paymentrequest/MerchantValidationEvent.cpp
+
     accessibility/mac/AXObjectCacheMac.mm
     accessibility/mac/AccessibilityObjectMac.mm
@@ -500 +502 @@
     workers
 
+    workers/service/context
+
     Modules/applepay
+    Modules/applicationmanifest
     Modules/cache
     Modules/geolocation

trunk/Source/WebKit/CMakeLists.txt

@@ -183 +183 @@
     Shared/SharedStringHashTable.cpp
     Shared/StatisticsData.cpp
+    Shared/TouchBarMenuData.cpp
+    Shared/TouchBarMenuItemData.cpp
     Shared/URLSchemeTaskParameters.cpp
     Shared/UpdateInfo.cpp

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-01-16  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [CMake][Mac] Fix the build errors
+        https://bugs.webkit.org/show_bug.cgi?id=181665
+
+        Reviewed by Alex Christensen.
+
+        * CMakeLists.txt: Added TouchBarMenuData.cpp and TouchBarMenuItemData.cpp to compile.
+        * PlatformMac.cmake: Added _WKApplicationManifest.mm, WKInspectorWKWebView.mm and WKInspectorWindow.mm to compile.
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (-[WKProcessPool _webPageContentProcessCount]): Call WebProcessPool::serviceWorkerProxy() only if ENABLE(SERVICE_WORKER).
+
 2018-01-16  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/PlatformMac.cmake

@@ -226 +226 @@
     UIProcess/API/Cocoa/WKWindowFeatures.mm
     UIProcess/API/Cocoa/_WKActivatedElementInfo.mm
+    UIProcess/API/Cocoa/_WKApplicationManifest.mm
     UIProcess/API/Cocoa/_WKAttachment.mm
     UIProcess/API/Cocoa/_WKAutomationSession.mm
@@ -309 +310 @@
     UIProcess/mac/WKImmediateActionController.mm
     UIProcess/mac/WKInspectorViewController.mm
+    UIProcess/mac/WKInspectorWKWebView.mm
+    UIProcess/mac/WKInspectorWindow.mm
     UIProcess/mac/WKPrintingView.mm
     UIProcess/mac/WKSharingServicePickerDelegate.mm

trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm

@@ -451 +451 @@
 {
     auto allWebProcesses = _processPool->processes();
+#if ENABLE(SERVICE_WORKER)
     auto* serviceWorkerProcess = _processPool->serviceWorkerProxy();
     if (!serviceWorkerProcess)
@@ -469 +470 @@
 
     return allWebProcesses.size() - 1;
+#else
+    return allWebProcesses.size();
+#endif
 }