From 2408a5dfb9c90575bd1bebba5b31fd7d6757c7bb Mon Sep 17 00:00:00 2001 From: Diego Pino Date: Sat, 18 Sep 2021 02:10:14 +0800 Subject: [PATCH] browser(webkit): Follow-up #8980 (#8993) Bring back snippet of code that was removed in #8802 --- browser_patches/webkit/BUILD_NUMBER | 4 ++-- browser_patches/webkit/patches/bootstrap.diff | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index a97a6fbd0f..c171487123 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1547 -Changed: max@schmitt.mx Fri 17 Sep 2021 13:50:57 CEST +1548 +Changed: dpino@igalia.com Fri Sep 17 17:38:21 UTC 2021 diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 334499fb44..ac9c32a79f 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -6747,7 +6747,7 @@ index 28d1fc3242174a680711027877d4153923790220..058b5309eed081fcc1e4158f66e80642 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 e7f6f99a2a230b6cca7f03d846bbba92c6e80be1..3eb94eb1b1df5f7eb92a8cfd39749b0030829b40 100644 +index e7f6f99a2a230b6cca7f03d846bbba92c6e80be1..52a86145b85bc44588e6f8d5db8cebedbf87d387 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -462,6 +462,37 @@ void Page::setOverrideViewportArguments(const std::optional& @@ -6788,7 +6788,18 @@ index e7f6f99a2a230b6cca7f03d846bbba92c6e80be1..3eb94eb1b1df5f7eb92a8cfd39749b00 ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -3271,6 +3302,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -1290,10 +1321,6 @@ void Page::didCommitLoad() + m_isEditableRegionEnabled = false; + #endif + +-#if HAVE(OS_DARK_MODE_SUPPORT) +- setUseDarkAppearanceOverride(std::nullopt); +-#endif +- + resetSeenPlugins(); + resetSeenMediaEngines(); + +@@ -3271,6 +3298,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif }