Changeset 276635 in webkit

Timestamp:

Apr 27, 2021, 4:50:47 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[Flatpak SDK] Direct AVIF loading does not work.
​https://bugs.webkit.org/show_bug.cgi?id=222867

Patch by Philippe Normand <​pnormand@igalia.com> on 2021-04-27
Reviewed by Michael Catanzaro.

Source/WebKit:

• NetworkProcess/soup/NetworkDataTaskSoup.cpp:

(WebKit::NetworkDataTaskSoup::didGetFileInfo): Use mime-type reported for local files by gio
only as a last resort. Our MIMETypeRegistry is more reliable in these cases.

Tools/buildstream:

• elements/sdk-platform.bst:
• elements/sdk/intltool.bst: Removed.
• elements/sdk/shared-mime-info.bst: Bump to version 2.1 which has support for detecting AVIF bitstreams.

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp (modified) (1 diff)
• Tools/buildstream/ChangeLog (modified) (1 diff)
• Tools/buildstream/elements/sdk-platform.bst (modified) (1 diff)
• Tools/buildstream/elements/sdk/intltool.bst (deleted)
• Tools/buildstream/elements/sdk/shared-mime-info.bst (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-27  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Direct AVIF loading does not work.
+        https://bugs.webkit.org/show_bug.cgi?id=222867
+
+        Reviewed by Michael Catanzaro.
+
+        * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+        (WebKit::NetworkDataTaskSoup::didGetFileInfo): Use mime-type reported for local files by gio
+        only as a last resort. Our MIMETypeRegistry is more reliable in these cases.
+
 2021-04-27  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp

@@ -1404 +1404 @@
         m_response.setExpectedContentLength(-1);
     } else {
-        const gchar* contentType = g_file_info_get_content_type(info);
-        m_response.setMimeType(extractMIMETypeFromMediaType(contentType));
-        m_response.setTextEncodingName(extractCharsetFromMediaType(contentType));
-        if (m_response.mimeType().isEmpty())
-            m_response.setMimeType(MIMETypeRegistry::mimeTypeForPath(m_response.url().path().toString()));
+        // Guess mime-type from URL path and fall-back to mime-type detected by Gio/shared-mime-info otherwise.
+        auto mimeType = MIMETypeRegistry::mimeTypeForPath(m_response.url().path().toString());
+        if (mimeType == defaultMIMEType())
+            mimeType = extractMIMETypeFromMediaType(g_file_info_get_content_type(info));
+
+        m_response.setMimeType(mimeType);
         m_response.setExpectedContentLength(g_file_info_get_size(info));
     }

trunk/Tools/buildstream/ChangeLog

@@ +1 @@
+2021-04-27  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Direct AVIF loading does not work.
+        https://bugs.webkit.org/show_bug.cgi?id=222867
+
+        Reviewed by Michael Catanzaro.
+
+        * elements/sdk-platform.bst:
+        * elements/sdk/intltool.bst: Removed.
+        * elements/sdk/shared-mime-info.bst: Bump to version 2.1 which has support for detecting AVIF bitstreams.
+
 2021-04-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/buildstream/elements/sdk-platform.bst

@@ -32 +32 @@
 - sdk/gtk.bst
 - sdk/icecc.bst
-- sdk/intltool.bst
 - sdk/krb5.bst
 - sdk/libavif.bst

trunk/Tools/buildstream/elements/sdk/shared-mime-info.bst

@@ -1 @@
-kind: autotools
+kind: meson
 
 build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+- freedesktop-sdk.bst:components/docbook-xsl.bst
 - freedesktop-sdk.bst:components/itstool.bst
-- sdk/intltool.bst
-- freedesktop-sdk.bst:components/perl-xml-parser.bst
+- freedesktop-sdk.bst:components/xmlto.bst
 
 depends:
@@ -11 +11 @@
 - freedesktop-sdk.bst:bootstrap-import.bst
 - freedesktop-sdk.bst:components/libxml2.bst
+
 sources:
-- kind: tar
-  url: https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/6a226038bf42dae45a049a6b8e729abc/shared-mime-info-1.10.tar.xz
-  ref: c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf
-variables:
-  notparallel: True
+- kind: git_tag
+  url: gitlab_freedesktop_org:xdg/shared-mime-info
+  track: '2.1'
+  ref: 2.1-0-g18e558fa1c8b90b86757ade09a4ba4d6a6cf8f70
 public:
   bst:
     overlap-whitelist:
     - '**'
+    integration-commands:
+    - |
+      PKGSYSTEM_ENABLE_FSYNC=0 update-mime-database "%{datadir}/mime"