Changeset 260769 in webkit

Timestamp:

Apr 27, 2020 1:01:53 PM (4 years ago)

Author:

pvollan@apple.com

Message:

[Cocoa] After r258891, r255119 can be reverted
​https://bugs.webkit.org/show_bug.cgi?id=211083
Source/WebCore:

<rdar://problem/60714318>

Unreviewed revert of r255119.

Copying a MIME type map from the UI process to the WebContent process on startup is not needed anymore,
since r258891 will map the Launch Services database in the WebContent process.

• platform/MIMETypeRegistry.cpp:

(WebCore::commonMimeTypesMap):
(WebCore::typesForCommonExtension):
(WebCore::overriddenMimeTypesMap): Deleted.

• platform/MIMETypeRegistry.h:
• testing/Internals.cpp:

(WebCore::Internals::mediaMIMETypeForExtension): Deleted.

• testing/Internals.h:
• testing/Internals.idl:

Source/WebKit:

Unreviewed revert of r255119.

• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):

• Shared/WebProcessCreationParameters.h:
• UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeWebProcess):

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

Tools:

Unreviewed revert of r255119.

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebKit/MimeTypes.mm: Removed.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/MIMETypeRegistry.cpp (modified) (3 diffs)
• Source/WebCore/platform/MIMETypeRegistry.h (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)
• 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) (2 diffs)
• Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/WebKit/MimeTypes.mm (deleted)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-27  Per Arne Vollan  <pvollan@apple.com>
+
+        [Cocoa] After r258891, r255119 can be reverted
+        https://bugs.webkit.org/show_bug.cgi?id=211083
+        <rdar://problem/60714318>
+
+        Unreviewed revert of r255119.
+
+        Copying a MIME type map from the UI process to the WebContent process on startup is not needed anymore,
+        since r258891 will map the Launch Services database in the WebContent process.
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::commonMimeTypesMap):
+        (WebCore::typesForCommonExtension):
+        (WebCore::overriddenMimeTypesMap): Deleted.
+        * platform/MIMETypeRegistry.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::mediaMIMETypeForExtension): Deleted.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2020-04-27  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/platform/MIMETypeRegistry.cpp

@@ -271 +271 @@
 }
 
-Optional<HashMap<String, Vector<String>, ASCIICaseInsensitiveHash>>& overriddenMimeTypesMap()
-{
-    static NeverDestroyed<Optional<HashMap<String, Vector<String>, ASCIICaseInsensitiveHash>>> map;
-    return map;
-}
-
 const std::initializer_list<TypeExtensionPair>& commonMediaTypes()
 {
@@ -363 +357 @@
 }
 
-const HashMap<String, Vector<String>, ASCIICaseInsensitiveHash>& commonMimeTypesMap()
+static const HashMap<String, Vector<String>, ASCIICaseInsensitiveHash>& commonMimeTypesMap()
 {
     ASSERT(isMainThread());
@@ -388 +382 @@
 static const Vector<String>* typesForCommonExtension(const String& extension)
 {
-    if (overriddenMimeTypesMap().hasValue()) {
-        auto mapEntry = overriddenMimeTypesMap()->find(extension);
-        if (mapEntry == overriddenMimeTypesMap()->end())
-            return nullptr;
-        return &mapEntry->value;
-    }
     auto mapEntry = commonMimeTypesMap().find(extension);
     if (mapEntry == commonMimeTypesMap().end())

trunk/Source/WebCore/platform/MIMETypeRegistry.h

@@ -31 +31 @@
 
 namespace WebCore {
-
-WEBCORE_EXPORT Optional<HashMap<String, Vector<String>, ASCIICaseInsensitiveHash>>& overriddenMimeTypesMap();
-WEBCORE_EXPORT const HashMap<String, Vector<String>, ASCIICaseInsensitiveHash>& commonMimeTypesMap();
 
 struct TypeExtensionPair {

trunk/Source/WebCore/testing/Internals.cpp

@@ -120 +120 @@
 #include "LoaderStrategy.h"
 #include "Location.h"
-#include "MIMETypeRegistry.h"
 #include "MallocStatistics.h"
 #include "MediaDevices.h"
@@ -5634 +5633 @@
 #endif
 
-String Internals::mediaMIMETypeForExtension(const String& extension)
-{
-    return MIMETypeRegistry::getMediaMIMETypeForExtension(extension);
-}
-
 bool Internals::supportsPictureInPicture()
 {

trunk/Source/WebCore/testing/Internals.h

@@ -994 +994 @@
     String encodedPreferenceValue(const String& domain, const String& key);
 
-    String mediaMIMETypeForExtension(const String& extension);
-
     String getUTIFromTag(const String& tagClass, const String& tag, const String& conformingToUTI);
 

trunk/Source/WebCore/testing/Internals.idl

@@ -897 +897 @@
     DOMString encodedPreferenceValue(DOMString domain, DOMString key);
 
-    DOMString mediaMIMETypeForExtension(DOMString extension);
-
     DOMString getUTIFromTag(DOMString tagClass, DOMString tag, DOMString conformingToUTI);
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-27  Per Arne Vollan  <pvollan@apple.com>
+
+        [Cocoa] After r258891, r255119 can be reverted
+        https://bugs.webkit.org/show_bug.cgi?id=211083
+
+        Unreviewed revert of r255119.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode const):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2020-04-27  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -180 +180 @@
     encoder << mapDBExtensionHandle;
     encoder << systemHasBattery;
-    encoder << mimeTypesMap;
 #endif
 
@@ -504 +503 @@
         return false;
     parameters.systemHasBattery = WTFMove(*systemHasBattery);
-
-    Optional<Optional<HashMap<String, Vector<String>, ASCIICaseInsensitiveHash>>> mimeTypesMap;
-    decoder >> mimeTypesMap;
-    if (!mimeTypesMap)
-        return false;
-    parameters.mimeTypesMap = WTFMove(*mimeTypesMap);
 #endif
 

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -218 +218 @@
     Optional<SandboxExtension::Handle> mapDBExtensionHandle;
     bool systemHasBattery { false };
-    Optional<HashMap<String, Vector<String>, ASCIICaseInsensitiveHash>> mimeTypesMap;
 #endif
 

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

@@ -52 +52 @@
 #import <WebCore/Color.h>
 #import <WebCore/LocalizedDeviceModel.h>
-#import <WebCore/MIMETypeRegistry.h>
 #import <WebCore/NetworkStorageSession.h>
 #import <WebCore/NotImplemented.h>
@@ -415 +414 @@
     }
     parameters.systemHasBattery = systemHasBattery();
-    parameters.mimeTypesMap = commonMimeTypesMap();
 
     SandboxExtension::Handle mapDBHandle;

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

@@ -62 +62 @@
 #import <WebCore/LocalizedStrings.h>
 #import <WebCore/LogInitialization.h>
-#import <WebCore/MIMETypeRegistry.h>
 #import <WebCore/MemoryRelease.h>
 #import <WebCore/NSScrollerImpDetails.h>
@@ -328 +327 @@
     setSystemHasBattery(parameters.systemHasBattery);
 
-    if (parameters.mimeTypesMap)
-        overriddenMimeTypesMap() = WTFMove(parameters.mimeTypesMap);
-
 #if PLATFORM(IOS_FAMILY)
     RenderThemeIOS::setCSSValueToSystemColorMap(WTFMove(parameters.cssValueToSystemColorMap));

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-27  Per Arne Vollan  <pvollan@apple.com>
+
+        [Cocoa] After r258891, r255119 can be reverted
+        https://bugs.webkit.org/show_bug.cgi?id=211083
+
+        Unreviewed revert of r255119.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebKit/MimeTypes.mm: Removed.
+
 2020-04-27  Daniel Bates  <dabates@apple.com>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -890 +890 @@
                 C0C5D3C61459912900A802A6 /* GetBackingScaleFactor_Bundle.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0C5D3BD14598B6F00A802A6 /* GetBackingScaleFactor_Bundle.mm */; };
                 C13D82D92416F13200A62793 /* EnableAccessibility.mm in Sources */ = {isa = PBXBuildFile; fileRef = C13D82D82416F13200A62793 /* EnableAccessibility.mm */; };
-                C145CC0C23DA5A1F003A5EEB /* MimeTypes.mm in Sources */ = {isa = PBXBuildFile; fileRef = C145CC0B23DA5A0F003A5EEB /* MimeTypes.mm */; };
                 C149D550242E98DF003EBB12 /* SleepDisabler.mm in Sources */ = {isa = PBXBuildFile; fileRef = C149D54F242E9844003EBB12 /* SleepDisabler.mm */; };
                 C15CBB3023F1FF1A00300CC7 /* BacklightLevelNotification.mm in Sources */ = {isa = PBXBuildFile; fileRef = C15CBB2F23F1FF1A00300CC7 /* BacklightLevelNotification.mm */; };
@@ -2485 +2484 @@
                 C0C5D3BD14598B6F00A802A6 /* GetBackingScaleFactor_Bundle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GetBackingScaleFactor_Bundle.mm; sourceTree = "<group>"; };
                 C13D82D82416F13200A62793 /* EnableAccessibility.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = EnableAccessibility.mm; sourceTree = "<group>"; };
-                C145CC0B23DA5A0F003A5EEB /* MimeTypes.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MimeTypes.mm; sourceTree = "<group>"; };
                 C149D54F242E9844003EBB12 /* SleepDisabler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SleepDisabler.mm; sourceTree = "<group>"; };
                 C15CBB2F23F1FF1A00300CC7 /* BacklightLevelNotification.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = BacklightLevelNotification.mm; sourceTree = "<group>"; };
@@ -2955 +2953 @@
                                 E34A6D182412DE390012AB6E /* GrantAccessToPreferencesService.mm */,
                                 E35B908123F60DD0000011FF /* LocalizedDeviceModel.mm */,
-                                C145CC0B23DA5A0F003A5EEB /* MimeTypes.mm */,
                                 E325C90623E3870200BC7D3B /* PictureInPictureSupport.mm */,
                                 C15CBB3E23FB177A00300CC7 /* PreferenceChanges.mm */,
@@ -4989 +4986 @@
                                 5165FE04201EE620009F7EC3 /* MessagePortProviders.mm in Sources */,
                                 A5B149DE1F5A19EA00C6DAFF /* MIMETypeRegistry.cpp in Sources */,
-                                C145CC0C23DA5A1F003A5EEB /* MimeTypes.mm in Sources */,
                                 51CD1C6C1B38CE4300142CA5 /* ModalAlerts.mm in Sources */,
                                 7C83E0B61D0A64B300FEBCF3 /* ModalAlertsSPI.cpp in Sources */,