Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (222102 => 222103)
--- trunk/Source/WebCore/CMakeLists.txt 2017-09-15 19:50:40 UTC (rev 222102)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-09-15 19:53:01 UTC (rev 222103)
@@ -34,6 +34,7 @@
"${WEBCORE_DIR}/Modules/mediastream"
"${WEBCORE_DIR}/Modules/navigatorcontentutils"
"${WEBCORE_DIR}/Modules/notifications"
+ "${WEBCORE_DIR}/Modules/paymentrequest"
"${WEBCORE_DIR}/Modules/plugins"
"${WEBCORE_DIR}/Modules/quota"
"${WEBCORE_DIR}/Modules/speech"
@@ -164,6 +165,7 @@
Modules/mediasession
Modules/mediastream
Modules/notifications
+ Modules/paymentrequest
Modules/quota
Modules/speech
Modules/streams
@@ -314,6 +316,23 @@
Modules/notifications/NotificationPermission.idl
Modules/notifications/NotificationPermissionCallback.idl
+ Modules/paymentrequest/PaymentAddress.idl
+ Modules/paymentrequest/PaymentComplete.idl
+ Modules/paymentrequest/PaymentCurrencyAmount.idl
+ Modules/paymentrequest/PaymentDetailsBase.idl
+ Modules/paymentrequest/PaymentDetailsInit.idl
+ Modules/paymentrequest/PaymentDetailsModifier.idl
+ Modules/paymentrequest/PaymentDetailsUpdate.idl
+ Modules/paymentrequest/PaymentItem.idl
+ Modules/paymentrequest/PaymentMethodData.idl
+ Modules/paymentrequest/PaymentOptions.idl
+ Modules/paymentrequest/PaymentRequest.idl
+ Modules/paymentrequest/PaymentRequestUpdateEvent.idl
+ Modules/paymentrequest/PaymentRequestUpdateEventInit.idl
+ Modules/paymentrequest/PaymentResponse.idl
+ Modules/paymentrequest/PaymentShippingOption.idl
+ Modules/paymentrequest/PaymentShippingType.idl
+
Modules/speech/DOMWindowSpeechSynthesis.idl
Modules/speech/SpeechSynthesis.idl
Modules/speech/SpeechSynthesisEvent.idl
@@ -1105,6 +1124,10 @@
Modules/notifications/Notification.cpp
Modules/notifications/NotificationController.cpp
+ Modules/paymentrequest/PaymentRequest.cpp
+ Modules/paymentrequest/PaymentRequestUpdateEvent.cpp
+ Modules/paymentrequest/PaymentResponse.cpp
+
Modules/speech/DOMWindowSpeechSynthesis.cpp
Modules/speech/SpeechSynthesis.cpp
Modules/speech/SpeechSynthesisEvent.cpp
Modified: trunk/Source/WebCore/ChangeLog (222102 => 222103)
--- trunk/Source/WebCore/ChangeLog 2017-09-15 19:50:40 UTC (rev 222102)
+++ trunk/Source/WebCore/ChangeLog 2017-09-15 19:53:01 UTC (rev 222103)
@@ -1,3 +1,21 @@
+2017-09-15 Tim Horton <[email protected]>
+
+ Fix the macOS CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=177015
+
+ Reviewed by Andy Estes.
+
+ * CMakeLists.txt:
+ Add Payment Request files.
+
+ * PlatformMac.cmake:
+ Add the CoreServices umbrella framework to the framework search path.
+ Add service workers directories to the forwarding headers path.
+ Add Modules/cache directory to the forwarding headers path.
+
+ * rendering/svg/RenderSVGRoot.cpp:
+ (WebCore::resolveLengthAttributeForSVG): Deleted unused function.
+
2017-09-15 John Wilander <[email protected]>
Storage Access API: Deny access to nested iframes
Modified: trunk/Source/WebCore/PAL/ChangeLog (222102 => 222103)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-09-15 19:50:40 UTC (rev 222102)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-09-15 19:53:01 UTC (rev 222103)
@@ -1,3 +1,13 @@
+2017-09-15 Tim Horton <[email protected]>
+
+ Fix the macOS CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=177015
+
+ Reviewed by Andy Estes.
+
+ * pal/PlatformMac.cmake:
+ Add WebPanel.
+
2017-09-15 Andy Estes <[email protected]>
[Cocoa] Upstream MediaRemote and VideoToolbox WebKitSystemInterface functions
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (222102 => 222103)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2017-09-15 19:50:40 UTC (rev 222102)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2017-09-15 19:53:01 UTC (rev 222103)
@@ -5,6 +5,7 @@
system/mac/SoundMac.mm
system/mac/SystemSleepListenerMac.mm
+ system/mac/WebPanel.mm
text/mac/KillRingMac.mm
)
Modified: trunk/Source/WebCore/PlatformMac.cmake (222102 => 222103)
--- trunk/Source/WebCore/PlatformMac.cmake 2017-09-15 19:50:40 UTC (rev 222102)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-09-15 19:53:01 UTC (rev 222103)
@@ -14,6 +14,7 @@
find_library(CARBON_LIBRARY Carbon)
find_library(COCOA_LIBRARY Cocoa)
find_library(COREAUDIO_LIBRARY CoreAudio)
+find_library(CORESERVICES_LIBRARY CoreServices)
find_library(DISKARBITRATION_LIBRARY DiskArbitration)
find_library(IOKIT_LIBRARY IOKit)
find_library(IOSURFACE_LIBRARY IOSurface)
@@ -35,6 +36,7 @@
${CARBON_LIBRARY}
${COCOA_LIBRARY}
${COREAUDIO_LIBRARY}
+ ${CORESERVICES_LIBRARY}
${DISKARBITRATION_LIBRARY}
${IOKIT_LIBRARY}
${IOSURFACE_LIBRARY}
@@ -43,15 +45,17 @@
${QUARTZ_LIBRARY}
${QUARTZCORE_LIBRARY}
${SECURITY_LIBRARY}
- ${SQLITE3_LIBRARY}
+ ${SQLITE_LIBRARIES}
${SYSTEMCONFIGURATION_LIBRARY}
${WEBKITSYSTEMINTERFACE_LIBRARY}
${XML2_LIBRARY}
+ ${ZLIB_LIBRARY}
)
add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
add_definitions(-iframework ${AVFOUNDATION_LIBRARY}/Versions/Current/Frameworks)
add_definitions(-iframework ${CARBON_LIBRARY}/Versions/Current/Frameworks)
+add_definitions(-iframework ${CORESERVICES_LIBRARY}/Versions/Current/Frameworks)
add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
find_library(DATADETECTORSCORE_FRAMEWORK DataDetectorsCore HINTS /System/Library/PrivateFrameworks)
@@ -606,6 +610,7 @@
workers
Modules/applepay
+ Modules/cache
Modules/geolocation
Modules/indexeddb
Modules/mediastream
@@ -691,6 +696,10 @@
svg/graphics
svg/properties
+ workers/service
+
+ workers/service/server
+
xml
)
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (222102 => 222103)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2017-09-15 19:50:40 UTC (rev 222102)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2017-09-15 19:53:01 UTC (rev 222103)
@@ -111,11 +111,6 @@
return frame().document()->isSVGDocument();
}
-static inline LayoutUnit resolveLengthAttributeForSVG(const Length& length, float scale, float maxSize)
-{
- return valueForLength(length, maxSize) * (length.isFixed() ? scale : 1);
-}
-
LayoutUnit RenderSVGRoot::computeReplacedLogicalWidth(ShouldComputePreferred shouldComputePreferred) const
{
// When we're embedded through SVGImage (border-image/background-image/<html:img>/...) we're forced to resize to a specific size.
Modified: trunk/Source/WebKit/CMakeLists.txt (222102 => 222103)
--- trunk/Source/WebKit/CMakeLists.txt 2017-09-15 19:50:40 UTC (rev 222102)
+++ trunk/Source/WebKit/CMakeLists.txt 2017-09-15 19:53:01 UTC (rev 222103)
@@ -26,6 +26,7 @@
"${WEBKIT2_DIR}/Shared/Plugins"
"${WEBKIT2_DIR}/Shared/Plugins/Netscape"
"${WEBKIT2_DIR}/Shared/Plugins/Netscape/x11"
+ "${WEBKIT2_DIR}/Shared/RemoteLayerTree"
"${WEBKIT2_DIR}/Shared/Storage"
"${WEBKIT2_DIR}/Shared/WebsiteData"
"${WEBKIT2_DIR}/StorageProcess"
@@ -45,6 +46,7 @@
"${WEBKIT2_DIR}/UIProcess/Network/CustomProtocols"
"${WEBKIT2_DIR}/UIProcess/Notifications"
"${WEBKIT2_DIR}/UIProcess/Plugins"
+ "${WEBKIT2_DIR}/UIProcess/RemoteLayerTree"
"${WEBKIT2_DIR}/UIProcess/Storage"
"${WEBKIT2_DIR}/UIProcess/UserContent"
"${WEBKIT2_DIR}/UIProcess/WebStorage"
@@ -80,6 +82,7 @@
"${WEBKIT2_DIR}/WebProcess/UserContent"
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport"
"${WEBKIT2_DIR}/WebProcess/WebPage"
+ "${WEBKIT2_DIR}/WebProcess/WebPage/RemoteLayerTree"
"${WEBKIT2_DIR}/WebProcess/WebStorage"
"${DERIVED_SOURCES_WEBKIT2_DIR}"
"${DERIVED_SOURCES_WEBKIT2_DIR}/include"
Modified: trunk/Source/WebKit/ChangeLog (222102 => 222103)
--- trunk/Source/WebKit/ChangeLog 2017-09-15 19:50:40 UTC (rev 222102)
+++ trunk/Source/WebKit/ChangeLog 2017-09-15 19:53:01 UTC (rev 222103)
@@ -1,3 +1,18 @@
+2017-09-15 Tim Horton <[email protected]>
+
+ Fix the macOS CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=177015
+
+ Reviewed by Andy Estes.
+
+ * CMakeLists.txt:
+ Add the new RemoteLayerTree directories to the header search path.
+ Add CookieStorageUtilsCF.mm to Sources.
+
+ * PlatformMac.cmake:
+ Add a few more files, and fix the generated forwarding headers include
+ path to name "WebKit" instead of "WebKit2".
+
2017-09-15 Youenn Fablet <[email protected]>
Add an URL method to remove both query string and fragment identifier
Modified: trunk/Source/WebKit/PlatformMac.cmake (222102 => 222103)
--- trunk/Source/WebKit/PlatformMac.cmake 2017-09-15 19:50:40 UTC (rev 222102)
+++ trunk/Source/WebKit/PlatformMac.cmake 2017-09-15 19:53:01 UTC (rev 222103)
@@ -128,6 +128,7 @@
Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
Shared/cf/ArgumentCodersCF.cpp
+ Shared/cf/CookieStorageUtilsCF.mm
Shared/cg/ShareableBitmapCG.cpp
@@ -220,6 +221,7 @@
UIProcess/API/Cocoa/WKWindowFeatures.mm
UIProcess/API/Cocoa/_WKActivatedElementInfo.mm
UIProcess/API/Cocoa/_WKAutomationSession.mm
+ UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm
UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm
UIProcess/API/Cocoa/_WKDownload.mm
UIProcess/API/Cocoa/_WKElementAction.mm
@@ -287,6 +289,7 @@
UIProcess/mac/CorrectionPanel.mm
UIProcess/mac/LegacySessionStateCoding.cpp
+ UIProcess/mac/PageClientImplMac.mm
UIProcess/mac/RemoteWebInspectorProxyMac.mm
UIProcess/mac/SecItemShimProxy.cpp
UIProcess/mac/ServicesController.mm
@@ -523,7 +526,7 @@
foreach (_file ${ObjCHeaders})
get_filename_component(_name ${_file} NAME)
if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKit/${_name})
- file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_name} "#import <WebKit2/UIProcess/API/Cocoa/${_name}>")
+ file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_name} "#import <WebKit/UIProcess/API/Cocoa/${_name}>")
endif ()
endforeach ()
@@ -735,7 +738,7 @@
)
# FIXME: These should not be necessary.
-file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKImageCG.h "#import <WebKit2/Shared/API/c/cg/WKImageCG.h>")
+file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKImageCG.h "#import <WebKit/Shared/API/c/cg/WKImageCG.h>")
file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WebDatabaseManagerPrivate.h "#import <WebKit/mac/Storage/WebDatabaseManagerPrivate.h>")
