Changeset 260787 in webkit

Timestamp:

Apr 27, 2020 2:48:48 PM (4 years ago)

Author:

Chris Dumez

Message:

[iOS][WK2] Drop "com.apple.WebKit.DatabaseActivity" UIKit background activity
​https://bugs.webkit.org/show_bug.cgi?id=211084

Reviewed by Geoffrey Garen.

Drop "com.apple.WebKit.DatabaseActivity" UIKit background activity in the UIProcess now that local storage
has been moved to the network process.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _initializeWithConfiguration:]):
(-[WKWebView _setUpSQLiteDatabaseTrackerClient]): Deleted.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-27  Chris Dumez  <cdumez@apple.com>
+
+        [iOS][WK2] Drop "com.apple.WebKit.DatabaseActivity" UIKit background activity
+        https://bugs.webkit.org/show_bug.cgi?id=211084
+
+        Reviewed by Geoffrey Garen.
+
+        Drop "com.apple.WebKit.DatabaseActivity" UIKit background activity in the UIProcess now that local storage
+        has been moved to the network process.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]):
+        (-[WKWebView _setUpSQLiteDatabaseTrackerClient]): Deleted.
+
 2020-04-27  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -125 +125 @@
 #import <WebCore/RuntimeApplicationChecks.h>
 #import <WebCore/RuntimeEnabledFeatures.h>
-#import <WebCore/SQLiteDatabaseTracker.h>
 #import <WebCore/Settings.h>
 #import <WebCore/SharedBuffer.h>
@@ -161 +160 @@
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <UIKit/UIApplication.h>
-#import <WebCore/WebBackgroundTaskController.h>
-#import <WebCore/WebSQLiteDatabaseTrackerClient.h>
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <pal/spi/ios/GraphicsServicesSPI.h>
@@ -403 +400 @@
     _inspectorDelegate = makeUnique<WebKit::InspectorDelegate>(self);
 
-    [self _setUpSQLiteDatabaseTrackerClient];
-
     for (auto& pair : pageConfiguration->urlSchemeHandlers())
         _page->setURLSchemeHandlerForScheme(WebKit::WebURLSchemeHandlerCocoa::create(static_cast<WebKit::WebURLSchemeHandlerCocoa&>(pair.value.get()).apiHandler()), pair.key);
@@ -534 +529 @@
     if (!linkedOnOrAfter(WebKit::SDKVersion::FirstWhereSiteSpecificQuirksAreEnabledByDefault))
         pageConfiguration->preferences()->setNeedsSiteSpecificQuirks(false);
-}
-
-- (void)_setUpSQLiteDatabaseTrackerClient
-{
-#if PLATFORM(IOS_FAMILY)
-    WebBackgroundTaskController *controller = [WebBackgroundTaskController sharedController];
-    if (controller.backgroundTaskStartBlock)
-        return;
-
-    controller.backgroundTaskStartBlock = ^NSUInteger (void (^expirationHandler)())
-    {
-        return [[UIApplication sharedApplication] beginBackgroundTaskWithName:@"com.apple.WebKit.DatabaseActivity" expirationHandler:expirationHandler];
-    };
-    controller.backgroundTaskEndBlock = ^(UIBackgroundTaskIdentifier taskIdentifier)
-    {
-        [[UIApplication sharedApplication] endBackgroundTask:taskIdentifier];
-    };
-    controller.invalidBackgroundTaskIdentifier = UIBackgroundTaskInvalid;
-
-    WebCore::SQLiteDatabaseTracker::setClient(&WebCore::WebSQLiteDatabaseTrackerClient::sharedWebSQLiteDatabaseTrackerClient());
-#endif
 }