Diff
Modified: trunk/Source/WebCore/ChangeLog (225930 => 225931)
--- trunk/Source/WebCore/ChangeLog 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Source/WebCore/ChangeLog 2017-12-14 22:22:25 UTC (rev 225931)
@@ -1,3 +1,13 @@
+2017-12-14 Alex Christensen <achristen...@webkit.org>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=180835
+
+ Reviewed by Andy Estes.
+
+ * PlatformMac.cmake:
+ * platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h:
+
2017-12-14 Antoine Quint <grao...@apple.com>
[Web Animations] Use is<> when possible
Modified: trunk/Source/WebCore/PlatformMac.cmake (225930 => 225931)
--- trunk/Source/WebCore/PlatformMac.cmake 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-12-14 22:22:25 UTC (rev 225931)
@@ -499,6 +499,7 @@
svg
workers
+ Modules/applicationmanifest
Modules/applepay
Modules/cache
Modules/geolocation
@@ -591,6 +592,7 @@
workers/service
+ workers/service/context
workers/service/server
xml
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h (225930 => 225931)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h 2017-12-14 22:22:25 UTC (rev 225931)
@@ -25,7 +25,7 @@
#pragma once
-#if HAVE(AVCONTENTKEYSESSION)
+#if HAVE(AVCONTENTKEYSESSION) && ENABLE(ENCRYPTED_MEDIA)
#include "CDMInstance.h"
#include <wtf/Function.h>
Modified: trunk/Source/WebKit/ChangeLog (225930 => 225931)
--- trunk/Source/WebKit/ChangeLog 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Source/WebKit/ChangeLog 2017-12-14 22:22:25 UTC (rev 225931)
@@ -1,5 +1,22 @@
2017-12-14 Alex Christensen <achristen...@webkit.org>
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=180835
+
+ Reviewed by Andy Estes.
+
+ * PlatformMac.cmake:
+ * Shared/WebsiteDataStoreParameters.cpp:
+ (WebKit::WebsiteDataStoreParameters::ephemeralParametersWithSessionID):
+ * Shared/WebsiteDataStoreParameters.h:
+ * UIProcess/API/APIAttachment.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::setPrivateBrowsingEnabled):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setSessionID):
+
+2017-12-14 Alex Christensen <achristen...@webkit.org>
+
Use move semantics for SandboxExtension::Handle
https://bugs.webkit.org/show_bug.cgi?id=180792
Modified: trunk/Source/WebKit/PlatformMac.cmake (225930 => 225931)
--- trunk/Source/WebKit/PlatformMac.cmake 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Source/WebKit/PlatformMac.cmake 2017-12-14 22:22:25 UTC (rev 225931)
@@ -71,6 +71,8 @@
Shared/APIWebArchive.mm
Shared/APIWebArchiveResource.mm
+ Shared/TouchBarMenuData.cpp
+ Shared/TouchBarMenuItemData.cpp
Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm
@@ -225,6 +227,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 +311,7 @@
UIProcess/mac/WKFullScreenWindowController.mm
UIProcess/mac/WKImmediateActionController.mm
UIProcess/mac/WKInspectorViewController.mm
+ UIProcess/mac/WKInspectorWKWebView.mm
UIProcess/mac/WKPrintingView.mm
UIProcess/mac/WKSharingServicePickerDelegate.mm
UIProcess/mac/WKTextFinderClient.mm
@@ -480,6 +484,8 @@
UIProcess/API/C/WKPageDiagnosticLoggingClient.h
UIProcess/API/C/WKPageNavigationClient.h
UIProcess/API/C/WKPageRenderingProgressEvents.h
+
+ WebProcess/WebPage/WebPageOverlay.h
)
list(APPEND WebKit_MESSAGES_IN_FILES
@@ -517,7 +523,6 @@
Shared/API/c/cf
Shared/API/c/mac
- UIProcess
UIProcess/Cocoa
UIProcess/API/C
@@ -526,8 +531,6 @@
UIProcess/API/C/mac
UIProcess/API/cpp
- WebProcess/WebPage
-
WebProcess/InjectedBundle/API/Cocoa
WebProcess/InjectedBundle/API/c
WebProcess/InjectedBundle/API/mac
Modified: trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp (225930 => 225931)
--- trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp 2017-12-14 22:22:25 UTC (rev 225931)
@@ -91,4 +91,10 @@
return { { }, { }, { }, { }, WebsiteDataStore::defaultCacheStoragePerOriginQuota, { }, { PAL::SessionID::legacyPrivateSessionID(), { }, { }, { }}};
}
+WebsiteDataStoreParameters WebsiteDataStoreParameters::ephemeralParametersWithSessionID(PAL::SessionID sessionID)
+{
+ ASSERT(sessionID.isEphemeral());
+ return {{ }, { }, { }, { }, { }, { }, { sessionID, { }, { }, { }}};
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.h (225930 => 225931)
--- trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.h 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.h 2017-12-14 22:22:25 UTC (rev 225931)
@@ -44,7 +44,9 @@
WebsiteDataStoreParameters(WebsiteDataStoreParameters&&) = default;
WebsiteDataStoreParameters& operator=(WebsiteDataStoreParameters&&) = default;
~WebsiteDataStoreParameters();
+
static WebsiteDataStoreParameters legacyPrivateSessionParameters();
+ static WebsiteDataStoreParameters ephemeralParametersWithSessionID(PAL::SessionID);
void encode(IPC::Encoder&) const;
static std::optional<WebsiteDataStoreParameters> decode(IPC::Decoder&);
Modified: trunk/Source/WebKit/UIProcess/API/APIAttachment.h (225930 => 225931)
--- trunk/Source/WebKit/UIProcess/API/APIAttachment.h 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Source/WebKit/UIProcess/API/APIAttachment.h 2017-12-14 22:22:25 UTC (rev 225931)
@@ -26,8 +26,8 @@
#pragma once
#include "APIObject.h"
+#include "WebPageProxy.h"
#include <WebKit/WKBase.h>
-#include <WebKit/WebPageProxy.h>
#include <wtf/RefPtr.h>
#include <wtf/WeakPtr.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp (225930 => 225931)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp 2017-12-14 22:22:25 UTC (rev 225931)
@@ -321,7 +321,7 @@
{
if (enabled) {
WebProcess::singleton().ensureLegacyPrivateBrowsingSessionInNetworkProcess();
- WebFrameNetworkingContext::ensureWebsiteDataStoreSession({ { }, { }, { }, { }, { }, { }, { PAL::SessionID::legacyPrivateSessionID(), { }, { }, AllowsCellularAccess::Yes }});
+ WebFrameNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters::legacyPrivateSessionParameters());
} else
SessionTracker::destroySession(PAL::SessionID::legacyPrivateSessionID());
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (225930 => 225931)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2017-12-14 22:22:25 UTC (rev 225931)
@@ -2742,7 +2742,7 @@
void WebPage::setSessionID(PAL::SessionID sessionID)
{
if (sessionID.isEphemeral())
- WebProcess::singleton().addWebsiteDataStore({{ }, { }, { }, { }, { }, { }, { sessionID, { }, { }, { }}});
+ WebProcess::singleton().addWebsiteDataStore(WebsiteDataStoreParameters::ephemeralParametersWithSessionID(sessionID));
m_page->setSessionID(sessionID);
}
Modified: trunk/Tools/ChangeLog (225930 => 225931)
--- trunk/Tools/ChangeLog 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Tools/ChangeLog 2017-12-14 22:22:25 UTC (rev 225931)
@@ -1,3 +1,13 @@
+2017-12-14 Alex Christensen <achristen...@webkit.org>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=180835
+
+ Reviewed by Andy Estes.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+
2017-12-14 Jonathan Bedard <jbed...@apple.com>
webkitpy: Better name-version mapping (Follow-up fix)
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (225930 => 225931)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-12-14 22:22:25 UTC (rev 225931)
@@ -78,7 +78,6 @@
#import <WebKit/WebFrameView.h>
#import <WebKit/WebHistory.h>
#import <WebKit/WebHistoryItemPrivate.h>
-#import <WebKit/WebInspector.h>
#import <WebKit/WebKitNSStringExtras.h>
#import <WebKit/WebPluginDatabase.h>
#import <WebKit/WebPreferenceKeysPrivate.h>
@@ -87,6 +86,7 @@
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebStorageManagerPrivate.h>
#import <WebKit/WebViewPrivate.h>
+#import <WebKitLegacy/WebInspector.h>
#import <getopt.h>
#import <wtf/Assertions.h>
#import <wtf/FastMalloc.h>
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (225930 => 225931)
--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-12-14 22:16:38 UTC (rev 225930)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-12-14 22:22:25 UTC (rev 225931)
@@ -27,7 +27,6 @@
#import "AppDelegate.h"
#import "SettingsController.h"
-#import <WebKit/WebInspector.h>
#import <WebKit/WebKit.h>
#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebPreferences.h>
@@ -34,6 +33,7 @@
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebPreferenceKeysPrivate.h>
#import <WebKit/WebViewPrivate.h>
+#import <WebKitLegacy/WebInspector.h>
@interface WK1BrowserWindowController () <WebFrameLoadDelegate, WebPolicyDelegate, WebResourceLoadDelegate, WebUIDelegate>
@end
