Changeset 295213 in webkit

Timestamp:

Jun 3, 2022 8:55:01 AM (2 years ago)

Author:

pvollan@apple.com

Message:

Call function to restrict image decoders for all clients
​https://bugs.webkit.org/show_bug.cgi?id=240958
<rdar://93794556>

Reviewed by Geoffrey Garen.

Call function to enable HEIC decoding for all clients on iOS. The main motivation behind this patch
is to avoid using IOKit when decoding HEIC or JPEGs with aux HEIC. Calling enableDecodingHEIC() will
make sure IOKit is not being used, as well as enabling HEIC decoding. We previously only did this for
Mail, but decoding of HEIC images should be possible for all clients. We are not enabling this for
all clients on macOS, since macOS is not blocking IOKit in the WebContent process. This patch also
renames the function, since the former name was not accurate.

• Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp:

(WebCore::createImageSourceOptions):
(WebCore::ImageDecoderCG::enableDecodeHEIC):
(WebCore::ImageDecoderCG::decodeHEICEnabled):
(WebCore::ImageDecoderCG::enableRestrictedDecoding): Deleted.
(WebCore::ImageDecoderCG::restrictedDecodingEnabled): Deleted.

• Source/WebCore/platform/graphics/cg/ImageDecoderCG.h:
• Source/WebKit/Shared/WebProcessCreationParameters.cpp:

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

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

(WebKit::WebProcessPool::platformInitializeWebProcess):

• Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

Canonical link: ​https://commits.webkit.org/251270@main

Location:

trunk/Source

Files:

• WebCore/platform/graphics/cg/ImageDecoderCG.cpp (modified) (3 diffs)
• WebCore/platform/graphics/cg/ImageDecoderCG.h (modified) (2 diffs)
• WebKit/Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• WebKit/Shared/WebProcessCreationParameters.h (modified) (1 diff)
• WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (1 diff)
• WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp

@@ -77 +77 @@
 
 #if HAVE(IMAGE_RESTRICTED_DECODING) && USE(APPLE_INTERNAL_SDK)
-    if (ImageDecoderCG::restrictedDecodingEnabled())
+    if (ImageDecoderCG::decodingHEICEnabled())
         CFDictionarySetValue(options.get(), kCGImageSourceEnableRestrictedDecoding, kCFBooleanTrue);
 #endif
@@ -269 +269 @@
 #endif
 
-bool ImageDecoderCG::s_enableRestrictedDecoding = false;
+bool ImageDecoderCG::s_enableDecodingHEIC = false;
 bool ImageDecoderCG::s_hardwareAcceleratedDecodingDisabled = false;
 
@@ -612 +612 @@
 }
 
-void ImageDecoderCG::enableRestrictedDecoding()
-{
-    s_enableRestrictedDecoding = true;
-}
-
-bool ImageDecoderCG::restrictedDecodingEnabled()
-{
-    return s_enableRestrictedDecoding;
+void ImageDecoderCG::enableDecodingHEIC()
+{
+    s_enableDecodingHEIC = true;
+}
+
+bool ImageDecoderCG::decodingHEICEnabled()
+{
+    return s_enableDecodingHEIC;
 }
 

trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.h

@@ -71 +71 @@
     void clearFrameBufferCache(size_t) final { }
 
-    WEBCORE_EXPORT static void enableRestrictedDecoding();
-    static bool restrictedDecodingEnabled();
+    WEBCORE_EXPORT static void enableDecodingHEIC();
+    static bool decodingHEICEnabled();
 
     WEBCORE_EXPORT static void disableHardwareAcceleratedDecoding();
@@ -81 +81 @@
     mutable EncodedDataStatus m_encodedDataStatus { EncodedDataStatus::Unknown };
     RetainPtr<CGImageSourceRef> m_nativeDecoder;
-    static bool s_enableRestrictedDecoding;
+    static bool s_enableDecodingHEIC;
     static bool s_hardwareAcceleratedDecodingDisabled;
 };

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -164 +164 @@
     encoder << trustdExtensionHandle;
 #endif
-    encoder << restrictImageAndVideoDecoders;
+    encoder << enableDecodingHEIC;
 #endif
 
@@ -451 +451 @@
     parameters.trustdExtensionHandle = WTFMove(*trustdExtensionHandle);
 #endif
-    std::optional<bool> restrictImageAndVideoDecoders;
-    decoder >> restrictImageAndVideoDecoders;
-    if (!restrictImageAndVideoDecoders)
-        return false;
-    parameters.restrictImageAndVideoDecoders = *restrictImageAndVideoDecoders;
+    std::optional<bool> enableDecodingHEIC;
+    decoder >> enableDecodingHEIC;
+    if (!enableDecodingHEIC)
+        return false;
+    parameters.enableDecodingHEIC = *enableDecodingHEIC;
 #endif
 

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -205 +205 @@
     SandboxExtension::Handle trustdExtensionHandle;
 #endif
-    bool restrictImageAndVideoDecoders { false };
+    bool enableDecodingHEIC { false };
 #endif
 

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

@@ -397 +397 @@
         if (auto trustdExtensionHandle = SandboxExtension::createHandleForMachLookup("com.apple.trustd.agent"_s, std::nullopt))
             parameters.trustdExtensionHandle = WTFMove(*trustdExtensionHandle);
-        parameters.restrictImageAndVideoDecoders = true;
+        parameters.enableDecodingHEIC = true;
     }
 #else
-    parameters.restrictImageAndVideoDecoders = IOSApplication::isMobileMail() || IOSApplication::isMailCompositionService() || CocoaApplication::isWebkitTestRunner();
+    parameters.enableDecodingHEIC = true;
 #endif // PLATFORM(MAC)
 #endif // HAVE(VIDEO_RESTRICTED_DECODING)

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

@@ -257 +257 @@
 #endif // PLATFORM(MAC)
 #if USE(APPLE_INTERNAL_SDK)
-    if (parameters.restrictImageAndVideoDecoders) {
-        ImageDecoderCG::enableRestrictedDecoding();
-        restrictImageAndVideoDecoders();
+    if (parameters.enableDecodingHEIC) {
+        ImageDecoderCG::enableDecodingHEIC();
+        enableDecodingHEIC();
     }
 #endif