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

Userland+Ladybird: Always specify url to be about:srcdoc in load_html()

Browse source 
After moving to navigables, we started reusing the code that populates
session history entries with the srcdoc attribute value from iframes
in `Page::load_html()` for loading HTML.

This change addresses a crash in `determine_the_origin` which occurred
because this method expected the URL to be `about:srcdoc` if we also
provided HTML content (previously, it was the URL passed along with the
HTML content into `load_html()`).
This commit is contained in:
Aliaksandr Kalenik 2023-09-17 17:12:17 +02:00 • committed by Andreas Kling
parent 8e832a174e
commit 3c675e3f25
18 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ladybird/AppKit/UI/LadybirdWebView.h
View file

@ -40,7 +40,7 @@
- (instancetype)init:(id<LadybirdWebViewObserver>)observer;
- (void)loadURL:(URL const&)url;
- (void)loadHTML:(StringView)html url:(URL const&)url;
- (void)loadHTML:(StringView)html;
- (WebView::ViewImplementation&)view;
- (String const&)handle;

4
Ladybird/AppKit/UI/LadybirdWebView.mm
View file

@ -109,9 +109,9 @@ struct HideCursor {
m_web_view_bridge->load(url);
}
- (void)loadHTML:(StringView)html url:(URL const&)url
- (void)loadHTML:(StringView)html
{
m_web_view_bridge->load_html(html, url);
m_web_view_bridge->load_html(html);
}
- (WebView::ViewImplementation&)view

2
Ladybird/AppKit/UI/TabController.mm
View file

@ -91,7 +91,7 @@ enum class IsHistoryNavigation {
- (void)loadHTML:(StringView)html url:(URL const&)url
{
[[self tab].web_view loadHTML:html url:url];
[[self tab].web_view loadHTML:html];
}
- (void)onLoadStart:(URL const&)url isRedirect:(BOOL)isRedirect