microsoft
/
playwright
зеркало из https://github.com/microsoft/playwright.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

browser(webkit): roll to 08/06/21 (#8056)

This commit is contained in:
Yury Semikhatsky 2021-08-06 12:35:10 -07:00 коммит произвёл GitHub
Родитель c8b54a5b05
Коммит 80cccfd837
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 40 добавлений и 54 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
browser_patches/webkit/BUILD_NUMBER
Просмотреть файл

@ -1,2 +1,2 @@
1528
Changed: dkolesa@igalia.com Fri Aug 6 04:40:50 AM CEST 2021
1529
Changed: yurys@chromium.org Fri 06 Aug 2021 12:34:04 PM PDT

2
browser_patches/webkit/UPSTREAM_CONFIG.sh
Просмотреть файл

@ -1,3 +1,3 @@
REMOTE_URL="https://github.com/WebKit/WebKit.git"
BASE_BRANCH="main"
BASE_REVISION="29e16514d1f040bfd22e50723e0a10b643c625e4"
BASE_REVISION="34bf3adbed50d366b79d35e3e2e4a2644244226f"

88
browser_patches/webkit/patches/bootstrap.diff
Просмотреть файл

@ -2445,10 +2445,10 @@ index ef168b76819216d984b7a2d0f760005fb9d24de8..2d6cf51f3b45191ad84106429d4f108f
__ZN7WebCore14DocumentLoaderD2Ev
__ZN7WebCore14DocumentLoader17clearMainResourceEv
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8897a1b79 100644
index 7be48763a64793b08e4f76fe9d0646c350898050..3fb488810b30445b105d8c5bcb282706d0a5a050 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -5342,6 +5342,14 @@
@@ -5343,6 +5343,14 @@
EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; };
EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; };
@ -2463,7 +2463,7 @@ index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8
F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F12171F416A8BC63000053CA /* WebVTTElement.h */; };
F32BDCD92363AACA0073B6AE /* UserGestureEmulationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = F32BDCD72363AACA0073B6AE /* UserGestureEmulationScope.h */; };
F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */ = {isa = PBXBuildFile; fileRef = F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -16470,6 +16478,14 @@
@@ -16471,6 +16479,14 @@
EDEC98020AED7E170059137F /* WebCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCorePrefix.h; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
EFB7287B2124C73D005C2558 /* CanvasActivityRecord.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasActivityRecord.cpp; sourceTree = "<group>"; };
EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasActivityRecord.h; sourceTree = "<group>"; };
@ -2478,7 +2478,7 @@ index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8
F12171F316A8BC63000053CA /* WebVTTElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTElement.cpp; sourceTree = "<group>"; };
F12171F416A8BC63000053CA /* WebVTTElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTElement.h; sourceTree = "<group>"; };
F32BDCD52363AAC90073B6AE /* UserGestureEmulationScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserGestureEmulationScope.cpp; sourceTree = "<group>"; };
@@ -21915,7 +21931,12 @@
@@ -21916,7 +21932,12 @@
93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */,
1AF326770D78B9440068F0C4 /* EditorClient.h */,
93C09A800B064F00005ABD4D /* EventHandler.cpp */,
@ -2491,7 +2491,7 @@ index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8
E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */,
E0FEF371B17C53EAC1C1FBEE /* EventSource.h */,
E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */,
@@ -27634,6 +27655,8 @@
@@ -27635,6 +27656,8 @@
29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */,
1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */,
1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */,
@ -2500,7 +2500,7 @@ index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8
0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */,
935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */,
BCBB8AB513F1AFB000734DF0 /* PODInterval.h */,
@@ -29823,6 +29846,7 @@
@@ -29824,6 +29847,7 @@
BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */,
AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */,
AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */,
@ -2508,7 +2508,7 @@ index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8
6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */,
6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */,
7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */,
@@ -30834,6 +30858,7 @@
@@ -30835,6 +30859,7 @@
93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */,
29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */,
0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */,
@ -2516,7 +2516,7 @@ index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8
29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */,
69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */,
AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */,
@@ -32865,6 +32890,7 @@
@@ -32866,6 +32891,7 @@
6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */,
E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */,
81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */,
@ -2524,7 +2524,7 @@ index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8
7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */,
C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */,
C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */,
@@ -34931,9 +34957,11 @@
@@ -34932,9 +34958,11 @@
B2C3DA3A0D006C1D00EF6F26 /* TextCodec.h in Headers */,
26E98A10130A9FCA008EB7B2 /* TextCodecASCIIFastPath.h in Headers */,
DF95B14A24FDAFD300B1F4D7 /* TextCodecCJK.h in Headers */,
@ -2536,7 +2536,7 @@ index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8
B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */,
B2C3DA420D006C1D00EF6F26 /* TextCodecUTF16.h in Headers */,
9343CB8212F25E510033C5EE /* TextCodecUTF8.h in Headers */,
@@ -35891,6 +35919,7 @@
@@ -35892,6 +35920,7 @@
1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */,
2D22830323A8470700364B7E /* CursorMac.mm in Sources */,
5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */,
@ -2544,7 +2544,7 @@ index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8
6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */,
7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */,
5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */,
@@ -35977,6 +36006,7 @@
@@ -35978,6 +36007,7 @@
6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */,
CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */,
51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */,
@ -2552,7 +2552,7 @@ index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8
538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */,
538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */,
538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */,
@@ -36025,6 +36055,7 @@
@@ -36026,6 +36056,7 @@
538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */,
DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */,
538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */,
@ -2560,7 +2560,7 @@ index 823eb2b789bf3e94f3f67c09dfd9cad1990f499b..9921e6c85fe9f3988524d036c45a9ea8
DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */,
538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */,
DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */,
@@ -36557,6 +36588,7 @@
@@ -36558,6 +36589,7 @@
2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */,
2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */,
2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */,
@ -5842,10 +5842,10 @@ index 3931498518012bbc719d2e14eecd6ae44cba87ba..606ba8c8ec8639a3fe21a018dead8534
#if ENABLE(INPUT_TYPE_COLOR)
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601e6e41763 100644
index 0fde13312f02f6d0f3896c47ecdc8ceb62694ade..86a91305496410c2009a93b7086f46fd40b2af8a 100644
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
@@ -126,6 +126,7 @@
@@ -127,6 +127,7 @@
#if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS)
#include "PlatformTouchEvent.h"
@ -5853,7 +5853,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601
#endif
#if ENABLE(MAC_GESTURE_EVENTS)
@@ -785,9 +786,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve
@@ -786,9 +787,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve
m_mousePressNode = event.targetNode();
m_frame.document()->setFocusNavigationStartingNode(event.targetNode());
@ -5863,7 +5863,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601
m_mousePressed = true;
m_selectionInitiationState = HaveNotStartedSelection;
@@ -827,8 +826,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis
@@ -828,8 +827,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis
return adjustedTarget->renderer()->positionForPoint(LayoutPoint(selectionEndPoint), nullptr);
}
@ -5872,7 +5872,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601
#if !PLATFORM(IOS_FAMILY)
bool EventHandler::supportsSelectionUpdatesOnMouseDrag() const
@@ -850,8 +847,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e
@@ -851,8 +848,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e
Ref<Frame> protectedFrame(m_frame);
@ -5883,7 +5883,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601
RefPtr targetNode = event.targetNode();
if (event.event().button() != LeftButton || !targetNode)
@@ -872,7 +871,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e
@@ -873,7 +872,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e
ASSERT(mouseDownMayStartSelect() || m_mouseDownMayStartAutoscroll);
#endif
@ -5893,7 +5893,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601
if (m_mouseDownMayStartAutoscroll && !panScrollInProgress()) {
m_autoscrollController->startAutoscrollForSelection(renderer);
@@ -889,6 +890,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e
@@ -890,6 +891,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e
return true;
}
@ -5902,7 +5902,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601
bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const
{
// This is a pre-flight check of whether the event might lead to a drag being started. Be careful
@@ -920,6 +923,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const
@@ -921,6 +924,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const
return targetElement && page->dragController().draggableElement(&m_frame, targetElement.get(), result.roundedPointInInnerNodeFrame(), state);
}
@ -5911,7 +5911,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601
void EventHandler::updateSelectionForMouseDrag()
{
if (!supportsSelectionUpdatesOnMouseDrag())
@@ -1014,7 +1019,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul
@@ -1015,7 +1020,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul
if (oldSelection != newSelection && HTMLElement::isImageOverlayText(newSelection.start().containerNode()) && HTMLElement::isImageOverlayText(newSelection.end().containerNode()))
invalidateClick();
}
@ -5919,7 +5919,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601
void EventHandler::lostMouseCapture()
{
@@ -1062,9 +1066,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e
@@ -1063,9 +1067,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e
// on the selection, the selection goes away. However, if we are
// editing, place the caret.
if (m_mouseDownWasSingleClickInSelection && m_selectionInitiationState != ExtendedSelection
@ -5929,7 +5929,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601
&& m_frame.selection().isRange()
&& event.event().button() != RightButton) {
VisibleSelection newSelection;
@@ -2036,10 +2038,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE
@@ -2037,10 +2039,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE
swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), 0, platformMouseEvent, FireMouseOverOut::Yes);
@ -5940,21 +5940,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601
return swallowEvent;
}
@@ -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
@@ -4056,7 +4056,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr
if (!m_frame.document())
return false;
@ -5970,7 +5956,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601
auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No;
if (dragState().shouldDispatchEvents) {
@@ -4457,7 +4460,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
@@ -4461,7 +4468,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
allTouchReleased = false;
}
@ -5980,7 +5966,7 @@ index 95d4f839b49a8390f86dc6de3ce4d585fad8df7a..f7922dd2b58c76d2b78194a0d3a8c601
PlatformTouchPoint::State pointState = point.state();
LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos());
@@ -4584,6 +4588,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
@@ -4588,6 +4596,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
changedTouches[pointState].m_touches->append(WTFMove(touch));
changedTouches[pointState].m_targets.add(touchTarget);
}
@ -6469,7 +6455,7 @@ index d5eb425530475957eab064bc94461908a4b94649..70bf07e9d5ca25be120cfeae2b5310ce
#undef FRAME_RELEASE_LOG_ERROR
diff --git a/Source/WebCore/page/Frame.h b/Source/WebCore/page/Frame.h
index f0f9a8a424c460cd930ad5b56deff5db098495f0..659572b08985aea7b0f01957af7417cde4cae3b7 100644
index 37c1cb6b5d779d5a3c2abdd7a625e99011d9971c..359505c44a9550d3e2a72c7349e9abd9be7c4afd 100644
--- a/Source/WebCore/page/Frame.h
+++ b/Source/WebCore/page/Frame.h
@@ -110,8 +110,8 @@ enum {
@ -6504,7 +6490,7 @@ index f0f9a8a424c460cd930ad5b56deff5db098495f0..659572b08985aea7b0f01957af7417cd
WEBCORE_EXPORT NSArray *wordsInCurrentParagraph() const;
WEBCORE_EXPORT CGRect renderRectForPoint(CGPoint, bool* isReplaced, float* fontSize) const;
@@ -312,6 +312,7 @@ public:
@@ -311,6 +311,7 @@ public:
WEBCORE_EXPORT FloatSize screenSize() const;
void setOverrideScreenSize(FloatSize&&);
@ -6512,7 +6498,7 @@ index f0f9a8a424c460cd930ad5b56deff5db098495f0..659572b08985aea7b0f01957af7417cd
void selfOnlyRef();
void selfOnlyDeref();
@@ -350,7 +351,6 @@ private:
@@ -349,7 +350,6 @@ private:
#if ENABLE(DATA_DETECTION)
std::unique_ptr<DataDetectionResultsStorage> m_dataDetectionResults;
#endif
@ -6520,7 +6506,7 @@ index f0f9a8a424c460cd930ad5b56deff5db098495f0..659572b08985aea7b0f01957af7417cd
void betterApproximateNode(const IntPoint& testPoint, const NodeQualifier&, Node*& best, Node* failedNode, IntPoint& bestPoint, IntRect& bestRect, const IntRect& testRect);
bool hitTestResultAtViewportLocation(const FloatPoint& viewportLocation, HitTestResult&, IntPoint& center);
@@ -358,6 +358,7 @@ private:
@@ -357,6 +357,7 @@ private:
enum class ShouldFindRootEditableElement : bool { No, Yes };
Node* qualifyingNodeAtViewportLocation(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, const NodeQualifier&, ShouldApproximate, ShouldFindRootEditableElement = ShouldFindRootEditableElement::Yes);
@ -12611,10 +12597,10 @@ index 2e6b4c1376192aa6109c4a918f343f4433a2b1c3..2706af99e9a1d4ca8603bbfaf9305469
m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
index e8260a59d94cdc938f011c89e81f85402322d999..84db332aa5cdf297f70558a95447134385ac72ad 100644
index 01d56d0a4c140e776a54ee207aa73de3e6a79068..398bf661fee94b0f9d78f983065473a1f0b68304 100644
--- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
+++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
@@ -513,6 +513,9 @@ public:
@@ -514,6 +514,9 @@ public:
void provideDataForPasteboard(NSPasteboard *, NSString *type);
NSArray *namesOfPromisedFilesDroppedAtDestination(NSURL *dropDestination);
@ -12625,10 +12611,10 @@ index e8260a59d94cdc938f011c89e81f85402322d999..84db332aa5cdf297f70558a954471343
void saveBackForwardSnapshotForCurrentItem();
void saveBackForwardSnapshotForItem(WebBackForwardListItem&);
diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
index 770113c846e40fd42773ced730563c6fff982a3c..6fc5b9a23395f78c34510470c9fa33f0b0354a45 100644
index 08ffade99ac558390d141389b375848667297eb7..f17d081d1ae0d6f49a92e12f6f9b8351ee836505 100644
--- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
+++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
@@ -2613,6 +2613,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace()
@@ -2609,6 +2609,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace()
if (!m_colorSpace)
m_colorSpace = [NSColorSpace sRGBColorSpace];
}
@ -17264,7 +17250,7 @@ index 0000000000000000000000000000000000000000..fb4855b939efdd36acd011a41244a579
+
+} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
index 8d41e4523f47f92105259c63060515ef4fc98c33..d2ee126380d814598fc2f2c37408732de7b044a9 100644
index e7e040bbac79932dc504cfc8000f2cc58de0ed9e..1c6a1f7a14e7cd2ae8561f69e7116aa7dbdba25a 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
@@ -245,6 +245,9 @@
@ -17995,7 +17981,7 @@ index 2eab6bcb89b8b79a7dcf3cdcd49c06d5acd212b3..5db9888b36e24819dc85d15dc787f22b
parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument);
parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure());
diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp
index 1d6b9da0dfa3d848aaf5c2450ef3485b640f9621..b57addc8b37f396aa7059a3a87db13318a7be5f3 100644
index facc4205dfb826eb283a403a6123cffc368295ad..aa539e811e653e2fa5504b30c75f8e7d7cd5af60 100644
--- a/Source/WebKit/UIProcess/WebProcessProxy.cpp
+++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp
@@ -126,6 +126,11 @@ HashMap<ProcessIdentifier, WebProcessProxy*>& WebProcessProxy::allProcesses()