Changeset 292035 in webkit

Timestamp:

Mar 29, 2022, 10:05:11 AM (5 years ago)

Author:

Simon Fraser

Message:

[iOS GPUProcess] Image decoding should not trigger IOSurface usage in the web process
​https://bugs.webkit.org/show_bug.cgi?id=238489
<rdar://88717577>

Reviewed by Per Arne Vollan.

Source/WebCore:

When hardwareAcceleratedDecodingDisabled() has been called, turn off hardware acceleration
for image decoding.

• platform/graphics/cg/ImageDecoderCG.cpp:

(WebCore::createImageSourceOptions):
(WebCore::ImageDecoderCG::disableHardwareAcceleratedDecoding):
(WebCore::ImageDecoderCG::hardwareAcceleratedDecodingDisabled):

• platform/graphics/cg/ImageDecoderCG.h:

Source/WebCore/PAL:

Expose kCGImageSourceUseHardwareAcceleration.

• pal/spi/cg/ImageIOSPI.h:

Source/WebKit:

When useGPUProcessForDOMRendering is true, disable hardware image decoding since
we need to avoid IOSurface access in the web process.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::setUseGPUProcessForDOMRendering):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cg/ImageIOSPI.h (modified) (1 diff)
• WebCore/platform/graphics/cg/ImageDecoderCG.cpp (modified) (4 diffs)
• WebCore/platform/graphics/cg/ImageDecoderCG.h (modified) (3 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebProcess.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-28  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS GPUProcess] Image decoding should not trigger IOSurface usage in the web process
+        https://bugs.webkit.org/show_bug.cgi?id=238489
+        <rdar://88717577>
+
+        Reviewed by Per Arne Vollan.
+
+        When hardwareAcceleratedDecodingDisabled() has been called, turn off hardware acceleration
+        for image decoding.
+
+        * platform/graphics/cg/ImageDecoderCG.cpp:
+        (WebCore::createImageSourceOptions):
+        (WebCore::ImageDecoderCG::disableHardwareAcceleratedDecoding):
+        (WebCore::ImageDecoderCG::hardwareAcceleratedDecodingDisabled):
+        * platform/graphics/cg/ImageDecoderCG.h:
+
 2022-03-29  Brandon Stewart  <brandonstewart@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2022-03-28  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS GPUProcess] Image decoding should not trigger IOSurface usage in the web process
+        https://bugs.webkit.org/show_bug.cgi?id=238489
+        <rdar://88717577>
+
+        Reviewed by Per Arne Vollan.
+
+        Expose kCGImageSourceUseHardwareAcceleration.
+
+        * pal/spi/cg/ImageIOSPI.h:
+
 2022-03-28  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cg/ImageIOSPI.h

@@ -37 +37 @@
 IMAGEIO_EXTERN const CFStringRef kCGImageSourceSubsampleFactor;
 IMAGEIO_EXTERN const CFStringRef kCGImageSourceShouldCacheImmediately;
+IMAGEIO_EXTERN const CFStringRef kCGImageSourceUseHardwareAcceleration;
 #endif
 

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

@@ -57 +57 @@
 const CFStringRef kCGImageSourceSubsampleFactor = CFSTR("kCGImageSourceSubsampleFactor");
 const CFStringRef kCGImageSourceShouldCacheImmediately = CFSTR("kCGImageSourceShouldCacheImmediately");
+const CFStringRef kCGImageSourceUseHardwareAcceleration = CFSTR("kCGImageSourceUseHardwareAcceleration");
 #endif
 
@@ -67 +68 @@
     CFDictionarySetValue(options.get(), kCGImageSourceShouldPreferRGB32, kCFBooleanTrue);
     CFDictionarySetValue(options.get(), kCGImageSourceSkipMetadata, kCFBooleanTrue);
+
+    if (ImageDecoderCG::hardwareAcceleratedDecodingDisabled())
+        CFDictionarySetValue(options.get(), kCGImageSourceUseHardwareAcceleration, kCFBooleanFalse);
+
 #if HAVE(IMAGE_RESTRICTED_DECODING) && USE(APPLE_INTERNAL_SDK)
     if (ImageDecoderCG::restrictedDecodingEnabled())
@@ -257 +262 @@
 
 bool ImageDecoderCG::s_enableRestrictedDecoding = false;
+bool ImageDecoderCG::s_hardwareAcceleratedDecodingDisabled = false;
 
 ImageDecoderCG::ImageDecoderCG(FragmentedSharedBuffer& data, AlphaOption, GammaAndColorProfileOption)
@@ -608 +614 @@
 }
 
+void ImageDecoderCG::disableHardwareAcceleratedDecoding()
+{
+    s_hardwareAcceleratedDecodingDisabled = true;
+}
+
+bool ImageDecoderCG::hardwareAcceleratedDecodingDisabled()
+{
+    return s_hardwareAcceleratedDecodingDisabled;
+}
+
 }
 

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

@@ -27 +27 @@
 
 #include "ImageDecoder.h"
+
+#if USE(CG)
 
 namespace WebCore {
@@ -72 +74 @@
     static bool restrictedDecodingEnabled();
 
+    WEBCORE_EXPORT static void disableHardwareAcceleratedDecoding();
+    static bool hardwareAcceleratedDecodingDisabled();
+
 private:
     bool m_isAllDataReceived { false };
@@ -77 +82 @@
     RetainPtr<CGImageSourceRef> m_nativeDecoder;
     static bool s_enableRestrictedDecoding;
+    static bool s_hardwareAcceleratedDecodingDisabled;
 };
 
-}
+} // namespace WebCore
+
+#endif // USE(CG)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-03-28  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS GPUProcess] Image decoding should not trigger IOSurface usage in the web process
+        https://bugs.webkit.org/show_bug.cgi?id=238489
+        <rdar://88717577>
+
+        Reviewed by Per Arne Vollan.
+
+        When useGPUProcessForDOMRendering is true, disable hardware image decoding since
+        we need to avoid IOSurface access in the web process.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::setUseGPUProcessForDOMRendering):
+
 2022-03-29  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebKit/WebProcess/WebProcess.cpp

@@ -167 +167 @@
 #endif
 
+#if USE(CG)
+#include <WebCore/ImageDecoderCG.h>
+#endif
+
 #if PLATFORM(MAC)
 #include <WebCore/DisplayRefreshMonitorManager.h>
@@ -2103 +2107 @@
 void WebProcess::setUseGPUProcessForDOMRendering(bool useGPUProcessForDOMRendering)
 {
+    if (useGPUProcessForDOMRendering == m_useGPUProcessForDOMRendering)
+        return;
+
     m_useGPUProcessForDOMRendering = useGPUProcessForDOMRendering;
+#if USE(CG)
+    if (m_useGPUProcessForDOMRendering)
+        ImageDecoderCG::disableHardwareAcceleratedDecoding();
+#endif
 }
 
@@ -2202 +2213 @@
     return m_useGPUProcessForWebGL;
 }
-
-#endif
-
-#endif
+#endif // ENABLE(WEBGL)
+
+#endif // ENABLE(GPU_PROCESS)
 
 #if ENABLE(MEDIA_STREAM)