Title: [276635] trunk
- Revision
- 276635
- Author
- commit-qu...@webkit.org
- Date
- 2021-04-27 04:50:47 -0700 (Tue, 27 Apr 2021)
Log Message
[Flatpak SDK] Direct AVIF loading does not work.
https://bugs.webkit.org/show_bug.cgi?id=222867
Patch by Philippe Normand <pnorm...@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.
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (276634 => 276635)
--- trunk/Source/WebKit/ChangeLog 2021-04-27 10:15:02 UTC (rev 276634)
+++ trunk/Source/WebKit/ChangeLog 2021-04-27 11:50:47 UTC (rev 276635)
@@ -1,3 +1,14 @@
+2021-04-27 Philippe Normand <pnorm...@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 <you...@apple.com>
Add memory allocation checks in more realtime audio capture/rendering places
Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp (276634 => 276635)
--- trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2021-04-27 10:15:02 UTC (rev 276634)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2021-04-27 11:50:47 UTC (rev 276635)
@@ -1403,11 +1403,12 @@
m_response.setMimeType("text/html");
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));
}
}
Modified: trunk/Tools/buildstream/ChangeLog (276634 => 276635)
--- trunk/Tools/buildstream/ChangeLog 2021-04-27 10:15:02 UTC (rev 276634)
+++ trunk/Tools/buildstream/ChangeLog 2021-04-27 11:50:47 UTC (rev 276635)
@@ -1,3 +1,14 @@
+2021-04-27 Philippe Normand <pnorm...@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 <cgar...@igalia.com>
[GTK][WPE] Bump libsoup3 version to 2.99.4
Deleted: trunk/Tools/buildstream/elements/sdk/intltool.bst (276634 => 276635)
--- trunk/Tools/buildstream/elements/sdk/intltool.bst 2021-04-27 10:15:02 UTC (rev 276634)
+++ trunk/Tools/buildstream/elements/sdk/intltool.bst 2021-04-27 11:50:47 UTC (rev 276635)
@@ -1,13 +0,0 @@
-kind: autotools
-
-build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
-- freedesktop-sdk.bst:components/perl-xml-parser.bst
-
-depends:
-- freedesktop-sdk.bst:bootstrap-import.bst
-
-sources:
-- kind: tar
- url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
- ref: 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd
Modified: trunk/Tools/buildstream/elements/sdk/shared-mime-info.bst (276634 => 276635)
--- trunk/Tools/buildstream/elements/sdk/shared-mime-info.bst 2021-04-27 10:15:02 UTC (rev 276634)
+++ trunk/Tools/buildstream/elements/sdk/shared-mime-info.bst 2021-04-27 11:50:47 UTC (rev 276635)
@@ -1,22 +1,25 @@
-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:
- sdk/glib.bst
- 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"
Modified: trunk/Tools/buildstream/elements/sdk-platform.bst (276634 => 276635)
--- trunk/Tools/buildstream/elements/sdk-platform.bst 2021-04-27 10:15:02 UTC (rev 276634)
+++ trunk/Tools/buildstream/elements/sdk-platform.bst 2021-04-27 11:50:47 UTC (rev 276635)
@@ -31,7 +31,6 @@
- sdk/gtk+-3.bst
- sdk/gtk.bst
- sdk/icecc.bst
-- sdk/intltool.bst
- sdk/krb5.bst
- sdk/libavif.bst
- sdk/libcap-ng.bst
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
