RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:27:44 +00:00
Code Issues Activity Actions

LibWeb: Add Page::has_ongoing_navigation()

Browse source 
Introduce has_ongoing_navigation() that allows to check if resource
state in FrameLoading is pending. This API is going to be used in
upcoming fix for wait_for_navigation_to_complete() in WebDriver.
This commit is contained in:
Aliaksandr Kalenik 2023-05-30 20:24:52 +03:00 • committed by Andreas Kling
parent d1d9d7a4f3
commit 31b9729333
5 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibWeb/Loader/Resource.cpp
View file

@ -33,8 +33,7 @@ Resource::Resource(Type type, Resource& resource)
: m_request(resource.m_request)
, m_encoded_data(move(resource.m_encoded_data))
, m_type(type)
, m_loaded(resource.m_loaded)
, m_failed(resource.m_failed)
, m_state(resource.m_state)
, m_error(move(resource.m_error))
, m_encoding(move(resource.m_encoding))
, m_mime_type(move(resource.m_mime_type))
@ -89,12 +88,12 @@ static bool is_valid_encoding(StringView encoding)
void Resource::did_load(Badge<ResourceLoader>, ReadonlyBytes data, HashMap<DeprecatedString, DeprecatedString, CaseInsensitiveStringTraits> const& headers, Optional<u32> status_code)
{
VERIFY(!m_loaded);
VERIFY(m_state == State::Pending);
// FIXME: Handle OOM failure.
m_encoded_data = ByteBuffer::copy(data).release_value_but_fixme_should_propagate_errors();
m_response_headers = headers.clone().release_value_but_fixme_should_propagate_errors();
m_status_code = move(status_code);
m_loaded = true;
m_state = State::Loaded;
auto content_type = headers.get("Content-Type");
@ -136,7 +135,7 @@ void Resource::did_fail(Badge<ResourceLoader>, DeprecatedString const& error, Op
{
m_error = error;
m_status_code = move(status_code);
m_failed = true;
m_state = State::Failed;
for_each_client([](auto& client) {
client.resource_did_fail();