mirror of
https://github.com/SerenityOS/serenity
synced 2026-05-14 02:46:22 +02:00
8c3cb23384
Because of the previous awkward factoring of Origin we had two implementations of Origin serializing and creation. Move the implementation of DOMURL::url_origin into URL::origin, and instead use the implemenation of URL::Origin::serialize for serialization (replacing URL::serialize_origin). This happens to fix 8 URL subtests as the two implemenations had diverged, and URL::serialize_origin was previously missing the spec changes of: whatwg/url@eee49fd and whatwg/url@fff33c3 (cherry picked from commit 501f92b54eee7bcf7b60621aa4238fcbdc610d99; amended to add leading whitespace to expectation due to serenity not yet having LadybirdBrowser/ladybird#1603)
43 lines
1.5 KiB
C++
43 lines
1.5 KiB
C++
/*
|
||
* Copyright (c) 2024, Andrew Kaster <andrew@ladybird.org>
|
||
*
|
||
* SPDX-License-Identifier: BSD-2-Clause
|
||
*/
|
||
|
||
#include <LibWeb/DOMURL/DOMURL.h>
|
||
#include <LibWeb/HTML/Scripting/Environments.h>
|
||
#include <LibWeb/StorageAPI/StorageKey.h>
|
||
|
||
namespace Web::StorageAPI {
|
||
|
||
// https://storage.spec.whatwg.org/#obtain-a-storage-key
|
||
Optional<StorageKey> obtain_a_storage_key(HTML::Environment const& environment)
|
||
{
|
||
// 1. Let key be the result of running obtain a storage key for non-storage purposes with environment.
|
||
auto key = obtain_a_storage_key_for_non_storage_purposes(environment);
|
||
|
||
// 2. If key’s origin is an opaque origin, then return failure.
|
||
if (key.origin.is_opaque())
|
||
return {};
|
||
|
||
// FIXME: 3. If the user has disabled storage, then return failure.
|
||
|
||
// 4. Return key.
|
||
return key;
|
||
}
|
||
|
||
// https://storage.spec.whatwg.org/#obtain-a-storage-key-for-non-storage-purposes
|
||
StorageKey obtain_a_storage_key_for_non_storage_purposes(HTML::Environment const& environment)
|
||
{
|
||
// 1. Let origin be environment’s origin if environment is an environment settings object; otherwise environment’s creation URL’s origin.
|
||
if (is<HTML::EnvironmentSettingsObject>(environment)) {
|
||
auto const& settings = static_cast<HTML::EnvironmentSettingsObject const&>(environment);
|
||
// FIXME: EnvironmentSettingsObject::origin() should be const :|
|
||
auto& mutable_settings = const_cast<HTML::EnvironmentSettingsObject&>(settings);
|
||
return { mutable_settings.origin() };
|
||
}
|
||
return { environment.creation_url.origin() };
|
||
}
|
||
|
||
}
|