From 5ace65121e0bbdd5c7918b84682d99f8721b6683 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 6 Aug 2021 04:53:55 +0200 Subject: [PATCH] browser(webkit): fix outstanding linux headful regressions (#8026) --- browser_patches/webkit/BUILD_NUMBER | 4 ++-- browser_patches/webkit/patches/bootstrap.diff | 22 +++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index a329e1b5f3..9526172c3b 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1527 -Changed: yurys@chromium.org Thu 05 Aug 2021 04:52:07 PM PDT +1528 +Changed: dkolesa@igalia.com Fri Aug 6 04:40:50 AM CEST 2021 diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 0315563cc8..ef42636efb 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -5842,7 +5842,7 @@ index 3931498518012bbc719d2e14eecd6ae44cba87ba..606ba8c8ec8639a3fe21a018dead8534 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..111daec076f3808e307ccfb591b098c5433cde90 100644 +index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601e6e41763 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -126,6 +126,7 @@ @@ -5940,7 +5940,21 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..111daec076f3808e307ccfb591b098c5 return swallowEvent; } -@@ -4052,7 +4052,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -3809,12 +3809,8 @@ void EventHandler::defaultKeyboardEventHandler(KeyboardEvent& event) + if (event.charCode() == ' ') + defaultSpaceEventHandler(event); + } +- if (event.type() == eventNames().keyupEvent) { +- m_frame.editor().handleKeyboardEvent(event); +- if (event.defaultHandled()) +- return; ++ if (event.type() == eventNames().keyupEvent) + stopKeyboardScrolling(); +- } + } + + #if ENABLE(DRAG_SUPPORT) +@@ -4052,7 +4048,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -5956,7 +5970,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..111daec076f3808e307ccfb591b098c5 auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4457,7 +4464,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4457,7 +4460,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -5966,7 +5980,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..111daec076f3808e307ccfb591b098c5 PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4584,6 +4592,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4584,6 +4588,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); }