Attachment 358379 Details for Bug 193161 – Patch

[patch] Patch

bug-193161-20190104150348.patch (text/plain), 53.91 KB, created by Alex Christensen on 2019-01-04 15:03:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-01-04 15:03:49 PST

Size: 53.91 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 239641)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,41 @@
>+2019-01-04  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove or deprecate unused C SPI
>+        https://bugs.webkit.org/show_bug.cgi?id=193161
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Keep stubs marked as deprecated if shipping Safari links with them to keep open source WebKit builds usable.
>+        Media session code will need to be redone in ObjC before we use it anyways.
>+        ApplicationCacheManager and KeyValueStoreManager were just unused wrappers around WebsiteDataStore.
>+
>+        * Shared/API/APIObject.h:
>+        * Shared/API/c/WKBase.h:
>+        * Shared/API/c/WKDeprecatedFunctions.cpp:
>+        (WKContextSetProcessModel): Deleted.
>+        * Sources.txt:
>+        * SourcesCocoa.txt:
>+        * UIProcess/API/C/WKAPICast.h:
>+        * UIProcess/API/C/WKApplicationCacheManager.cpp: Removed.
>+        * UIProcess/API/C/WKApplicationCacheManager.h: Removed.
>+        * UIProcess/API/C/WKContext.cpp:
>+        (WKContextGetApplicationCacheManager): Deleted.
>+        (WKContextGetKeyValueStorageManager): Deleted.
>+        (WKContextGetMediaSessionFocusManager): Deleted.
>+        * UIProcess/API/C/WKContext.h:
>+        * UIProcess/API/C/WKIconDatabase.cpp:
>+        (WKIconDatabaseGetTypeID):
>+        * UIProcess/API/C/WKIconDatabase.h:
>+        * UIProcess/API/C/WKKeyValueStorageManager.cpp: Removed.
>+        * UIProcess/API/C/WKKeyValueStorageManager.h: Removed.
>+        * UIProcess/API/C/WKMediaSessionFocusManager.cpp: Removed.
>+        * UIProcess/API/C/WKMediaSessionFocusManager.h: Removed.
>+        * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
>+        (WKWebsiteDataStoreSetWebAuthenticationMockConfiguration):
>+        * UIProcess/RemoteLayerTree/RemoteLayerTreeNode.h:
>+        * UIProcess/mac/DisplayLink.cpp:
>+        * WebKit.xcodeproj/project.pbxproj:
>+
> 2019-01-04  Jer Noble  <jer.noble@apple.com>
> 
>         [WebKitLegacy] Media playback pauses on scroll
>Index: Source/WebKit/Sources.txt
>===================================================================
>--- Source/WebKit/Sources.txt	(revision 239630)
>+++ Source/WebKit/Sources.txt	(working copy)
>@@ -303,7 +303,6 @@ UIProcess/API/APIWebsiteDataStore.cpp
> UIProcess/API/APIWebsitePolicies.cpp
> UIProcess/API/APIWindowFeatures.cpp
> 
>-UIProcess/API/C/WKApplicationCacheManager.cpp
> UIProcess/API/C/WKAuthenticationChallenge.cpp
> UIProcess/API/C/WKAuthenticationDecisionListener.cpp
> UIProcess/API/C/WKBackForwardListItemRef.cpp
>@@ -324,7 +323,6 @@ UIProcess/API/C/WKGeolocationPosition.cp
> UIProcess/API/C/WKHitTestResult.cpp
> UIProcess/API/C/WKIconDatabase.cpp
> UIProcess/API/C/WKInspector.cpp
>-UIProcess/API/C/WKKeyValueStorageManager.cpp
> UIProcess/API/C/WKMediaSessionMetadata.cpp
> UIProcess/API/C/WKMockDisplay.cpp
> UIProcess/API/C/WKMockMediaDevice.cpp
>Index: Source/WebKit/SourcesCocoa.txt
>===================================================================
>--- Source/WebKit/SourcesCocoa.txt	(revision 239630)
>+++ Source/WebKit/SourcesCocoa.txt	(working copy)
>@@ -212,7 +212,6 @@ UIProcess/ApplePay/WebPaymentCoordinator
> UIProcess/API/APIWebsiteDataRecord.cpp
> 
> UIProcess/API/C/WKContextMenuListener.cpp
>-UIProcess/API/C/WKMediaSessionFocusManager.cpp
> UIProcess/API/C/WKTestingSupport.cpp
> UIProcess/API/C/WKUserContentExtensionStoreRef.cpp
> UIProcess/API/C/WKUserScriptRef.cpp
>Index: Source/WebKit/Shared/API/APIObject.h
>===================================================================
>--- Source/WebKit/Shared/API/APIObject.h	(revision 239630)
>+++ Source/WebKit/Shared/API/APIObject.h	(working copy)
>@@ -96,7 +96,6 @@ public:
>         Rect,
>         
>         // UIProcess types
>-        ApplicationCacheManager,
> #if ENABLE(APPLICATION_MANIFEST)
>         ApplicationManifest,
> #endif
>@@ -126,7 +125,6 @@ public:
>         GrammarDetail,
>         IconDatabase,
>         Inspector,
>-        KeyValueStorageManager,
>         MediaCacheManager,
>         Navigation,
>         NavigationAction,
>@@ -167,11 +165,6 @@ public:
>         WebsitePolicies,
>         WindowFeatures,
> 
>-#if ENABLE(MEDIA_SESSION)
>-        MediaSessionFocusManager,
>-        MediaSessionMetadata,
>-#endif
>-
>         // Bundle types
>         Bundle,
>         BundleBackForwardList,
>Index: Source/WebKit/Shared/API/c/WKBase.h
>===================================================================
>--- Source/WebKit/Shared/API/c/WKBase.h	(revision 239630)
>+++ Source/WebKit/Shared/API/c/WKBase.h	(working copy)
>@@ -78,7 +78,6 @@ typedef const struct OpaqueWKWebArchiveR
> 
> /* WebKit2 main API types */
> 
>-typedef const struct OpaqueWKApplicationCacheManager* WKApplicationCacheManagerRef;
> typedef const struct OpaqueWKAuthenticationChallenge* WKAuthenticationChallengeRef;
> typedef const struct OpaqueWKAuthenticationDecisionListener* WKAuthenticationDecisionListenerRef;
> typedef const struct OpaqueWKBackForwardList* WKBackForwardListRef;
>@@ -103,8 +102,6 @@ typedef const struct OpaqueWKGrammarDeta
> typedef const struct OpaqueWKHitTestResult* WKHitTestResultRef;
> typedef const struct OpaqueWKIconDatabase* WKIconDatabaseRef;
> typedef const struct OpaqueWKInspector* WKInspectorRef;
>-typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef;
>-typedef const struct OpaqueWKMediaSessionFocusManager* WKMediaSessionFocusManagerRef;
> typedef const struct OpaqueWKMediaSessionMetadata* WKMediaSessionMetadataRef;
> typedef const struct OpaqueWKNavigationAction* WKNavigationActionRef;
> typedef const struct OpaqueWKNavigationData* WKNavigationDataRef;
>Index: Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp
>===================================================================
>--- Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp	(revision 239630)
>+++ Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp	(working copy)
>@@ -44,10 +44,6 @@ void WKContextSetUsesNetworkProcess(WKCo
> {
> }
> 
>-void WKContextSetProcessModel(WKContextRef, WKProcessModel)
>-{
>-}
>-
> void WKPreferencesSetQTKitEnabled(WKPreferencesRef, bool)
> {
> }
>Index: Source/WebKit/UIProcess/API/C/WKAPICast.h
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKAPICast.h	(revision 239630)
>+++ Source/WebKit/UIProcess/API/C/WKAPICast.h	(working copy)
>@@ -94,8 +94,6 @@ class WebGeolocationManagerProxy;
> class WebGeolocationPosition;
> class WebIconDatabase;
> class WebInspectorProxy;
>-class WebMediaSessionFocusManager;
>-class WebMediaSessionMetadata;
> class WebNotification;
> class WebNotificationManagerProxy;
> class WebNotificationProvider;
>@@ -135,8 +133,6 @@ WK_ADD_API_MAPPING(WKGeolocationPosition
> WK_ADD_API_MAPPING(WKHitTestResultRef, API::HitTestResult)
> WK_ADD_API_MAPPING(WKIconDatabaseRef, WebIconDatabase)
> WK_ADD_API_MAPPING(WKInspectorRef, WebInspectorProxy)
>-WK_ADD_API_MAPPING(WKMediaSessionFocusManagerRef, WebMediaSessionFocusManager)
>-WK_ADD_API_MAPPING(WKMediaSessionMetadataRef, WebMediaSessionMetadata)
> WK_ADD_API_MAPPING(WKNavigationActionRef, API::NavigationAction)
> WK_ADD_API_MAPPING(WKNavigationDataRef, API::NavigationData)
> WK_ADD_API_MAPPING(WKNavigationRef, API::Navigation)
>Index: Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.cpp	(revision 239630)
>+++ Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.cpp	(nonexistent)
>@@ -1,67 +0,0 @@
>-/*
>- * Copyright (C) 2011 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#include "config.h"
>-#include "WKApplicationCacheManager.h"
>-
>-#include "APIArray.h"
>-#include "APIWebsiteDataStore.h"
>-#include "WKAPICast.h"
>-#include "WebsiteDataRecord.h"
>-
>-WKTypeID WKApplicationCacheManagerGetTypeID()
>-{
>-    return WebKit::toAPI(API::WebsiteDataStore::APIType);
>-}
>-
>-void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef applicationCacheManager, void* context, WKApplicationCacheManagerGetApplicationCacheOriginsFunction callback)
>-{
>-    auto& websiteDataStore = WebKit::toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();
>-    websiteDataStore.fetchData(WebKit::WebsiteDataType::OfflineWebApplicationCache, { }, [context, callback](auto dataRecords) {
>-        Vector<RefPtr<API::Object>> securityOrigins;
>-        for (const auto& dataRecord : dataRecords) {
>-            for (const auto& origin : dataRecord.origins)
>-                securityOrigins.append(API::SecurityOrigin::create(origin.securityOrigin()));
>-        }
>-
>-        callback(WebKit::toAPI(API::Array::create(WTFMove(securityOrigins)).ptr()), nullptr, context);
>-    });
>-}
>-
>-void WKApplicationCacheManagerDeleteEntriesForOrigin(WKApplicationCacheManagerRef applicationCacheManager, WKSecurityOriginRef origin)
>-{
>-    auto& websiteDataStore = WebKit::toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();
>-
>-    WebKit::WebsiteDataRecord dataRecord;
>-    dataRecord.add(WebKit::WebsiteDataType::OfflineWebApplicationCache, WebKit::toImpl(origin)->securityOrigin().data());
>-
>-    websiteDataStore.removeData(WebKit::WebsiteDataType::OfflineWebApplicationCache, { dataRecord }, [] { });
>-}
>-
>-void WKApplicationCacheManagerDeleteAllEntries(WKApplicationCacheManagerRef applicationCacheManager)
>-{
>-    auto& websiteDataStore = WebKit::toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();
>-    websiteDataStore.removeData(WebKit::WebsiteDataType::OfflineWebApplicationCache, -WallTime::infinity(), [] { });
>-}
>
>Property changes on: Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.cpp
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Index: Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.h
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.h	(revision 239630)
>+++ Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.h	(nonexistent)
>@@ -1,47 +0,0 @@
>-/*
>- * Copyright (C) 2011 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#ifndef WKApplicationCacheManager_h
>-#define WKApplicationCacheManager_h
>-
>-#include <WebKit/WKBase.h>
>-
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>-
>-WK_EXPORT WKTypeID WKApplicationCacheManagerGetTypeID();
>-
>-typedef void (*WKApplicationCacheManagerGetApplicationCacheOriginsFunction)(WKArrayRef, WKErrorRef, void*);
>-WK_EXPORT void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef applicationCacheManager, void* context, WKApplicationCacheManagerGetApplicationCacheOriginsFunction function);
>-
>-WK_EXPORT void WKApplicationCacheManagerDeleteEntriesForOrigin(WKApplicationCacheManagerRef applicationCacheManager, WKSecurityOriginRef origin);
>-WK_EXPORT void WKApplicationCacheManagerDeleteAllEntries(WKApplicationCacheManagerRef applicationCacheManager);
>-
>-#ifdef __cplusplus
>-}
>-#endif
>-
>-#endif // WKApplicationCacheManager_h
>
>Property changes on: Source/WebKit/UIProcess/API/C/WKApplicationCacheManager.h
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Index: Source/WebKit/UIProcess/API/C/WKContext.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKContext.cpp	(revision 239631)
>+++ Source/WebKit/UIProcess/API/C/WKContext.cpp	(working copy)
>@@ -437,11 +437,6 @@ WKWebsiteDataStoreRef WKContextGetWebsit
>     return WebKit::toAPI(dataStore);
> }
> 
>-WKApplicationCacheManagerRef WKContextGetApplicationCacheManager(WKContextRef context)
>-{
>-    return reinterpret_cast<WKApplicationCacheManagerRef>(WKContextGetWebsiteDataStore(context));
>-}
>-
> WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef contextRef)
> {
>     return WebKit::toAPI(WebKit::toImpl(contextRef)->supplement<WebKit::WebGeolocationManagerProxy>());
>@@ -452,21 +447,6 @@ WKIconDatabaseRef WKContextGetIconDataba
>     return nullptr;
> }
> 
>-WKKeyValueStorageManagerRef WKContextGetKeyValueStorageManager(WKContextRef context)
>-{
>-    return reinterpret_cast<WKKeyValueStorageManagerRef>(WKContextGetWebsiteDataStore(context));
>-}
>-
>-WKMediaSessionFocusManagerRef WKContextGetMediaSessionFocusManager(WKContextRef context)
>-{
>-#if ENABLE(MEDIA_SESSION)
>-    return WebKit::toAPI(WebKit::toImpl(context)->supplement<WebKit::WebMediaSessionFocusManager>());
>-#else
>-    UNUSED_PARAM(context);
>-    return nullptr;
>-#endif
>-}
>-
> WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef contextRef)
> {
>     return WebKit::toAPI(WebKit::toImpl(contextRef)->supplement<WebKit::WebNotificationManagerProxy>());
>Index: Source/WebKit/UIProcess/API/C/WKContext.h
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKContext.h	(revision 239631)
>+++ Source/WebKit/UIProcess/API/C/WKContext.h	(working copy)
>@@ -128,9 +128,6 @@ WK_EXPORT void WKContextClearVisitedLink
> WK_EXPORT void WKContextSetCacheModel(WKContextRef context, WKCacheModel cacheModel);
> WK_EXPORT WKCacheModel WKContextGetCacheModel(WKContextRef context);
> 
>-// FIXME: Move these to WKDeprecatedFunctions.cpp once support for Mavericks has been dropped.
>-WK_EXPORT void WKContextSetProcessModel(WKContextRef, WKProcessModel);
>-
> WK_EXPORT void WKContextSetMaximumNumberOfProcesses(WKContextRef context, unsigned numberOfProcesses);
> WK_EXPORT unsigned WKContextGetMaximumNumberOfProcesses(WKContextRef context);
> 
>@@ -139,12 +136,9 @@ WK_EXPORT void WKContextStopMemorySample
> 
> WK_EXPORT WKWebsiteDataStoreRef WKContextGetWebsiteDataStore(WKContextRef context);
> 
>-WK_EXPORT WKApplicationCacheManagerRef WKContextGetApplicationCacheManager(WKContextRef context);
> WK_EXPORT WKCookieManagerRef WKContextGetCookieManager(WKContextRef context);
> WK_EXPORT WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef context);
>-WK_EXPORT WKIconDatabaseRef WKContextGetIconDatabase(WKContextRef context);
>-WK_EXPORT WKKeyValueStorageManagerRef WKContextGetKeyValueStorageManager(WKContextRef context);
>-WK_EXPORT WKMediaSessionFocusManagerRef WKContextGetMediaSessionFocusManager(WKContextRef context);
>+WK_EXPORT WKIconDatabaseRef WKContextGetIconDatabase(WKContextRef context) WK_C_API_DEPRECATED;
> WK_EXPORT WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef context);
> WK_EXPORT WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef context);
> 
>Index: Source/WebKit/UIProcess/API/C/WKIconDatabase.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKIconDatabase.cpp	(revision 239630)
>+++ Source/WebKit/UIProcess/API/C/WKIconDatabase.cpp	(working copy)
>@@ -34,7 +34,7 @@ using namespace WebKit;
> 
> WKTypeID WKIconDatabaseGetTypeID()
> {
>-    return toAPI(WebIconDatabase::APIType);
>+    return 0;
> }
> 
> void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef, const WKIconDatabaseClientBase*)
>Index: Source/WebKit/UIProcess/API/C/WKIconDatabase.h
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKIconDatabase.h	(revision 239630)
>+++ Source/WebKit/UIProcess/API/C/WKIconDatabase.h	(working copy)
>@@ -27,6 +27,7 @@
> #define WKIconDatabase_h
> 
> #include <WebKit/WKBase.h>
>+#include <WebKit/WKDeprecated.h>
> 
> #ifdef __cplusplus
> extern "C" {
>@@ -61,23 +62,23 @@ typedef struct WKIconDatabaseClientV1 {
>     WKIconDatabaseIconDataReadyForPageURLCallback                       iconDataReadyForPageURL;
> } WKIconDatabaseClientV1;
> 
>-WK_EXPORT WKTypeID WKIconDatabaseGetTypeID();
>+WK_EXPORT WKTypeID WKIconDatabaseGetTypeID() WK_C_API_DEPRECATED;
> 
>-WK_EXPORT void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabase, const WKIconDatabaseClientBase* client);
>+WK_EXPORT void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabase, const WKIconDatabaseClientBase* client) WK_C_API_DEPRECATED;
> 
>-WK_EXPORT void WKIconDatabaseRetainIconForURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL);
>-WK_EXPORT void WKIconDatabaseReleaseIconForURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL);
>-WK_EXPORT void WKIconDatabaseSetIconDataForIconURL(WKIconDatabaseRef iconDatabase, WKDataRef iconData, WKURLRef iconURL);
>-WK_EXPORT void WKIconDatabaseSetIconURLForPageURL(WKIconDatabaseRef iconDatabase, WKURLRef iconURL, WKURLRef pageURL);
>-WK_EXPORT WKURLRef WKIconDatabaseCopyIconURLForPageURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL);
>-WK_EXPORT WKDataRef WKIconDatabaseCopyIconDataForPageURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL);
>+WK_EXPORT void WKIconDatabaseRetainIconForURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL) WK_C_API_DEPRECATED;
>+WK_EXPORT void WKIconDatabaseReleaseIconForURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL) WK_C_API_DEPRECATED;
>+WK_EXPORT void WKIconDatabaseSetIconDataForIconURL(WKIconDatabaseRef iconDatabase, WKDataRef iconData, WKURLRef iconURL) WK_C_API_DEPRECATED;
>+WK_EXPORT void WKIconDatabaseSetIconURLForPageURL(WKIconDatabaseRef iconDatabase, WKURLRef iconURL, WKURLRef pageURL) WK_C_API_DEPRECATED;
>+WK_EXPORT WKURLRef WKIconDatabaseCopyIconURLForPageURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL) WK_C_API_DEPRECATED;
>+WK_EXPORT WKDataRef WKIconDatabaseCopyIconDataForPageURL(WKIconDatabaseRef iconDatabase, WKURLRef pageURL) WK_C_API_DEPRECATED;
> 
>-WK_EXPORT void WKIconDatabaseEnableDatabaseCleanup(WKIconDatabaseRef iconDatabase);
>+WK_EXPORT void WKIconDatabaseEnableDatabaseCleanup(WKIconDatabaseRef iconDatabase) WK_C_API_DEPRECATED;
> 
>-WK_EXPORT void WKIconDatabaseRemoveAllIcons(WKIconDatabaseRef iconDatabase);
>-WK_EXPORT void WKIconDatabaseCheckIntegrityBeforeOpening(WKIconDatabaseRef iconDatabase);
>+WK_EXPORT void WKIconDatabaseRemoveAllIcons(WKIconDatabaseRef iconDatabase) WK_C_API_DEPRECATED;
>+WK_EXPORT void WKIconDatabaseCheckIntegrityBeforeOpening(WKIconDatabaseRef iconDatabase) WK_C_API_DEPRECATED;
> 
>-WK_EXPORT void WKIconDatabaseClose(WKIconDatabaseRef iconDatabase);
>+WK_EXPORT void WKIconDatabaseClose(WKIconDatabaseRef iconDatabase) WK_C_API_DEPRECATED;
> 
> #ifdef __cplusplus
> }
>Index: Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.cpp	(revision 239630)
>+++ Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.cpp	(nonexistent)
>@@ -1,132 +0,0 @@
>-/*
>- * Copyright (C) 2011 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#include "config.h"
>-#include "WKKeyValueStorageManager.h"
>-
>-#include "APIArray.h"
>-#include "APIDictionary.h"
>-#include "APIWebsiteDataStore.h"
>-#include "StorageManager.h"
>-#include "WKAPICast.h"
>-#include "WebsiteDataStore.h"
>-#include <wtf/RunLoop.h>
>-
>-using namespace WebKit;
>-
>-WKTypeID WKKeyValueStorageManagerGetTypeID()
>-{
>-    return toAPI(API::WebsiteDataStore::APIType);
>-}
>-
>-WKStringRef WKKeyValueStorageManagerGetOriginKey()
>-{
>-    static API::String& key = API::String::create("WebKeyValueStorageManagerStorageDetailsOriginKey").leakRef();
>-    return toAPI(&key);
>-}
>-
>-WKStringRef WKKeyValueStorageManagerGetCreationTimeKey()
>-{
>-    static API::String& key = API::String::create("WebKeyValueStorageManagerStorageDetailsCreationTimeKey").leakRef();
>-    return toAPI(&key);
>-}
>-
>-WKStringRef WKKeyValueStorageManagerGetModificationTimeKey()
>-{
>-    static API::String& key = API::String::create("WebKeyValueStorageManagerStorageDetailsModificationTimeKey").leakRef();
>-    return toAPI(&key);
>-}
>-
>-void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback)
>-
>-{
>-    StorageManager* storageManager = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore().storageManager();
>-    if (!storageManager) {
>-        RunLoop::main().dispatch([context, callback] {
>-            callback(toAPI(API::Array::create().ptr()), nullptr, context);
>-        });
>-        return;
>-    }
>-
>-    storageManager->getLocalStorageOrigins([context, callback](auto&& securityOrigins) {
>-        Vector<RefPtr<API::Object>> webSecurityOrigins;
>-        webSecurityOrigins.reserveInitialCapacity(securityOrigins.size());
>-        for (auto& origin : securityOrigins)
>-            webSecurityOrigins.uncheckedAppend(API::SecurityOrigin::create(origin.securityOrigin()));
>-
>-        callback(toAPI(API::Array::create(WTFMove(webSecurityOrigins)).ptr()), nullptr, context);
>-    });
>-}
>-
>-void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction callback)
>-{
>-    StorageManager* storageManager = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore().storageManager();
>-    if (!storageManager) {
>-        RunLoop::main().dispatch([context, callback] {
>-            callback(toAPI(API::Array::create().ptr()), nullptr, context);
>-        });
>-        return;
>-    }
>-
>-    storageManager->getLocalStorageOriginDetails([context, callback](auto storageDetails) {
>-        HashMap<String, RefPtr<API::Object>> detailsMap;
>-        Vector<RefPtr<API::Object>> result;
>-        result.reserveInitialCapacity(storageDetails.size());
>-
>-        for (const auto& originDetails : storageDetails) {
>-            HashMap<String, RefPtr<API::Object>> detailsMap;
>-
>-            RefPtr<API::Object> origin = API::SecurityOrigin::create(WebCore::SecurityOriginData::fromDatabaseIdentifier(originDetails.originIdentifier)->securityOrigin());
>-
>-            detailsMap.set(toImpl(WKKeyValueStorageManagerGetOriginKey())->string(), origin);
>-            if (originDetails.creationTime)
>-                detailsMap.set(toImpl(WKKeyValueStorageManagerGetCreationTimeKey())->string(), API::Double::create(originDetails.creationTime->secondsSinceEpoch().value()));
>-            if (originDetails.modificationTime)
>-                detailsMap.set(toImpl(WKKeyValueStorageManagerGetModificationTimeKey())->string(), API::Double::create(originDetails.modificationTime->secondsSinceEpoch().value()));
>-
>-            result.uncheckedAppend(API::Dictionary::create(WTFMove(detailsMap)));
>-        }
>-
>-        callback(toAPI(API::Array::create(WTFMove(result)).ptr()), nullptr, context);
>-    });
>-}
>-
>-void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, WKSecurityOriginRef origin)
>-{
>-    StorageManager* storageManager = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore().storageManager();
>-    if (!storageManager)
>-        return;
>-
>-    storageManager->deleteLocalStorageEntriesForOrigin(toImpl(origin)->securityOrigin().data());
>-}
>-
>-void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef keyValueStorageManager)
>-{
>-    StorageManager* storageManager = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(keyValueStorageManager))->websiteDataStore().storageManager();
>-    if (!storageManager)
>-        return;
>-
>-    storageManager->deleteLocalStorageOriginsModifiedSince(-WallTime::infinity(), [] { });
>-}
>
>Property changes on: Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.cpp
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Index: Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.h
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.h	(revision 239630)
>+++ Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.h	(nonexistent)
>@@ -1,59 +0,0 @@
>-/*
>- * Copyright (C) 2011 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#ifndef WKKeyValueStorageManager_h
>-#define WKKeyValueStorageManager_h
>-
>-#include <WebKit/WKBase.h>
>-
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>-
>-WK_EXPORT WKTypeID WKKeyValueStorageManagerGetTypeID();
>-
>-/* Value type: WKSecurityOriginRef */
>-WK_EXPORT WKStringRef WKKeyValueStorageManagerGetOriginKey();
>-
>-/* Value type: WKDoubleRef, seconds since January 1st, 1970 UTC */
>-WK_EXPORT WKStringRef WKKeyValueStorageManagerGetCreationTimeKey();
>-
>-/* Value type: WKDoubleRef, seconds since January 1st, 1970 UTC */
>-WK_EXPORT WKStringRef WKKeyValueStorageManagerGetModificationTimeKey();
>-
>-typedef void (*WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction)(WKArrayRef, WKErrorRef, void*);
>-WK_EXPORT void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction function);
>-
>-typedef void (*WKKeyValueStorageManagerGetStorageDetailsByOriginFunction)(WKArrayRef, WKErrorRef, void*);
>-WK_EXPORT void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction function);
>-
>-WK_EXPORT void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManager, WKSecurityOriginRef origin);
>-WK_EXPORT void WKKeyValueStorageManagerDeleteAllEntries(WKKeyValueStorageManagerRef keyValueStorageManager);
>-
>-#ifdef __cplusplus
>-}
>-#endif
>-
>-#endif // WKKeyValueStorageManager_h
>
>Property changes on: Source/WebKit/UIProcess/API/C/WKKeyValueStorageManager.h
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Index: Source/WebKit/UIProcess/API/C/WKMediaSessionFocusManager.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKMediaSessionFocusManager.cpp	(revision 239630)
>+++ Source/WebKit/UIProcess/API/C/WKMediaSessionFocusManager.cpp	(nonexistent)
>@@ -1,72 +0,0 @@
>-/*
>- * Copyright (C) 2015 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#include "config.h"
>-#include "WKMediaSessionFocusManager.h"
>-
>-#include "WKAPICast.h"
>-#include "WebMediaSessionFocusManager.h"
>-
>-using namespace WebKit;
>-
>-WKTypeID WKMediaSessionFocusManagerGetTypeID()
>-{
>-#if ENABLE(MEDIA_SESSION)
>-    return toAPI(WebMediaSessionFocusManager::APIType);
>-#else
>-    return toAPI(API::Object::Type::Null);
>-#endif
>-}
>-
>-void WKMediaSessionFocusManagerSetClient(WKMediaSessionFocusManagerRef manager, const WKMediaSessionFocusManagerClientBase* client)
>-{
>-#if ENABLE(MEDIA_SESSION)
>-    toImpl(manager)->initializeClient(client);
>-#else
>-    UNUSED_PARAM(manager);
>-    UNUSED_PARAM(client);
>-#endif
>-}
>-
>-bool WKMediaSessionFocusManagerValueForPlaybackAttribute(WKMediaSessionFocusManagerRef manager, WKMediaSessionFocusManagerPlaybackAttribute attribute)
>-{
>-#if ENABLE(MEDIA_SESSION)
>-    return toImpl(manager)->valueForPlaybackAttribute(attribute);
>-#else
>-    UNUSED_PARAM(manager);
>-    UNUSED_PARAM(attribute);
>-    return false;
>-#endif
>-}
>-
>-void WKMediaSessionFocusManagerSetVolumeOfFocusedMediaElement(WKMediaSessionFocusManagerRef manager, double volume)
>-{
>-#if ENABLE(MEDIA_SESSION)
>-    toImpl(manager)->setVolumeOfFocusedMediaElement(volume);
>-#else
>-    UNUSED_PARAM(manager);
>-    UNUSED_PARAM(volume);
>-#endif
>-}
>Index: Source/WebKit/UIProcess/API/C/WKMediaSessionFocusManager.h
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKMediaSessionFocusManager.h	(revision 239630)
>+++ Source/WebKit/UIProcess/API/C/WKMediaSessionFocusManager.h	(nonexistent)
>@@ -1,72 +0,0 @@
>-/*
>- * Copyright (C) 2015 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#ifndef WKMediaSessionFocusManager_h
>-#define WKMediaSessionFocusManager_h
>-
>-#include <WebKit/WKBase.h>
>-
>-#ifndef __cplusplus
>-#include <stdbool.h>
>-#endif
>-
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>-
>-enum WKMediaSessionFocusManagerPlaybackAttribute {
>-    IsPlaying                     = 1 << 0,
>-    IsPreviousTrackControlEnabled = 1 << 1,
>-    IsNextTrackControlEnabled     = 1 << 2,
>-};
>-typedef uint32_t WKMediaSessionFocusManagerPlaybackAttributes;
>-
>-// Media Session Focus Manager Client
>-typedef void (*WKMediaSessionFocusManagerDidChangePlaybackAttribute)(WKMediaSessionFocusManagerRef manager, WKMediaSessionFocusManagerPlaybackAttribute playbackAttribute, bool value, const void *clientInfo);
>-
>-typedef struct WKMediaSessionFocusManagerClientBase {
>-    int                                                  version;
>-    const void *                                         clientInfo;
>-} WKMediaSessionFocusManagerClientBase;
>-
>-typedef struct WKMediaSessionFocusManagerClientV0 {
>-    WKMediaSessionFocusManagerClientBase                 base;
>-
>-    // Version 0.
>-    WKMediaSessionFocusManagerDidChangePlaybackAttribute didChangePlaybackAttribute;
>-} WKMediaSessionFocusManagerClientV0;
>-
>-WK_EXPORT WKTypeID WKMediaSessionFocusManagerGetTypeID();
>-
>-WK_EXPORT void WKMediaSessionFocusManagerSetClient(WKMediaSessionFocusManagerRef manager, const WKMediaSessionFocusManagerClientBase* client);
>-
>-WK_EXPORT bool WKMediaSessionFocusManagerValueForPlaybackAttribute(WKMediaSessionFocusManagerRef, WKMediaSessionFocusManagerPlaybackAttribute);
>-WK_EXPORT void WKMediaSessionFocusManagerSetVolumeOfFocusedMediaElement(WKMediaSessionFocusManagerRef, double);
>-
>-#ifdef __cplusplus
>-}
>-#endif
>-
>-#endif /* WKMediaSessionFocusManager_h */
>Index: Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp	(revision 239630)
>+++ Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp	(working copy)
>@@ -579,13 +579,13 @@ void WKWebsiteDataStoreSetCacheStoragePe
> void WKWebsiteDataStoreSetWebAuthenticationMockConfiguration(WKWebsiteDataStoreRef dataStoreRef, WKDictionaryRef configurationRef)
> {
> #if ENABLE(WEB_AUTHN)
>-    MockWebAuthenticationConfiguration configuration;
>+    WebKit::MockWebAuthenticationConfiguration configuration;
> 
>     if (auto silentFailureRef = static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(configurationRef, adoptWK(WKStringCreateWithUTF8CString("SilentFailure")).get())))
>         configuration.silentFailure = WKBooleanGetValue(silentFailureRef);
> 
>     if (auto localRef = static_cast<WKDictionaryRef>(WKDictionaryGetItemForKey(configurationRef, adoptWK(WKStringCreateWithUTF8CString("Local")).get()))) {
>-        MockWebAuthenticationConfiguration::Local local;
>+        WebKit::MockWebAuthenticationConfiguration::Local local;
>         local.acceptAuthentication = WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(localRef, adoptWK(WKStringCreateWithUTF8CString("AcceptAuthentication")).get())));
>         local.acceptAttestation = WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(localRef, adoptWK(WKStringCreateWithUTF8CString("AcceptAttestation")).get())));
>         if (local.acceptAttestation) {
>@@ -597,35 +597,35 @@ void WKWebsiteDataStoreSetWebAuthenticat
>     }
> 
>     if (auto hidRef = static_cast<WKDictionaryRef>(WKDictionaryGetItemForKey(configurationRef, adoptWK(WKStringCreateWithUTF8CString("Hid")).get()))) {
>-        MockWebAuthenticationConfiguration::Hid hid;
>+        WebKit::MockWebAuthenticationConfiguration::Hid hid;
> 
>         auto stage = WebKit::toImpl(static_cast<WKStringRef>(WKDictionaryGetItemForKey(hidRef, adoptWK(WKStringCreateWithUTF8CString("Stage")).get())))->string();
>         if (stage == "info")
>-            hid.stage = MockWebAuthenticationConfiguration::Hid::Stage::Info;
>+            hid.stage = WebKit::MockWebAuthenticationConfiguration::Hid::Stage::Info;
>         if (stage == "request")
>-            hid.stage = MockWebAuthenticationConfiguration::Hid::Stage::Request;
>+            hid.stage = WebKit::MockWebAuthenticationConfiguration::Hid::Stage::Request;
> 
>         auto subStage = WebKit::toImpl(static_cast<WKStringRef>(WKDictionaryGetItemForKey(hidRef, adoptWK(WKStringCreateWithUTF8CString("SubStage")).get())))->string();
>         if (subStage == "init")
>-            hid.subStage = MockWebAuthenticationConfiguration::Hid::SubStage::Init;
>+            hid.subStage = WebKit::MockWebAuthenticationConfiguration::Hid::SubStage::Init;
>         if (subStage == "msg")
>-            hid.subStage = MockWebAuthenticationConfiguration::Hid::SubStage::Msg;
>+            hid.subStage = WebKit::MockWebAuthenticationConfiguration::Hid::SubStage::Msg;
> 
>         auto error = WebKit::toImpl(static_cast<WKStringRef>(WKDictionaryGetItemForKey(hidRef, adoptWK(WKStringCreateWithUTF8CString("Error")).get())))->string();
>         if (error == "success")
>-            hid.error = MockWebAuthenticationConfiguration::Hid::Error::Success;
>+            hid.error = WebKit::MockWebAuthenticationConfiguration::Hid::Error::Success;
>         if (error == "data-not-sent")
>-            hid.error = MockWebAuthenticationConfiguration::Hid::Error::DataNotSent;
>+            hid.error = WebKit::MockWebAuthenticationConfiguration::Hid::Error::DataNotSent;
>         if (error == "empty-report")
>-            hid.error = MockWebAuthenticationConfiguration::Hid::Error::EmptyReport;
>+            hid.error = WebKit::MockWebAuthenticationConfiguration::Hid::Error::EmptyReport;
>         if (error == "wrong-channel-id")
>-            hid.error = MockWebAuthenticationConfiguration::Hid::Error::WrongChannelId;
>+            hid.error = WebKit::MockWebAuthenticationConfiguration::Hid::Error::WrongChannelId;
>         if (error == "malicious-payload")
>-            hid.error = MockWebAuthenticationConfiguration::Hid::Error::MaliciousPayload;
>+            hid.error = WebKit::MockWebAuthenticationConfiguration::Hid::Error::MaliciousPayload;
>         if (error == "unsupported-options")
>-            hid.error = MockWebAuthenticationConfiguration::Hid::Error::UnsupportedOptions;
>+            hid.error = WebKit::MockWebAuthenticationConfiguration::Hid::Error::UnsupportedOptions;
>         if (error == "wrong-nonce")
>-            hid.error = MockWebAuthenticationConfiguration::Hid::Error::WrongNonce;
>+            hid.error = WebKit::MockWebAuthenticationConfiguration::Hid::Error::WrongNonce;
> 
>         if (auto payloadBase64 = static_cast<WKStringRef>(WKDictionaryGetItemForKey(hidRef, adoptWK(WKStringCreateWithUTF8CString("PayloadBase64")).get())))
>             hid.payloadBase64 = WebKit::toImpl(payloadBase64)->string();
>Index: Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeNode.h
>===================================================================
>--- Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeNode.h	(revision 239630)
>+++ Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeNode.h	(working copy)
>@@ -29,6 +29,7 @@
> #include <wtf/RetainPtr.h>
> 
> OBJC_CLASS CALayer;
>+OBJC_CLASS NSString;
> #if PLATFORM(IOS_FAMILY)
> OBJC_CLASS UIView;
> #endif
>Index: Source/WebKit/UIProcess/mac/DisplayLink.cpp
>===================================================================
>--- Source/WebKit/UIProcess/mac/DisplayLink.cpp	(revision 239630)
>+++ Source/WebKit/UIProcess/mac/DisplayLink.cpp	(working copy)
>@@ -29,6 +29,7 @@
> #if ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
> 
> #include "DrawingAreaMessages.h"
>+#include "WebProcessMessages.h"
> #include "WebProcessProxy.h"
> #include <wtf/ProcessPrivilege.h>
> 
>Index: Source/WebKit/WebKit.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebKit/WebKit.xcodeproj/project.pbxproj	(revision 239630)
>+++ Source/WebKit/WebKit.xcodeproj/project.pbxproj	(working copy)
>@@ -919,7 +919,6 @@
> 		5123CF1C133D260A0056F800 /* WKIconDatabaseCG.h in Headers */ = {isa = PBXBuildFile; fileRef = 5123CF1A133D260A0056F800 /* WKIconDatabaseCG.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		512935D81288D19400A4B695 /* WebContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 512935D61288D19400A4B695 /* WebContextMenuItem.h */; };
> 		512935E41288D97800A4B695 /* InjectedBundlePageContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 512935E21288D97800A4B695 /* InjectedBundlePageContextMenuClient.h */; };
>-		512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		512F589712A8838800629530 /* AuthenticationChallengeProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F588F12A8838800629530 /* AuthenticationChallengeProxy.h */; };
> 		512F589912A8838800629530 /* AuthenticationDecisionListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F589112A8838800629530 /* AuthenticationDecisionListener.h */; };
> 		512F589B12A8838800629530 /* WebCredential.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F589312A8838800629530 /* WebCredential.h */; };
>@@ -971,7 +970,6 @@
> 		51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A55600128C6D92009ABCEC /* WKContextMenuItemTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		51A728DE1B1BAD3800102EEE /* WKBundleNavigationActionPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A728DC1B1BAD2D00102EEE /* WKBundleNavigationActionPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		51A7F2F3125BF820008AEB1D /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A7F2F2125BF820008AEB1D /* Logging.h */; };
>-		51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9E1091315CD18009E7031 /* WKKeyValueStorageManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		51ACBB82127A8BAD00D203B9 /* WebContextMenuProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACBB81127A8BAD00D203B9 /* WebContextMenuProxy.h */; };
> 		51ACBBA0127A8F2C00D203B9 /* WebContextMenuProxyMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACBB9E127A8F2C00D203B9 /* WebContextMenuProxyMac.h */; };
> 		51B15A8513843A3900321AD8 /* EnvironmentUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 51B15A8313843A3900321AD8 /* EnvironmentUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -1529,7 +1527,6 @@
> 		C5E1AFEF16B21029006CC1F2 /* APIWebArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9F16ACD47800316DE2 /* APIWebArchiveResource.h */; };
> 		C5FA1ED318E1062200B3F402 /* WKAirPlayRoutePicker.h in Headers */ = {isa = PBXBuildFile; fileRef = C5FA1ED118E1062200B3F402 /* WKAirPlayRoutePicker.h */; };
> 		C98C48A61B6FD4C300145103 /* WebMediaSessionFocusManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C98C48A41B6FD4C300145103 /* WebMediaSessionFocusManager.h */; };
>-		C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C98C48A81B6FD5B500145103 /* WKMediaSessionFocusManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		C9C1833C1B74026D007036A7 /* WebMediaSessionFocusManagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = C9C183381B73FD6A007036A7 /* WebMediaSessionFocusManagerClient.h */; };
> 		C9CD43981B4B001D00239E33 /* WebMediaSessionMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = C9CD43941B4B000E00239E33 /* WebMediaSessionMetadata.h */; };
> 		C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = C9CD439A1B4B024200239E33 /* WKMediaSessionMetadata.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -3224,8 +3221,6 @@
> 		5160BFE013381DF900918999 /* LoggingFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingFoundation.mm; sourceTree = "<group>"; };
> 		5164C0941B05B757004F102A /* ChildProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChildProcess.messages.in; sourceTree = "<group>"; };
> 		516A4A5B120A2CCD00C05B7F /* APIError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIError.h; sourceTree = "<group>"; };
>-		517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKApplicationCacheManager.cpp; sourceTree = "<group>"; };
>-		517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKApplicationCacheManager.h; sourceTree = "<group>"; };
> 		517A52D61F43A9B600DCDC0A /* WebSWServerConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSWServerConnectionMessages.h; path = DerivedSources/WebKit2/WebSWServerConnectionMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
> 		517A52D71F43A9B600DCDC0A /* WebSWServerConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSWServerConnectionMessageReceiver.cpp; path = DerivedSources/WebKit2/WebSWServerConnectionMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
> 		517A53021F4793B200DCDC0A /* WebSWClientConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSWClientConnection.h; sourceTree = "<group>"; };
>@@ -3262,8 +3257,6 @@
> 		51A84CE2127F386B00CA6EA4 /* WebContextMenuProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContextMenuProxy.cpp; sourceTree = "<group>"; };
> 		51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkProcessMac.mm; sourceTree = "<group>"; };
> 		51A8A6171627F5BB000D90E9 /* NetworkProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NetworkProcess.messages.in; sourceTree = "<group>"; };
>-		51A9E1081315CD18009E7031 /* WKKeyValueStorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKKeyValueStorageManager.cpp; sourceTree = "<group>"; };
>-		51A9E1091315CD18009E7031 /* WKKeyValueStorageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKKeyValueStorageManager.h; sourceTree = "<group>"; };
> 		51ABF65616392F1500132A7A /* WebLoaderStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebLoaderStrategy.cpp; path = Network/WebLoaderStrategy.cpp; sourceTree = "<group>"; };
> 		51ABF65716392F1500132A7A /* WebLoaderStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebLoaderStrategy.h; path = Network/WebLoaderStrategy.h; sourceTree = "<group>"; };
> 		51ACBB81127A8BAD00D203B9 /* WebContextMenuProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenuProxy.h; sourceTree = "<group>"; };
>@@ -4340,8 +4333,6 @@
> 		C5FA1ED218E1062200B3F402 /* WKAirPlayRoutePicker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKAirPlayRoutePicker.mm; path = ios/forms/WKAirPlayRoutePicker.mm; sourceTree = "<group>"; };
> 		C98C48A31B6FD4C300145103 /* WebMediaSessionFocusManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMediaSessionFocusManager.cpp; sourceTree = "<group>"; };
> 		C98C48A41B6FD4C300145103 /* WebMediaSessionFocusManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaSessionFocusManager.h; sourceTree = "<group>"; };
>-		C98C48A71B6FD5B500145103 /* WKMediaSessionFocusManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKMediaSessionFocusManager.cpp; sourceTree = "<group>"; };
>-		C98C48A81B6FD5B500145103 /* WKMediaSessionFocusManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMediaSessionFocusManager.h; sourceTree = "<group>"; };
> 		C9C183371B73FD6A007036A7 /* WebMediaSessionFocusManagerClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMediaSessionFocusManagerClient.cpp; sourceTree = "<group>"; };
> 		C9C183381B73FD6A007036A7 /* WebMediaSessionFocusManagerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaSessionFocusManagerClient.h; sourceTree = "<group>"; };
> 		C9CD43931B4B000E00239E33 /* WebMediaSessionMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMediaSessionMetadata.cpp; sourceTree = "<group>"; };
>@@ -7562,8 +7553,6 @@
> 				6EE849C41368D9040038D481 /* mac */,
> 				BCB63477116BF10600603215 /* WebKit2_C.h */,
> 				BCDDB32C124EC2E10048D13C /* WKAPICast.h */,
>-				517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */,
>-				517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */,
> 				512F58ED12A88A5400629530 /* WKAuthenticationChallenge.cpp */,
> 				512F58EE12A88A5400629530 /* WKAuthenticationChallenge.h */,
> 				512F58EF12A88A5400629530 /* WKAuthenticationDecisionListener.cpp */,
>@@ -7612,11 +7601,7 @@
> 				5110AE0B133C16CB0072717A /* WKIconDatabase.h */,
> 				1C8E293812761E5B00BC7BD0 /* WKInspector.cpp */,
> 				1C8E293712761E5B00BC7BD0 /* WKInspector.h */,
>-				51A9E1081315CD18009E7031 /* WKKeyValueStorageManager.cpp */,
>-				51A9E1091315CD18009E7031 /* WKKeyValueStorageManager.h */,
> 				2D790A9E1AD7164900AB90B3 /* WKLayoutMode.h */,
>-				C98C48A71B6FD5B500145103 /* WKMediaSessionFocusManager.cpp */,
>-				C98C48A81B6FD5B500145103 /* WKMediaSessionFocusManager.h */,
> 				C9CD43991B4B024200239E33 /* WKMediaSessionMetadata.cpp */,
> 				C9CD439A1B4B024200239E33 /* WKMediaSessionMetadata.h */,
> 				C11E1693212B87C500985FF6 /* WKMockDisplay.cpp */,
>@@ -9560,7 +9545,6 @@
> 				C5FA1ED318E1062200B3F402 /* WKAirPlayRoutePicker.h in Headers */,
> 				2D12DAB520662C73006F00FB /* WKAnimationDelegate.h in Headers */,
> 				BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */,
>-				512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */,
> 				A13DC682207AA6B20066EF72 /* WKApplicationStateTrackingView.h in Headers */,
> 				BC4075F4124FF0270068F20A /* WKArray.h in Headers */,
> 				512F58F612A88A5400629530 /* WKAuthenticationChallenge.h in Headers */,
>@@ -9723,10 +9707,8 @@
> 				A5C0F0AB2000658200536536 /* WKInspectorWindow.h in Headers */,
> 				A518B5D21FE1D55B00F9FA28 /* WKInspectorWKWebView.h in Headers */,
> 				2DD5E129210ADC7B00DB6012 /* WKKeyboardScrollingAnimator.h in Headers */,
>-				51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */,
> 				2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */,
> 				2DA1E4FE18C02B6A00DBC929 /* WKLegacyPDFView.h in Headers */,
>-				C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */,
> 				C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */,
> 				1AB40EE61BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h in Headers */,
> 				C11E1694212B87C500985FF6 /* WKMockDisplay.h in Headers */,

Actions: View | Formatted Diff | Diff

Attachments on bug 193161: 358379 | 358666