Skip to content

Commit 3f5bc02

Browse files
Lubrsikalenikaliaksandr
authored andcommitted
LibWeb+WebContent+UI: Remove unused same-origin policy toggle
Page::is_same_origin_policy_enabled is unused, and the original FIXME has been implemented.
1 parent 4e4026c commit 3f5bc02

File tree

9 files changed

+0
-41
lines changed

9 files changed

+0
-41
lines changed

Libraries/LibWeb/Page/Page.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ class Page final : public JS::Cell {
107107
CSS::PreferredContrast preferred_contrast() const;
108108
CSS::PreferredMotion preferred_motion() const;
109109

110-
bool is_same_origin_policy_enabled() const { return m_same_origin_policy_enabled; }
111-
void set_same_origin_policy_enabled(bool b) { m_same_origin_policy_enabled = b; }
112-
113110
bool is_scripting_enabled() const { return m_is_scripting_enabled; }
114111
void set_is_scripting_enabled(bool b) { m_is_scripting_enabled = b; }
115112

@@ -249,9 +246,6 @@ class Page final : public JS::Cell {
249246

250247
GC::Ptr<HTML::TraversableNavigable> m_top_level_traversable;
251248

252-
// FIXME: Enable this by default once CORS preflight checks are supported.
253-
bool m_same_origin_policy_enabled { false };
254-
255249
bool m_is_scripting_enabled { true };
256250

257251
bool m_should_block_pop_ups { true };

Services/WebContent/ConnectionFromClient.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -378,11 +378,6 @@ void ConnectionFromClient::debug_request(u64 page_id, ByteString request, ByteSt
378378
return;
379379
}
380380

381-
if (request == "same-origin-policy") {
382-
page->page().set_same_origin_policy_enabled(argument == "on");
383-
return;
384-
}
385-
386381
if (request == "scripting") {
387382
page->page().set_is_scripting_enabled(argument == "on");
388383
return;

UI/AppKit/Application/ApplicationDelegate.mm

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -730,9 +730,6 @@ - (NSMenuItem*)createDebugMenu
730730
[submenu addItem:[[NSMenuItem alloc] initWithTitle:@"Block Pop-ups"
731731
action:@selector(togglePopupBlocking:)
732732
keyEquivalent:@""]];
733-
[submenu addItem:[[NSMenuItem alloc] initWithTitle:@"Enable Same-Origin Policy"
734-
action:@selector(toggleSameOriginPolicy:)
735-
keyEquivalent:@""]];
736733

737734
[menu setSubmenu:submenu];
738735
return menu;

UI/AppKit/Interface/TabController.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ struct TabSettings {
1717
BOOL should_show_line_box_borders { NO };
1818
BOOL scripting_enabled { YES };
1919
BOOL block_popups { YES };
20-
BOOL same_origin_policy_enabled { NO };
2120
ByteString user_agent_name { "Disabled"sv };
2221
ByteString navigator_compatibility_mode { "chrome"sv };
2322
};

UI/AppKit/Interface/TabController.mm

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -431,12 +431,6 @@ - (void)setPopupBlocking:(BOOL)block_popups
431431
[self debugRequest:"block-pop-ups" argument:block_popups ? "on" : "off"];
432432
}
433433

434-
- (void)toggleSameOriginPolicy:(id)sender
435-
{
436-
m_settings.same_origin_policy_enabled = !m_settings.same_origin_policy_enabled;
437-
[self debugRequest:"same-origin-policy" argument:m_settings.same_origin_policy_enabled ? "on" : "off"];
438-
}
439-
440434
- (void)setUserAgentSpoof:(NSMenuItem*)sender
441435
{
442436
ByteString const user_agent_name = [[sender title] UTF8String];
@@ -673,8 +667,6 @@ - (BOOL)validateMenuItem:(NSMenuItem*)item
673667
[item setState:m_settings.scripting_enabled ? NSControlStateValueOn : NSControlStateValueOff];
674668
} else if ([item action] == @selector(togglePopupBlocking:)) {
675669
[item setState:m_settings.block_popups ? NSControlStateValueOn : NSControlStateValueOff];
676-
} else if ([item action] == @selector(toggleSameOriginPolicy:)) {
677-
[item setState:m_settings.same_origin_policy_enabled ? NSControlStateValueOn : NSControlStateValueOff];
678670
} else if ([item action] == @selector(setUserAgentSpoof:)) {
679671
[item setState:(m_settings.user_agent_name == [[item title] UTF8String]) ? NSControlStateValueOn : NSControlStateValueOff];
680672
} else if ([item action] == @selector(setNavigatorCompatibilityMode:)) {

UI/Qt/BrowserWindow.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -597,16 +597,6 @@ BrowserWindow::BrowserWindow(Vector<URL::URL> const& initial_urls, IsPopupWindow
597597
});
598598
});
599599

600-
m_enable_same_origin_policy_action = new QAction("Enable Same-Origin Policy", this);
601-
m_enable_same_origin_policy_action->setCheckable(true);
602-
debug_menu->addAction(m_enable_same_origin_policy_action);
603-
QObject::connect(m_enable_same_origin_policy_action, &QAction::triggered, this, [this] {
604-
bool state = m_enable_same_origin_policy_action->isChecked();
605-
for_each_tab([state](auto& tab) {
606-
tab.set_same_origin_policy(state);
607-
});
608-
});
609-
610600
auto* help_menu = m_hamburger_menu->addMenu("&Help");
611601
menuBar()->addMenu(help_menu);
612602

@@ -852,7 +842,6 @@ void BrowserWindow::initialize_tab(Tab* tab)
852842
tab->set_scripting(m_enable_scripting_action->isChecked());
853843
tab->set_content_filtering(m_enable_content_filtering_action->isChecked());
854844
tab->set_block_popups(m_block_pop_ups_action->isChecked());
855-
tab->set_same_origin_policy(m_enable_same_origin_policy_action->isChecked());
856845
tab->set_user_agent_string(user_agent_string());
857846
tab->set_navigator_compatibility_mode(navigator_compatibility_mode());
858847
tab->view().set_preferred_color_scheme(m_preferred_color_scheme);

UI/Qt/BrowserWindow.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ public slots:
208208
QAction* m_enable_scripting_action { nullptr };
209209
QAction* m_enable_content_filtering_action { nullptr };
210210
QAction* m_block_pop_ups_action { nullptr };
211-
QAction* m_enable_same_origin_policy_action { nullptr };
212211

213212
ByteString m_user_agent_string {};
214213
ByteString m_navigator_compatibility_mode {};

UI/Qt/Tab.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -938,11 +938,6 @@ void Tab::set_line_box_borders(bool enabled)
938938
debug_request("set-line-box-borders", enabled ? "on" : "off");
939939
}
940940

941-
void Tab::set_same_origin_policy(bool enabled)
942-
{
943-
debug_request("same-origin-policy", enabled ? "on" : "off");
944-
}
945-
946941
void Tab::set_scripting(bool enabled)
947942
{
948943
debug_request("scripting", enabled ? "on" : "off");

UI/Qt/Tab.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ class Tab final : public QWidget {
8282

8383
void set_block_popups(bool);
8484
void set_line_box_borders(bool);
85-
void set_same_origin_policy(bool);
8685
void set_scripting(bool);
8786
void set_content_filtering(bool);
8887
void set_user_agent_string(ByteString const&);

0 commit comments

Comments
 (0)