Changeset 262207 in webkit

Timestamp:

May 27, 2020 12:35:15 PM (4 years ago)

Author:

pvollan@apple.com

Message:

Unreviewed, reverting r260840.

This patch is no longer needed after preferences root cause
has been fixed.

Reverted changeset:

"[Cocoa] Global preferences are not accessible in the
WebContent process when CFPrefs direct mode is enabled"
​https://bugs.webkit.org/show_bug.cgi?id=211075
​https://trac.webkit.org/changeset/260840

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Source/WebKit/Shared/WebProcessCreationParameters.h (modified) (1 diff)
• Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (1 diff)
• Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit/PreferenceChanges.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-27  Per Arne Vollan  <pvollan@apple.com>
+
+        Unreviewed, reverting r260840.
+
+        This patch is no longer needed after preferences root cause
+        has been fixed.
+
+        Reverted changeset:
+
+        "[Cocoa] Global preferences are not accessible in the
+        WebContent process when CFPrefs direct mode is enabled"
+        https://bugs.webkit.org/show_bug.cgi?id=211075
+        https://trac.webkit.org/changeset/260840
+
 2020-05-27  Michael Catanzaro  <mcatanzaro@gnome.org>
 

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -189 +189 @@
 #if ENABLE(CFPREFS_DIRECT_MODE)
     encoder << preferencesExtensionHandles;
-    encoder << encodedGlobalPreferences;
 #endif
 #endif
@@ -528 +527 @@
         return false;
     parameters.preferencesExtensionHandles = WTFMove(*preferencesExtensionHandles);
-
-    Optional<String> encodedGlobalPreferences;
-    decoder >> encodedGlobalPreferences;
-    if (!encodedGlobalPreferences)
-        return false;
-    parameters.encodedGlobalPreferences = WTFMove(*encodedGlobalPreferences);
 #endif
 #endif

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -228 +228 @@
 #if ENABLE(CFPREFS_DIRECT_MODE)
     Optional<SandboxExtension::HandleArray> preferencesExtensionHandles;
-    String encodedGlobalPreferences;
 #endif
 #endif

trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

@@ -454 +454 @@
     }
 
-#if ENABLE(CFPREFS_DIRECT_MODE)
-#if PLATFORM(IOS_FAMILY)
+#if ENABLE(CFPREFS_DIRECT_MODE) && PLATFORM(IOS_FAMILY)
     if (_AXSApplicationAccessibilityEnabled())
         parameters.preferencesExtensionHandles = SandboxExtension::createHandlesForMachLookup({ "com.apple.cfprefsd.agent"_s, "com.apple.cfprefsd.daemon"_s }, WTF::nullopt);
-#endif
-
-    auto globalPreferencesDictionary = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, nullptr, nullptr));
-    static CFStringRef keys[] = {
-        CFSTR("AppleLanguages"),
-        CFSTR("AppleLanguagesSchemaVersion"),
-        CFSTR("AppleLocale")
-    };
-    for (size_t i = 0; i < std::size(keys); ++i) {
-        auto value = adoptCF(CFPreferencesCopyAppValue(keys[i], CFSTR("kCFPreferencesAnyApplication")));
-        if (!value)
-            continue;
-        CFDictionaryAddValue(globalPreferencesDictionary.get(), keys[i], value.get());
-    }
-    if (CFDictionaryGetCount(globalPreferencesDictionary.get()) > 0) {
-        NSError *e = nil;
-        auto data = retainPtr([NSKeyedArchiver archivedDataWithRootObject:(__bridge NSMutableDictionary *)globalPreferencesDictionary.get() requiringSecureCoding:YES error:&e]);
-        if (e) {
-            ASSERT_NOT_REACHED();
-            WTFLogAlways("Failed to archive global preferences dictionary with NSKeyedArchiver.");
-        } else
-            parameters.encodedGlobalPreferences = String([data base64EncodedStringWithOptions:0]);
-    }
 #endif
 

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -167 +167 @@
 #endif
 
-#if ENABLE(CFPREFS_DIRECT_MODE)
-static void setGlobalPreferences(const String& encodedGlobalPreferences)
-{
-    if (encodedGlobalPreferences.isEmpty())
-        return;
-
-    auto encodedData = adoptNS([[NSData alloc] initWithBase64EncodedString:encodedGlobalPreferences options:0]);
-    if (!encodedData)
-        return;
-
-    NSError *err = nil;
-    auto classes = [NSSet setWithArray:@[[NSString class], [NSNumber class], [NSDate class], [NSDictionary class], [NSArray class], [NSData class]]];
-    id globalPreferencesDictionary = [NSKeyedUnarchiver unarchivedObjectOfClasses:classes fromData:encodedData.get() error:&err];
-    if (err) {
-        ASSERT_NOT_REACHED();
-        WTFLogAlways("Failed to unarchive global preferences dictionary with NSKeyedUnarchiver.");
-        return;
-    }
-    [globalPreferencesDictionary enumerateKeysAndObjectsUsingBlock: ^(NSString *key, id value, BOOL* stop) {
-        if (value)
-            CFPreferencesSetAppValue(static_cast<CFStringRef>(key), static_cast<CFPropertyListRef>(value), CFSTR("kCFPreferencesAnyApplication"));
-    }];
-}
-#endif
-
 void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
 {
-#if ENABLE(CFPREFS_DIRECT_MODE)
-    setGlobalPreferences(parameters.encodedGlobalPreferences);
-#endif
-
     // Map Launch Services database. This should be done as early as possible, as the mapping will fail
     // if 'com.apple.lsd.mapdb' is being accessed before this.
@@ -217 +188 @@
         ASSERT(String(uti.get()) = String(adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, CFSTR("text/html"), 0)).get()));
     }
+
 
 #if PLATFORM(IOS_FAMILY)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-05-27  Per Arne Vollan  <pvollan@apple.com>
+
+        Unreviewed, reverting r260840.
+
+        This patch is no longer needed after preferences root cause
+        has been fixed.
+
+        Reverted changeset:
+
+        "[Cocoa] Global preferences are not accessible in the
+        WebContent process when CFPrefs direct mode is enabled"
+        https://bugs.webkit.org/show_bug.cgi?id=211075
+        https://trac.webkit.org/changeset/260840
+
 2020-05-27  Devin Rousso  <drousso@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit/PreferenceChanges.mm

@@ -277 +277 @@
 }
 
-TEST(WebKit, GlobalPreferences)
-{
-    NSString *globalDomain = @"kCFPreferencesAnyApplication";
-    NSString *globalKey = @"AppleLanguages";
-
-    NSArray *languages = @[@"en-US", @"nb-US"];
-
-    CFPreferencesSetAppValue(static_cast<CFStringRef>(globalKey), static_cast<CFArrayRef>(languages), static_cast<CFStringRef>(globalDomain));
-
-    auto userDefaults = adoptNS([[NSUserDefaults alloc] initWithSuiteName:globalDomain]);
-    [userDefaults.get() setObject:languages forKey:globalKey];
-
-    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    WKRetainPtr<WKContextRef> context = adoptWK(TestWebKitAPI::Util::createContextForInjectedBundleTest("InternalsInjectedBundleTest"));
-    configuration.get().processPool = (WKProcessPool *)context.get();
-    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 300, 300) configuration:configuration.get() addToWindow:YES]);
-
-    auto preferenceValue = [&] {
-        NSString *js = [NSString stringWithFormat:@"window.internals.encodedPreferenceValue(\"%@\",\"%@\")", globalDomain, globalKey];
-        return [webView stringByEvaluatingJavaScript:js];
-    };
-
-    auto encodedString = preferenceValue();
-    auto encodedData = adoptNS([[NSData alloc] initWithBase64EncodedString:encodedString options:0]);
-    ASSERT_TRUE(encodedData);
-    NSError *err = nil;
-    auto object = retainPtr([NSKeyedUnarchiver unarchivedObjectOfClass:[NSObject class] fromData:encodedData.get() error:&err]);
-    ASSERT_TRUE(!err);
-    ASSERT_TRUE(object);
-    ASSERT_TRUE([object isEqual:languages]);
-}
-
 #endif // WK_HAVE_C_SPI