Unreviewed, rolling out r225931.

Breaks internal builds.

Reverted changeset:

"Fix Mac CMake build"
https://bugs.webkit.org/show_bug.cgi?id=180835
https://trac.webkit.org/changeset/225931

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@225949 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

Source/WebCore/ChangeLog

@@ -1,3 +1,15 @@
+2017-12-14  Ryan Haddad  <[email protected]>
+
+        Unreviewed, rolling out r225931.
+
+        Breaks internal builds.
+
+        Reverted changeset:
+
+        "Fix Mac CMake build"
+        https://bugs.webkit.org/show_bug.cgi?id=180835
+        https://trac.webkit.org/changeset/225931
+
 2017-12-14  Simon Fraser  <[email protected]>
 
         Another Windows build fix.

Source/WebCore/PlatformMac.cmake

@@ -499,7 +499,6 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     svg
     workers
 
-    Modules/applicationmanifest
     Modules/applepay
     Modules/cache
     Modules/geolocation
@@ -592,7 +591,6 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
 
     workers/service
 
-    workers/service/context
     workers/service/server
 
     xml

Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#if HAVE(AVCONTENTKEYSESSION) && ENABLE(ENCRYPTED_MEDIA)
+#if HAVE(AVCONTENTKEYSESSION)
 
 #include "CDMInstance.h"
 #include <wtf/Function.h>

Source/WebKit/ChangeLog

@@ -1,3 +1,15 @@
+2017-12-14  Ryan Haddad  <[email protected]>
+
+        Unreviewed, rolling out r225931.
+
+        Breaks internal builds.
+
+        Reverted changeset:
+
+        "Fix Mac CMake build"
+        https://bugs.webkit.org/show_bug.cgi?id=180835
+        https://trac.webkit.org/changeset/225931
+
 2017-12-14  Chris Dumez  <[email protected]>
 
         Clearing WebSite data on iOS does not clear the Fetch Cache

Source/WebKit/PlatformMac.cmake

@@ -71,8 +71,6 @@ list(APPEND WebKit_SOURCES
 
     Shared/APIWebArchive.mm
     Shared/APIWebArchiveResource.mm
-    Shared/TouchBarMenuData.cpp
-    Shared/TouchBarMenuItemData.cpp
 
     Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm
 
@@ -227,7 +225,6 @@ list(APPEND WebKit_SOURCES
     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
@@ -311,7 +308,6 @@ list(APPEND WebKit_SOURCES
     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
@@ -484,8 +480,6 @@ set(WebKit_FORWARDING_HEADERS_FILES
     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
@@ -523,6 +517,7 @@ set(WebKit_FORWARDING_HEADERS_DIRECTORIES
     Shared/API/c/cf
     Shared/API/c/mac
 
+    UIProcess
     UIProcess/Cocoa
 
     UIProcess/API/C
@@ -531,6 +526,8 @@ set(WebKit_FORWARDING_HEADERS_DIRECTORIES
     UIProcess/API/C/mac
     UIProcess/API/cpp
 
+    WebProcess/WebPage
+
     WebProcess/InjectedBundle/API/Cocoa
     WebProcess/InjectedBundle/API/c
     WebProcess/InjectedBundle/API/mac

Source/WebKit/Shared/WebsiteDataStoreParameters.cpp

@@ -91,10 +91,4 @@ WebsiteDataStoreParameters WebsiteDataStoreParameters::legacyPrivateSessionParam
     return { { }, { }, { }, { }, WebsiteDataStore::defaultCacheStoragePerOriginQuota, { }, { PAL::SessionID::legacyPrivateSessionID(), { }, { }, { }}};
 }
 
-WebsiteDataStoreParameters WebsiteDataStoreParameters::ephemeralParametersWithSessionID(PAL::SessionID sessionID)
-{
-    ASSERT(sessionID.isEphemeral());
-    return {{ }, { }, { }, { }, { }, { }, { sessionID, { }, { }, { }}};
-}
-
 } // namespace WebKit

Source/WebKit/Shared/WebsiteDataStoreParameters.h

@@ -44,9 +44,7 @@ struct WebsiteDataStoreParameters {
     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&);

Source/WebKit/UIProcess/API/APIAttachment.h

@@ -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>

Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -321,7 +321,7 @@ void InjectedBundle::setPrivateBrowsingEnabled(WebPageGroupProxy* pageGroup, boo
 {
     if (enabled) {
         WebProcess::singleton().ensureLegacyPrivateBrowsingSessionInNetworkProcess();
-        WebFrameNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters::legacyPrivateSessionParameters());
+        WebFrameNetworkingContext::ensureWebsiteDataStoreSession({ { }, { }, { }, { }, { }, { }, { PAL::SessionID::legacyPrivateSessionID(), { }, { }, AllowsCellularAccess::Yes }});
     } else
         SessionTracker::destroySession(PAL::SessionID::legacyPrivateSessionID());
 

Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -2742,7 +2742,7 @@ void WebPage::setLayerHostingMode(LayerHostingMode layerHostingMode)
 void WebPage::setSessionID(PAL::SessionID sessionID)
 {
     if (sessionID.isEphemeral())
-        WebProcess::singleton().addWebsiteDataStore(WebsiteDataStoreParameters::ephemeralParametersWithSessionID(sessionID));
+        WebProcess::singleton().addWebsiteDataStore({{ }, { }, { }, { }, { }, { }, { sessionID, { }, { }, { }}});
     m_page->setSessionID(sessionID);
 }
 

Tools/ChangeLog

@@ -1,3 +1,15 @@
+2017-12-14  Ryan Haddad  <[email protected]>
+
+        Unreviewed, rolling out r225931.
+
+        Breaks internal builds.
+
+        Reverted changeset:
+
+        "Fix Mac CMake build"
+        https://bugs.webkit.org/show_bug.cgi?id=180835
+        https://trac.webkit.org/changeset/225931
+
 2017-12-14  Devin Rousso  <[email protected]>
 
         Web Inspector: replace HTMLCanvasElement with CanvasRenderingContext for instrumentation logic

Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -78,6 +78,7 @@
 #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>
@@ -86,7 +87,6 @@
 #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>

Tools/MiniBrowser/mac/WK1BrowserWindowController.m

@@ -27,13 +27,13 @@
 
 #import "AppDelegate.h"
 #import "SettingsController.h"
+#import <WebKit/WebInspector.h>
 #import <WebKit/WebKit.h>
 #import <WebKit/WebNSURLExtras.h>
 #import <WebKit/WebPreferences.h>
 #import <WebKit/WebPreferencesPrivate.h>
 #import <WebKit/WebPreferenceKeysPrivate.h>
 #import <WebKit/WebViewPrivate.h>
-#import <WebKitLegacy/WebInspector.h>
 
 @interface WK1BrowserWindowController () <WebFrameLoadDelegate, WebPolicyDelegate, WebResourceLoadDelegate, WebUIDelegate>
 @end