From f27b9b95636db9c0070bd2f375ea5be2e613a06f Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@serenityos.org>
Date: Thu, 6 Jul 2023 19:25:35 +0200
Subject: [PATCH] LibWeb: Set Content-Type for data: URLs instead of checking
 MIME on load

This makes the loader more agnostic.

Additionally, this allows us to load tab in Ladybird with a 'data:' URL
containing parameters, as a Resource will now call
`mime_type_from_content_type` to extract the content type from MIME. :^)
---
 Userland/Libraries/LibWeb/Loader/Resource.cpp       | 3 ---
 Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp | 7 +++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Userland/Libraries/LibWeb/Loader/Resource.cpp b/Userland/Libraries/LibWeb/Loader/Resource.cpp
index 21b002f039b..cd741769f33 100644
--- a/Userland/Libraries/LibWeb/Loader/Resource.cpp
+++ b/Userland/Libraries/LibWeb/Loader/Resource.cpp
@@ -102,9 +102,6 @@ void Resource::did_load(Badge<ResourceLoader>, ReadonlyBytes data, HashMap<Depre
         //        Let's use image/x-qoi for now, which is also what our Core::MimeData uses & would guess.
         if (m_mime_type == "application/octet-stream" && url().serialize_path().ends_with(".qoi"sv))
             m_mime_type = "image/x-qoi";
-    } else if (url().scheme() == "data" && !url().data_mime_type().is_empty()) {
-        dbgln_if(RESOURCE_DEBUG, "This is a data URL with mime-type _{}_", url().data_mime_type());
-        m_mime_type = url().data_mime_type();
     } else {
         auto content_type_options = headers.get("X-Content-Type-Options");
         if (content_type_options.value_or("").equals_ignoring_ascii_case("nosniff"sv)) {
diff --git a/Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp b/Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp
index 135a6598a8b..cd831550847 100644
--- a/Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp
+++ b/Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp
@@ -223,9 +223,12 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, Has
             data = url.data_payload().to_byte_buffer();
         }
 
+        HashMap<DeprecatedString, DeprecatedString, CaseInsensitiveStringTraits> response_headers;
+        response_headers.set("Content-Type", url.data_mime_type());
+
         log_success(request);
-        Platform::EventLoopPlugin::the().deferred_invoke([data = move(data), success_callback = move(success_callback)] {
-            success_callback(data, {}, {});
+        Platform::EventLoopPlugin::the().deferred_invoke([data = move(data), response_headers = move(response_headers), success_callback = move(success_callback)] {
+            success_callback(data, response_headers, {});
         });
         return;
     }