Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

browser(webkit): preserve color scheme override after navigation #6333

Merged
merged 1 commit into from
Apr 26, 2021
Merged

browser(webkit): preserve color scheme override after navigation #6333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions browser_patches/webkit/BUILD_NUMBER
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1466
Changed: joel.einbinder@gmail.com Thu Apr 22 16:55:43 PDT 2021
1467
Changed: yurys@chromium.org Mon 26 Apr 2021 04:14:04 PM PDT
14 changes: 13 additions & 1 deletion browser_patches/webkit/patches/bootstrap.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5440,7 +5440,7 @@ index 38fd7b29b53eab484e30963b51c8ae525c5d7a38..3c2f2104e3f364d3d6201e3009a448b4
if (stateObjectType == StateObjectType::Push) {
frame->loader().history().pushState(WTFMove(data), title, fullURL.string());
diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
index 79baa83b4977d2a7d8f894a27c2fb6ad23b2084a..27ae4e64de76432d4e05406b363ae09e7e5425f1 100644
index 79baa83b4977d2a7d8f894a27c2fb6ad23b2084a..c31f53be4a09a39d00619064fa0bec411f587e62 100644
--- a/Source/WebCore/page/Page.cpp
+++ b/Source/WebCore/page/Page.cpp
@@ -440,6 +440,37 @@ void Page::setOverrideViewportArguments(const Optional<ViewportArguments>& viewp
Expand Down Expand Up @@ -5481,6 +5481,18 @@ index 79baa83b4977d2a7d8f894a27c2fb6ad23b2084a..27ae4e64de76432d4e05406b363ae09e
ScrollingCoordinator* Page::scrollingCoordinator()
{
if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) {
@@ -1252,11 +1283,6 @@ void Page::didCommitLoad()
#if ENABLE(EDITABLE_REGION)
m_isEditableRegionEnabled = false;
#endif
-
-#if HAVE(OS_DARK_MODE_SUPPORT)
- setUseDarkAppearanceOverride(WTF::nullopt);
-#endif
-
resetSeenPlugins();
resetSeenMediaEngines();
}
diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
index 6b76cc1158c3f6a440870409f13f0f7221983234..875f3af89f3b684032751ed4848e09f765c84f4d 100644
--- a/Source/WebCore/page/Page.h
Expand Down