Changeset 287053 in webkit

Timestamp:

Dec 14, 2021, 3:04:49 PM (5 years ago)

Author:

Jean-Yves Avenard

Message:

Make PreviewConverterProvider not modify the SharedBuffer once returned
​https://bugs.webkit.org/show_bug.cgi?id=233923
rdar://problem/86149850

Reviewed by Youenn Fablet.

Covered by existing API tests.

• loader/ios/LegacyPreviewLoader.h:
• loader/ios/LegacyPreviewLoader.mm:

(WebCore::LegacyPreviewLoader::previewConverterDidStartConverting):
(WebCore::LegacyPreviewLoader::provideMainResourceForPreviewConverter):

• platform/PreviewConverter.cpp:

(WebCore::PreviewConverter::updateMainResource):

• platform/PreviewConverterProvider.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/ios/LegacyPreviewLoader.h (modified) (1 diff)
• loader/ios/LegacyPreviewLoader.mm (modified) (3 diffs)
• platform/PreviewConverter.cpp (modified) (1 diff)
• platform/PreviewConverterProvider.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-14  Jean-Yves Avenard  <jya@apple.com>
+
+        Make PreviewConverterProvider not modify the SharedBuffer once returned
+        https://bugs.webkit.org/show_bug.cgi?id=233923
+        rdar://problem/86149850
+
+        Reviewed by Youenn Fablet.
+
+        Covered by existing API tests.
+
+        * loader/ios/LegacyPreviewLoader.h:
+        * loader/ios/LegacyPreviewLoader.mm:
+        (WebCore::LegacyPreviewLoader::previewConverterDidStartConverting):
+        (WebCore::LegacyPreviewLoader::provideMainResourceForPreviewConverter):
+        * platform/PreviewConverter.cpp:
+        (WebCore::PreviewConverter::updateMainResource):
+        * platform/PreviewConverterProvider.h:
+
 2021-12-14  Basuke Suzuki  <basuke.suzuki@sony.com>
 

trunk/Source/WebCore/loader/ios/LegacyPreviewLoader.h

@@ -66 +66 @@
 
     // PreviewConverterProvider
-    void provideMainResourceForPreviewConverter(PreviewConverter&, CompletionHandler<void(const FragmentedSharedBuffer*)>&&) final;
+    void provideMainResourceForPreviewConverter(PreviewConverter&, CompletionHandler<void(Ref<FragmentedSharedBuffer>&&)>&&) final;
     void providePasswordForPreviewConverter(PreviewConverter&, CompletionHandler<void(const String&)>&&) final;
 

trunk/Source/WebCore/loader/ios/LegacyPreviewLoader.mm

@@ -110 +110 @@
 
     ASSERT(!m_hasProcessedResponse);
-    m_originalData.empty();
+    m_originalData.reset();
     resourceLoader->documentLoader()->setPreviewConverter(WTFMove(m_converter));
     auto response { converter.previewResponse() };
@@ -225 +225 @@
 }
 
-void LegacyPreviewLoader::provideMainResourceForPreviewConverter(PreviewConverter& converter, CompletionHandler<void(const FragmentedSharedBuffer*)>&& completionHandler)
+void LegacyPreviewLoader::provideMainResourceForPreviewConverter(PreviewConverter& converter, CompletionHandler<void(Ref<FragmentedSharedBuffer>&&)>&& completionHandler)
 {
     ASSERT_UNUSED(converter, &converter == m_converter);
-    completionHandler(m_originalData.get().get());
+    completionHandler(m_originalData.copy());
 }
 
@@ -236 +236 @@
     : m_converter { PreviewConverter::create(response, *this) }
     , m_client { makeClient(loader, m_converter->previewFileName(), m_converter->previewUTI()) }
-    , m_originalData { FragmentedSharedBuffer::create() }
     , m_resourceLoader { loader }
     , m_shouldDecidePolicyBeforeLoading { loader.frame()->settings().shouldDecidePolicyBeforeLoadingQuickLookPreview() }

trunk/Source/WebCore/platform/PreviewConverter.cpp

@@ -82 +82 @@
     }
 
-    provider->provideMainResourceForPreviewConverter(*this, [this, protectedThis = Ref { *this }](auto buffer) {
-        if (buffer)
-            appendFromBuffer(*buffer);
-        else
-            didFailUpdating();
+    provider->provideMainResourceForPreviewConverter(*this, [this, protectedThis = Ref { *this }](auto&& buffer) {
+        appendFromBuffer(WTFMove(buffer));
     });
 }

trunk/Source/WebCore/platform/PreviewConverterProvider.h

@@ -33 +33 @@
     virtual ~PreviewConverterProvider() = default;
 
-    virtual void provideMainResourceForPreviewConverter(PreviewConverter&, CompletionHandler<void(const FragmentedSharedBuffer*)>&&) = 0;
+    virtual void provideMainResourceForPreviewConverter(PreviewConverter&, CompletionHandler<void(Ref<FragmentedSharedBuffer>&&)>&&) = 0;
     virtual void providePasswordForPreviewConverter(PreviewConverter&, CompletionHandler<void(const String&)>&&) = 0;
 };