Title: [226979] trunk/Source
- Revision
- 226979
- Author
- [email protected]
- Date
- 2018-01-16 10:55:09 -0800 (Tue, 16 Jan 2018)
Log Message
[CMake][Mac] Fix the build errors
https://bugs.webkit.org/show_bug.cgi?id=181665
Patch by Fujii Hironori <[email protected]> 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).
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (226978 => 226979)
--- trunk/Source/WebCore/CMakeLists.txt 2018-01-16 18:52:07 UTC (rev 226978)
+++ trunk/Source/WebCore/CMakeLists.txt 2018-01-16 18:55:09 UTC (rev 226979)
@@ -335,6 +335,7 @@
Modules/notifications/NotificationPermission.idl
Modules/notifications/NotificationPermissionCallback.idl
+ Modules/paymentrequest/MerchantValidationEvent.idl
Modules/paymentrequest/PaymentAddress.idl
Modules/paymentrequest/PaymentComplete.idl
Modules/paymentrequest/PaymentCurrencyAmount.idl
Modified: trunk/Source/WebCore/ChangeLog (226978 => 226979)
--- trunk/Source/WebCore/ChangeLog 2018-01-16 18:52:07 UTC (rev 226978)
+++ trunk/Source/WebCore/ChangeLog 2018-01-16 18:55:09 UTC (rev 226979)
@@ -1,3 +1,16 @@
+2018-01-16 Fujii Hironori <[email protected]>
+
+ [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 <[email protected]>
[Attachment Support] Provide the `src` of an attachment to the UI delegate when an attachment is inserted
Modified: trunk/Source/WebCore/PlatformMac.cmake (226978 => 226979)
--- trunk/Source/WebCore/PlatformMac.cmake 2018-01-16 18:52:07 UTC (rev 226978)
+++ trunk/Source/WebCore/PlatformMac.cmake 2018-01-16 18:55:09 UTC (rev 226979)
@@ -145,6 +145,8 @@
)
list(APPEND WebCore_SOURCES
+ Modules/paymentrequest/MerchantValidationEvent.cpp
+
accessibility/mac/AXObjectCacheMac.mm
accessibility/mac/AccessibilityObjectMac.mm
accessibility/mac/WebAccessibilityObjectWrapperMac.mm
@@ -499,7 +501,10 @@
svg
workers
+ workers/service/context
+
Modules/applepay
+ Modules/applicationmanifest
Modules/cache
Modules/geolocation
Modules/indexeddb
Modified: trunk/Source/WebKit/CMakeLists.txt (226978 => 226979)
--- trunk/Source/WebKit/CMakeLists.txt 2018-01-16 18:52:07 UTC (rev 226978)
+++ trunk/Source/WebKit/CMakeLists.txt 2018-01-16 18:55:09 UTC (rev 226979)
@@ -182,6 +182,8 @@
Shared/SharedStringHashTableReadOnly.cpp
Shared/SharedStringHashTable.cpp
Shared/StatisticsData.cpp
+ Shared/TouchBarMenuData.cpp
+ Shared/TouchBarMenuItemData.cpp
Shared/URLSchemeTaskParameters.cpp
Shared/UpdateInfo.cpp
Shared/UserData.cpp
Modified: trunk/Source/WebKit/ChangeLog (226978 => 226979)
--- trunk/Source/WebKit/ChangeLog 2018-01-16 18:52:07 UTC (rev 226978)
+++ trunk/Source/WebKit/ChangeLog 2018-01-16 18:55:09 UTC (rev 226979)
@@ -1,3 +1,15 @@
+2018-01-16 Fujii Hironori <[email protected]>
+
+ [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 <[email protected]>
[Attachment Support] Provide the `src` of an attachment to the UI delegate when an attachment is inserted
Modified: trunk/Source/WebKit/PlatformMac.cmake (226978 => 226979)
--- trunk/Source/WebKit/PlatformMac.cmake 2018-01-16 18:52:07 UTC (rev 226978)
+++ trunk/Source/WebKit/PlatformMac.cmake 2018-01-16 18:55:09 UTC (rev 226979)
@@ -225,6 +225,7 @@
UIProcess/API/Cocoa/WKWebsiteDataStore.mm
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
UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm
@@ -308,6 +309,8 @@
UIProcess/mac/WKFullScreenWindowController.mm
UIProcess/mac/WKImmediateActionController.mm
UIProcess/mac/WKInspectorViewController.mm
+ UIProcess/mac/WKInspectorWKWebView.mm
+ UIProcess/mac/WKInspectorWindow.mm
UIProcess/mac/WKPrintingView.mm
UIProcess/mac/WKSharingServicePickerDelegate.mm
UIProcess/mac/WKTextFinderClient.mm
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (226978 => 226979)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2018-01-16 18:52:07 UTC (rev 226978)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2018-01-16 18:55:09 UTC (rev 226979)
@@ -450,6 +450,7 @@
- (size_t)_webPageContentProcessCount
{
auto allWebProcesses = _processPool->processes();
+#if ENABLE(SERVICE_WORKER)
auto* serviceWorkerProcess = _processPool->serviceWorkerProxy();
if (!serviceWorkerProcess)
return allWebProcesses.size();
@@ -468,6 +469,9 @@
#endif
return allWebProcesses.size() - 1;
+#else
+ return allWebProcesses.size();
+#endif
}
- (void)_preconnectToServer:(NSURL *)serverURL
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
