[visionOS] Refine activation rules for Image Fullscreen

https://bugs.webkit.org/show_bug.cgi?id=272218 <rdar://125913434> Reviewed by Said Abou-Hallawa. Introduce a `shouldUseQuickLookForFullscreen()` method on Images. It defaults to false and queries the ImageDecoder for bitmap images. Gate the use of Image Fullscreen on this flag. * Source/WebCore/platform/graphics/BitmapImage.h: * Source/WebCore/platform/graphics/BitmapImageSource.cpp: (WebCore::BitmapImageSource::shouldUseQuickLookForFullscreen const): * Source/WebCore/platform/graphics/BitmapImageSource.h: * Source/WebCore/platform/graphics/Image.h: (WebCore::Image::shouldUseQuickLookForFullscreen const): * Source/WebCore/platform/graphics/ImageDecoder.h: (WebCore::ImageDecoder::shouldUseQuickLookForFullscreen const): * Source/WebCore/platform/graphics/ImageSource.h: (WebCore::ImageSource::shouldUseQuickLookForFullscreen const): Wire the `shouldUseQuickLookForFullscreen()` check to the ImageDecoder. * Source/WebCore/platform/graphics/cg/ImageDecoderCG.h: * Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp: (WebCore::ImageDecoderCG::shouldUseQuickLookForFullscreen const): Add the WKA entry point. * Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.cpp: (WebKit::WebFullScreenManager::enterFullScreenForElement): Add the `shouldUseQuickLookForFullscreen()` check. Canonical link: https://commits.webkit.org/277177@main
WebKit · Apr 7, 2024 · 4ac0a7c · 4ac0a7c
1 parent 6e624ea
commit 4ac0a7c
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 1 deletion.
diff --git a/Source/WebCore/platform/graphics/BitmapImage.h b/Source/WebCore/platform/graphics/BitmapImage.h
@@ -113,6 +113,10 @@ class BitmapImage final : public Image {
     std::optional<IntPoint> hotSpot() const final { return m_source->hotSpot(); }
     std::optional<Color> singlePixelSolidColor() const final { return m_source->singlePixelSolidColor(); }
 
+#if ENABLE(QUICKLOOK_FULLSCREEN)
+    bool shouldUseQuickLookForFullscreen() const final { return m_source->shouldUseQuickLookForFullscreen(); }
+#endif
+
     // Image methods
     bool isBitmapImage() const final { return true; }
     bool isAnimating() const final { return m_source->isAnimating(); }

diff --git a/Source/WebCore/platform/graphics/BitmapImageSource.cpp b/Source/WebCore/platform/graphics/BitmapImageSource.cpp
@@ -831,6 +831,13 @@ SubsamplingLevel BitmapImageSource::subsamplingLevelForScaleFactor(GraphicsConte
 #endif
 }
 
+#if ENABLE(QUICKLOOK_FULLSCREEN)
+bool BitmapImageSource::shouldUseQuickLookForFullscreen() const
+{
+    return m_decoder->shouldUseQuickLookForFullscreen();
+}
+#endif
+
 IntSize BitmapImageSource::frameSizeAtIndex(unsigned index, SubsamplingLevel subsamplingLevel) const
 {
     return const_cast<BitmapImageSource&>(*this).frameAtIndexCacheIfNeeded(index, subsamplingLevel).size();

diff --git a/Source/WebCore/platform/graphics/BitmapImageSource.h b/Source/WebCore/platform/graphics/BitmapImageSource.h
@@ -186,6 +186,10 @@ class BitmapImageSource : public ImageSource {
 
     SubsamplingLevel subsamplingLevelForScaleFactor(GraphicsContext&, const FloatSize& scaleFactor, AllowImageSubsampling) final;
 
+#if ENABLE(QUICKLOOK_FULLSCREEN)
+    bool shouldUseQuickLookForFullscreen() const;
+#endif
+
     // ImageFrame metadata
     IntSize frameSizeAtIndex(unsigned index, SubsamplingLevel = SubsamplingLevel::Default) const;
     ImageOrientation frameOrientationAtIndex(unsigned index) const final;

diff --git a/Source/WebCore/platform/graphics/Image.h b/Source/WebCore/platform/graphics/Image.h
@@ -159,6 +159,9 @@ class Image : public RefCounted<Image>, public CanMakeWeakPtr<Image> {
 #if ASSERT_ENABLED
     virtual bool hasSolidColor() { return false; }
 #endif
+#if ENABLE(QUICKLOOK_FULLSCREEN)
+    virtual bool shouldUseQuickLookForFullscreen() const { return false; }
+#endif
 
     virtual void dump(WTF::TextStream&) const;
 

diff --git a/Source/WebCore/platform/graphics/ImageDecoder.h b/Source/WebCore/platform/graphics/ImageDecoder.h
@@ -89,6 +89,10 @@ class ImageDecoder : public ThreadSafeRefCounted<ImageDecoder> {
     virtual String accessibilityDescription() const { return emptyString(); };
     virtual std::optional<IntPoint> hotSpot() const = 0;
 
+#if ENABLE(QUICKLOOK_FULLSCREEN)
+    virtual bool shouldUseQuickLookForFullscreen() const { return false; }
+#endif
+
     virtual IntSize frameSizeAtIndex(size_t, SubsamplingLevel = SubsamplingLevel::Default) const = 0;
     virtual bool frameIsCompleteAtIndex(size_t) const = 0;
     virtual ImageOrientation frameOrientationAtIndex(size_t) const { return ImageOrientation::Orientation::None; }

diff --git a/Source/WebCore/platform/graphics/ImageSource.h b/Source/WebCore/platform/graphics/ImageSource.h
@@ -90,6 +90,10 @@ class ImageSource : public ThreadSafeRefCountedAndCanMakeThreadSafeWeakPtr<Image
 
     virtual SubsamplingLevel subsamplingLevelForScaleFactor(GraphicsContext&, const FloatSize&, AllowImageSubsampling) { return SubsamplingLevel::Default; }
 
+#if ENABLE(QUICKLOOK_FULLSCREEN)
+    virtual bool shouldUseQuickLookForFullscreen() const { return false; }
+#endif
+
     // ImageFrame Metadata
     virtual Seconds frameDurationAtIndex(unsigned) const { RELEASE_ASSERT_NOT_REACHED(); return 0_s; }
     virtual ImageOrientation frameOrientationAtIndex(unsigned) const { RELEASE_ASSERT_NOT_REACHED(); return ImageOrientation::Orientation::None; }

diff --git a/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp b/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp
@@ -669,4 +669,16 @@ bool ImageDecoderCG::canDecodeType(const String& mimeType)
 
 }
 
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/ImageDecoderCGAdditions.cpp>)
+#include <WebKitAdditions/ImageDecoderCGAdditions.cpp>
+#else
+namespace WebCore {
+
+#if ENABLE(QUICKLOOK_FULLSCREEN)
+bool ImageDecoderCG::shouldUseQuickLookForFullscreen() const { return false; }
+#endif // ENABLE(QUICKLOOK_FULLSCREEN)
+
+}
+#endif
+
 #endif // USE(CG)
diff --git a/Source/WebCore/platform/graphics/cg/ImageDecoderCG.h b/Source/WebCore/platform/graphics/cg/ImageDecoderCG.h
@@ -77,6 +77,10 @@ class ImageDecoderCG final : public ImageDecoder {
 
 private:
     String decodeUTI(const SharedBuffer&) const;
+
+#if ENABLE(QUICKLOOK_FULLSCREEN)
+    bool shouldUseQuickLookForFullscreen() const;
+#endif
 
     bool m_isAllDataReceived { false };
     mutable EncodedDataStatus m_encodedDataStatus { EncodedDataStatus::Unknown };

diff --git a/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.cpp b/Source/WebKit/WebProcess/FullScreen/WebFullScreenManager.cpp
@@ -230,7 +230,7 @@ void WebFullScreenManager::enterFullScreenForElement(WebCore::Element* element,
                 return std::nullopt;
 
             auto* image = renderImage->cachedImage()->image();
-            if (!image || !image->isBitmapImage())
+            if (!image || !image->shouldUseQuickLookForFullscreen())
                 return std::nullopt;
 
             auto* buffer = renderImage->cachedImage()->resourceBuffer();