Diff
Modified: trunk/Source/WebCore/ChangeLog (225948 => 225949)
--- trunk/Source/WebCore/ChangeLog 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Source/WebCore/ChangeLog 2017-12-15 01:29:31 UTC (rev 225949)
@@ -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.
Modified: trunk/Source/WebCore/PlatformMac.cmake (225948 => 225949)
--- trunk/Source/WebCore/PlatformMac.cmake 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-12-15 01:29:31 UTC (rev 225949)
@@ -499,7 +499,6 @@
svg
workers
- Modules/applicationmanifest
Modules/applepay
Modules/cache
Modules/geolocation
@@ -592,7 +591,6 @@
workers/service
- workers/service/context
workers/service/server
xml
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h (225948 => 225949)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h 2017-12-15 01:29:31 UTC (rev 225949)
@@ -25,7 +25,7 @@
#pragma once
-#if HAVE(AVCONTENTKEYSESSION) && ENABLE(ENCRYPTED_MEDIA)
+#if HAVE(AVCONTENTKEYSESSION)
#include "CDMInstance.h"
#include <wtf/Function.h>
Modified: trunk/Source/WebKit/ChangeLog (225948 => 225949)
--- trunk/Source/WebKit/ChangeLog 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Source/WebKit/ChangeLog 2017-12-15 01:29:31 UTC (rev 225949)
@@ -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
Modified: trunk/Source/WebKit/PlatformMac.cmake (225948 => 225949)
--- trunk/Source/WebKit/PlatformMac.cmake 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Source/WebKit/PlatformMac.cmake 2017-12-15 01:29:31 UTC (rev 225949)
@@ -71,8 +71,6 @@
Shared/APIWebArchive.mm
Shared/APIWebArchiveResource.mm
- Shared/TouchBarMenuData.cpp
- Shared/TouchBarMenuItemData.cpp
Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm
@@ -227,7 +225,6 @@
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 @@
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 @@
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 @@
Shared/API/c/cf
Shared/API/c/mac
+ UIProcess
UIProcess/Cocoa
UIProcess/API/C
@@ -531,6 +526,8 @@
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 (225948 => 225949)
--- trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.cpp 2017-12-15 01:29:31 UTC (rev 225949)
@@ -91,10 +91,4 @@
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 (225948 => 225949)
--- trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.h 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Source/WebKit/Shared/WebsiteDataStoreParameters.h 2017-12-15 01:29:31 UTC (rev 225949)
@@ -44,9 +44,7 @@
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 (225948 => 225949)
--- trunk/Source/WebKit/UIProcess/API/APIAttachment.h 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Source/WebKit/UIProcess/API/APIAttachment.h 2017-12-15 01:29:31 UTC (rev 225949)
@@ -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 (225948 => 225949)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp 2017-12-15 01:29:31 UTC (rev 225949)
@@ -321,7 +321,7 @@
{
if (enabled) {
WebProcess::singleton().ensureLegacyPrivateBrowsingSessionInNetworkProcess();
- WebFrameNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters::legacyPrivateSessionParameters());
+ WebFrameNetworkingContext::ensureWebsiteDataStoreSession({ { }, { }, { }, { }, { }, { }, { PAL::SessionID::legacyPrivateSessionID(), { }, { }, AllowsCellularAccess::Yes }});
} else
SessionTracker::destroySession(PAL::SessionID::legacyPrivateSessionID());
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (225948 => 225949)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2017-12-15 01:29:31 UTC (rev 225949)
@@ -2742,7 +2742,7 @@
void WebPage::setSessionID(PAL::SessionID sessionID)
{
if (sessionID.isEphemeral())
- WebProcess::singleton().addWebsiteDataStore(WebsiteDataStoreParameters::ephemeralParametersWithSessionID(sessionID));
+ WebProcess::singleton().addWebsiteDataStore({{ }, { }, { }, { }, { }, { }, { sessionID, { }, { }, { }}});
m_page->setSessionID(sessionID);
}
Modified: trunk/Tools/ChangeLog (225948 => 225949)
--- trunk/Tools/ChangeLog 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Tools/ChangeLog 2017-12-15 01:29:31 UTC (rev 225949)
@@ -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
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (225948 => 225949)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-12-15 01:29:31 UTC (rev 225949)
@@ -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>
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (225948 => 225949)
--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-12-15 01:28:19 UTC (rev 225948)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-12-15 01:29:31 UTC (rev 225949)
@@ -27,6 +27,7 @@
#import "AppDelegate.h"
#import "SettingsController.h"
+#import <WebKit/WebInspector.h>
#import <WebKit/WebKit.h>
#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebPreferences.h>
@@ -33,7 +34,6 @@
#import <WebKit/WebPreferencesPrivate.h>
#import <WebKit/WebPreferenceKeysPrivate.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebKitLegacy/WebInspector.h>
@interface WK1BrowserWindowController () <WebFrameLoadDelegate, WebPolicyDelegate, WebResourceLoadDelegate, WebUIDelegate>
@end
