diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 8e546aba02..2913e18fb4 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1660 -Changed: lushnikov@chromium.org Thu Jun 9 16:49:27 +03 2022 +1661 +Changed: yurys@chromium.org Thu 09 Jun 2022 09:27:30 AM PDT diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index e6de6333bc..c6bba69e25 100644 --- a/browser_patches/webkit/UPSTREAM_CONFIG.sh +++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://github.com/WebKit/WebKit.git" BASE_BRANCH="main" -BASE_REVISION="5fe7282725c8a286aa677909ee85b2360b17f8ca" +BASE_REVISION="321d351b4f829293aa94cdfd5cb2030e182f81f8" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 2c38a47d37..2f5654dd6d 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -2102,10 +2102,10 @@ index 766be08177248750e8cbbddff798bfd4e3a81ba1..11ca05a55357ff757719a1e5f62729e7 UserGesturePromisePropagationEnabled: diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml -index 78b806ade5ac37c3b4b075aa39a3962888a217da..de4f57b6e10141d78ad77ae5cd75474013b29888 100644 +index a12654571fa6e364f9490a59b3543496cfaa7aaf..1246e7b0296bf477e4782b51364b29b44c3f040c 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml -@@ -919,6 +919,7 @@ UseCGDisplayListsForDOMRendering: +@@ -905,6 +905,7 @@ UseCGDisplayListsForDOMRendering: WebKit: default: true @@ -2113,7 +2113,7 @@ index 78b806ade5ac37c3b4b075aa39a3962888a217da..de4f57b6e10141d78ad77ae5cd754740 UseGPUProcessForCanvasRenderingEnabled: type: bool humanReadableName: "GPU Process: Canvas Rendering" -@@ -929,7 +930,7 @@ UseGPUProcessForCanvasRenderingEnabled: +@@ -915,7 +916,7 @@ UseGPUProcessForCanvasRenderingEnabled: defaultValue: WebKit: "ENABLE(GPU_PROCESS_BY_DEFAULT)": true @@ -2123,7 +2123,7 @@ index 78b806ade5ac37c3b4b075aa39a3962888a217da..de4f57b6e10141d78ad77ae5cd754740 UseGPUProcessForMediaEnabled: diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index cbe7cc165d6acba8370ad99dcbb6a0cf7ad781e2..4a0be1e230d47cc4663c96fc322f6414c1b16948 100644 +index c155ac2804b08de6ccf250b80e8257ca840a95cd..9e5db39af6af8aa523396ec54b34edf340f87e24 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -416,7 +416,7 @@ @@ -2145,7 +2145,7 @@ index cbe7cc165d6acba8370ad99dcbb6a0cf7ad781e2..4a0be1e230d47cc4663c96fc322f6414 #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index ca3a163a9576abbfa7a8c110cfd0e10570a656b1..a4be1e18d528a2f2b19997b042afe3ee59fd436f 100644 +index a69e19f17edb1f4c0140842bf7e59f9c64dce236..8774c500f21a4e8abe54c7a38bd274f1ac852f6b 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h @@ -223,7 +223,7 @@ @@ -2170,10 +2170,10 @@ index bb01bfeeac63f854fa656ec6b8d262fafc4c9df5..f8376ea8aada69d2e53734ba8fd234c2 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index d8e448baaac63ac241cc4720550608df123a3fc6..e66d82f36c32ed8d0dc8e3735a3ed09a2a1f295c 100644 +index 33a81078f2f36f5db5ad697ab3b12c4b47072d20..a872ea8238ce30a90c425abe0c3993e2a9e97403 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h -@@ -414,7 +414,7 @@ +@@ -419,7 +419,7 @@ #define HAVE_FOUNDATION_WITH_SAME_SITE_COOKIE_SUPPORT 1 #endif @@ -2238,7 +2238,7 @@ diff --git a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm b/So index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d768ace22 100644 --- a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm +++ b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm -@@ -198,6 +198,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -198,6 +198,7 @@ - (void)sendEndIfNeeded - (void)speechRecognizer:(SFSpeechRecognizer *)speechRecognizer availabilityDidChange:(BOOL)available { @@ -2246,7 +2246,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d ASSERT(isMainThread()); if (available || !_task) -@@ -211,6 +212,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -211,6 +212,7 @@ - (void)speechRecognizer:(SFSpeechRecognizer *)speechRecognizer availabilityDidC - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didHypothesizeTranscription:(SFTranscription *)transcription { @@ -2254,7 +2254,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d ASSERT(isMainThread()); [self sendSpeechStartIfNeeded]; -@@ -219,6 +221,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -219,6 +221,7 @@ - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didHypothesizeTran - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didFinishRecognition:(SFSpeechRecognitionResult *)recognitionResult { @@ -2262,7 +2262,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d ASSERT(isMainThread()); [self callbackWithTranscriptions:recognitionResult.transcriptions isFinal:YES]; -@@ -230,6 +233,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -230,6 +233,7 @@ - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didFinishRecogniti - (void)speechRecognitionTaskWasCancelled:(SFSpeechRecognitionTask *)task { @@ -2283,10 +2283,10 @@ index 9604d21ceb51ab8d20a337c8dbe52c4059043d2c..86a9eec09c4ac457bdd4567eeab57021 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index daea10b61d1585d8553eddd26014b9e5d1cc1255..fd004eec3d057f1b5ab18b9acdc065a882a19e8a 100644 +index 6dbaa8a39bd10eee5b50f84ff6e780ef91779228..2f490713d6656a15634888ea924329d10243c4dd 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -632,3 +632,9 @@ platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify +@@ -634,3 +634,9 @@ platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify platform/graphics/cocoa/ANGLEUtilitiesCocoa.cpp @no-unify platform/graphics/cocoa/GraphicsContextGLCocoa.mm @no-unify platform/graphics/cv/GraphicsContextGLCVCocoa.cpp @no-unify @@ -2297,7 +2297,7 @@ index daea10b61d1585d8553eddd26014b9e5d1cc1255..fd004eec3d057f1b5ab18b9acdc065a8 +JSTouchList.cpp +// Playwright end diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt -index 2322e2fd1686832942465614051db738cabfe9e4..d9e3cbe7d54e54b84c4293937b948b4161937574 100644 +index 3c998999a8d2bd7063c6212cea68837c224476cd..9bdcd851df22e2aa179063a95fa69f6f29e54517 100644 --- a/Source/WebCore/SourcesGTK.txt +++ b/Source/WebCore/SourcesGTK.txt @@ -37,6 +37,9 @@ accessibility/atspi/AccessibilityObjectValueAtspi.cpp @@ -2310,7 +2310,7 @@ index 2322e2fd1686832942465614051db738cabfe9e4..d9e3cbe7d54e54b84c4293937b948b41 editing/atspi/FrameSelectionAtspi.cpp editing/gtk/EditorGtk.cpp -@@ -134,3 +137,10 @@ platform/xdg/MIMETypeRegistryXdg.cpp +@@ -135,3 +138,10 @@ platform/xdg/MIMETypeRegistryXdg.cpp rendering/RenderThemeAdwaita.cpp rendering/RenderThemeGtk.cpp @@ -2322,7 +2322,7 @@ index 2322e2fd1686832942465614051db738cabfe9e4..d9e3cbe7d54e54b84c4293937b948b41 +JSSpeechSynthesisEventInit.cpp +// Playwright: end. diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt -index 3c64bfd9e2a5ed56ffd61f6c0e1a42f78c9e726b..1e01d0a3f3d71021661f9b43238e9c1f5289e7ae 100644 +index 6ae23004c411842a59c2389d631127b9ce848773..eb60c694acc9a2f2f03503527ca8e9de406ca73d 100644 --- a/Source/WebCore/SourcesWPE.txt +++ b/Source/WebCore/SourcesWPE.txt @@ -37,11 +37,16 @@ accessibility/atspi/AccessibilityObjectValueAtspi.cpp @@ -2342,7 +2342,7 @@ index 3c64bfd9e2a5ed56ffd61f6c0e1a42f78c9e726b..1e01d0a3f3d71021661f9b43238e9c1f page/linux/ResourceUsageOverlayLinux.cpp page/linux/ResourceUsageThreadLinux.cpp -@@ -88,8 +93,19 @@ platform/text/LocaleICU.cpp +@@ -90,8 +95,19 @@ platform/text/LocaleICU.cpp platform/unix/LoggingUnix.cpp @@ -2375,10 +2375,10 @@ index 82f617e0d496ee71ffc2f2ce4c00ddc0e640f0de..ad47858a0ba283ed44a486dbee29c10a __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc4ccb583a 100644 +index a166bcac55d10d7f1d758eb43fc091136e8865ad..af023d66b56b3f68d6b7aa0be6151b433c3d67b6 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5543,6 +5543,13 @@ +@@ -5546,6 +5546,13 @@ 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, ); }; }; @@ -2392,7 +2392,7 @@ index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc 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, ); }; }; -@@ -17906,6 +17913,14 @@ +@@ -17917,6 +17924,14 @@ EDEC98020AED7E170059137F /* WebCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCorePrefix.h; sourceTree = ""; tabWidth = 4; usesTabs = 0; }; EFB7287B2124C73D005C2558 /* CanvasActivityRecord.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasActivityRecord.cpp; sourceTree = ""; }; EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasActivityRecord.h; sourceTree = ""; }; @@ -2407,7 +2407,7 @@ index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc F12171F316A8BC63000053CA /* WebVTTElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTElement.cpp; sourceTree = ""; }; F12171F416A8BC63000053CA /* WebVTTElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTElement.h; sourceTree = ""; }; F32BDCD52363AAC90073B6AE /* UserGestureEmulationScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserGestureEmulationScope.cpp; sourceTree = ""; }; -@@ -24340,7 +24355,12 @@ +@@ -24353,7 +24368,12 @@ 1AF326770D78B9440068F0C4 /* EditorClient.h */, E36D701E27B71F04006531B7 /* EmptyAttachmentElementClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2420,7 +2420,7 @@ index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -30387,6 +30407,8 @@ +@@ -30406,6 +30426,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2429,7 +2429,7 @@ index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32696,6 +32718,7 @@ +@@ -32715,6 +32737,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2437,7 +2437,7 @@ index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -33705,6 +33728,7 @@ +@@ -33724,6 +33747,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2445,7 +2445,7 @@ index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -35859,6 +35883,7 @@ +@@ -35878,6 +35902,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2453,7 +2453,7 @@ index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -36983,6 +37008,7 @@ +@@ -37002,6 +37027,7 @@ 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, @@ -2461,7 +2461,7 @@ index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, CD1F9B032700323D00617EB6 /* PlatformVideoMatrixCoefficients.h in Headers */, -@@ -39081,6 +39107,7 @@ +@@ -39103,6 +39129,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2469,7 +2469,7 @@ index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -39157,6 +39184,7 @@ +@@ -39179,6 +39206,7 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2477,7 +2477,7 @@ index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -39205,6 +39233,7 @@ +@@ -39227,6 +39255,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2485,7 +2485,7 @@ index 3146949567ab1532509cfe5297a3e54d1f6a80ca..b6606cfb7a951db76b019acda52f1bcc DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -39737,6 +39766,7 @@ +@@ -39759,6 +39788,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2869,19 +2869,6 @@ index 7542bab569d49879f0eb460520738b3da37116f6..17c92229cc596bc80a718911b74737d3 PointerEvent(const AtomString& type, const PlatformTouchEvent&, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref&&); #endif -diff --git a/Source/WebCore/editing/ReplaceSelectionCommand.cpp b/Source/WebCore/editing/ReplaceSelectionCommand.cpp -index 33cb19fe6e720771da7ad9afae0289ed6005b1b8..6b3993d5e3fcc4099c12e0376ed7ddbd3fe220ed 100644 ---- a/Source/WebCore/editing/ReplaceSelectionCommand.cpp -+++ b/Source/WebCore/editing/ReplaceSelectionCommand.cpp -@@ -230,7 +230,7 @@ void ReplacementFragment::removeContentsWithSideEffects() - auto end = descendantsOfType(*m_fragment).end(); - while (it != end) { - Ref element = *it; -- if (isScriptElement(element) || (is(element) && element->getAttribute(classAttr) != WebKitMSOListQuirksStyle) -+ if (isScriptElement(element) || (is(element) && element->getAttribute(classAttr) != AtomString(WebKitMSOListQuirksStyle)) - || is(element) || is(element) || is(element) || is(element)) { - elementsToRemove.append(WTFMove(element)); - it.traverseNextSkippingChildren(); diff --git a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp b/Source/WebCore/editing/libwpe/EditorLibWPE.cpp index b8a3148b067373dadfb43975473a18caeb266d51..504172cd327b38ffbd103259e86d374752ee3474 100644 --- a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp @@ -2933,19 +2920,6 @@ index e739d217b780fc475c78762f0b04b96f57fa7df1..2d8479d1695fc6239c9f55ab29371d5d if (!UserGestureIndicator::processingUserGesture()) return; -diff --git a/Source/WebCore/html/FormController.cpp b/Source/WebCore/html/FormController.cpp -index 51a2aa3f83136e582a07715ecebd82572af9aff3..8f395ff841f6731c3de442bc648dce4ae9a34d08 100644 ---- a/Source/WebCore/html/FormController.cpp -+++ b/Source/WebCore/html/FormController.cpp -@@ -147,7 +147,7 @@ FormControlState FormController::SavedFormState::takeControlState(const FormElem - void FormController::SavedFormState::appendReferencedFilePaths(Vector& vector) const - { - for (auto& element : m_map) { -- if (element.key.second != "file"_s) // type -+ if (element.key.second != AtomString("file"_s)) // type - continue; - for (auto& state : element.value) { - for (auto& file : HTMLInputElement::filesFromFileInputFormControlState(state)) diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp index 23b330d6d57226dd0e3e2d19117520097f6baf7f..45531ee0561e8783f245f05f27cd51c175c52b70 100644 --- a/Source/WebCore/inspector/InspectorController.cpp @@ -5528,7 +5502,7 @@ index 4a65cd84e5b3c627f16712427d8059a73c759403..90a6262005694741aaaa59c869d35d5c #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 398188a9cc6d0ff79259324ef8cf37e5f80af9d6..3263040687199f1c21267bc15a0c61b8480f842f 100644 +index 689ae64c6e143f4b230def67204b1c06f04656b9..a694797eeed1639e583de829bfff3b18e27aa742 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -142,6 +142,7 @@ @@ -5642,7 +5616,7 @@ index 398188a9cc6d0ff79259324ef8cf37e5f80af9d6..3263040687199f1c21267bc15a0c61b8 auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4536,7 +4543,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4543,7 +4550,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -5652,7 +5626,7 @@ index 398188a9cc6d0ff79259324ef8cf37e5f80af9d6..3263040687199f1c21267bc15a0c61b8 PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4663,6 +4671,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4670,6 +4678,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -5663,10 +5637,10 @@ index 398188a9cc6d0ff79259324ef8cf37e5f80af9d6..3263040687199f1c21267bc15a0c61b8 m_touchPressed = touches->length() > 0; if (allTouchReleased) diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h -index 51d36bd866b1d5f1daea4b02ce86b213eaa44adb..fd3cd3dad309416f41a0a0bcac22c9e50b0abd8d 100644 +index dcefd2a8a88719f101df3de79bb296ac236e4d88..b29280bff9acbc8df2f9c5035be931eb70e86265 100644 --- a/Source/WebCore/page/EventHandler.h +++ b/Source/WebCore/page/EventHandler.h -@@ -135,9 +135,7 @@ public: +@@ -136,9 +136,7 @@ public: WEBCORE_EXPORT VisiblePosition selectionExtentRespectingEditingBoundary(const VisibleSelection&, const LayoutPoint&, Node*); @@ -5676,7 +5650,7 @@ index 51d36bd866b1d5f1daea4b02ce86b213eaa44adb..fd3cd3dad309416f41a0a0bcac22c9e5 #if ENABLE(PAN_SCROLLING) void didPanScrollStart(); -@@ -385,10 +383,8 @@ private: +@@ -387,10 +385,8 @@ private: bool startKeyboardScrolling(KeyboardEvent&); void stopKeyboardScrolling(); @@ -5687,7 +5661,7 @@ index 51d36bd866b1d5f1daea4b02ce86b213eaa44adb..fd3cd3dad309416f41a0a0bcac22c9e5 WEBCORE_EXPORT bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&); -@@ -488,10 +484,8 @@ private: +@@ -490,10 +486,8 @@ private: void defaultTabEventHandler(KeyboardEvent&); void defaultArrowEventHandler(FocusDirection, KeyboardEvent&); @@ -5698,7 +5672,7 @@ index 51d36bd866b1d5f1daea4b02ce86b213eaa44adb..fd3cd3dad309416f41a0a0bcac22c9e5 // The following are called at the beginning of handleMouseUp and handleDrag. // If they return true it indicates that they have consumed the event. -@@ -499,9 +493,10 @@ private: +@@ -501,9 +495,10 @@ private: #if ENABLE(DRAG_SUPPORT) bool eventLoopHandleMouseDragged(const MouseEventWithHitTestResults&); @@ -5710,7 +5684,7 @@ index 51d36bd866b1d5f1daea4b02ce86b213eaa44adb..fd3cd3dad309416f41a0a0bcac22c9e5 enum class SetOrClearLastScrollbar { Clear, Set }; void updateLastScrollbarUnderMouse(Scrollbar*, SetOrClearLastScrollbar); -@@ -593,8 +588,8 @@ private: +@@ -595,8 +590,8 @@ private: Timer m_autoHideCursorTimer; #endif @@ -7830,10 +7804,10 @@ index f169677e661510b225b899c79b68d040179a097a..420e101c7bb7a49b5c644076a8a2ffab m_commonHeaders.append(CommonHeader { name, value }); } diff --git a/Source/WebCore/platform/network/NetworkStorageSession.h b/Source/WebCore/platform/network/NetworkStorageSession.h -index 8e3cb385825b5d3f9b045bbd93d099324bec2912..51d451aaec8e2f799272efc8b3f4feeb0bc3bff7 100644 +index cad5fdc361c1ae84f56e0c8cba754ede9b70450f..64ba38b5a05202ae2ec5ec4d244177a7b169e569 100644 --- a/Source/WebCore/platform/network/NetworkStorageSession.h +++ b/Source/WebCore/platform/network/NetworkStorageSession.h -@@ -155,6 +155,8 @@ public: +@@ -156,6 +156,8 @@ public: NetworkingContext* context() const; #endif @@ -7843,10 +7817,10 @@ index 8e3cb385825b5d3f9b045bbd93d099324bec2912..51d451aaec8e2f799272efc8b3f4feeb WEBCORE_EXPORT void setCookie(const Cookie&); WEBCORE_EXPORT void setCookies(const Vector&, const URL&, const URL& mainDocumentURL); diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h -index e09b7b612a69d7cf0d21b0122e948bb9d66a8e2f..b4ed30c1ed25eb436f4697fa3cfbc08e805c828e 100644 +index cd8cde01d0bbb527983cee06f1759ff35bea2f9a..c87610f9a3386d518b3cf8529a42d61dbac200b1 100644 --- a/Source/WebCore/platform/network/ResourceResponseBase.h +++ b/Source/WebCore/platform/network/ResourceResponseBase.h -@@ -223,6 +223,8 @@ public: +@@ -224,6 +224,8 @@ public: WEBCORE_EXPORT static ResourceResponse dataURLResponse(const URL&, const DataURLDecoder::Result&); @@ -7855,7 +7829,7 @@ index e09b7b612a69d7cf0d21b0122e948bb9d66a8e2f..b4ed30c1ed25eb436f4697fa3cfbc08e protected: enum InitLevel { Uninitialized, -@@ -302,6 +304,7 @@ void ResourceResponseBase::encode(Encoder& encoder) const +@@ -303,6 +305,7 @@ void ResourceResponseBase::encode(Encoder& encoder) const encoder << m_httpStatusText; encoder << m_httpVersion; encoder << m_httpHeaderFields; @@ -7863,7 +7837,7 @@ index e09b7b612a69d7cf0d21b0122e948bb9d66a8e2f..b4ed30c1ed25eb436f4697fa3cfbc08e // We don't want to put the networkLoadMetrics info // into the disk cache, because we will never use the old info. -@@ -374,6 +377,12 @@ bool ResourceResponseBase::decode(Decoder& decoder, ResourceResponseBase& respon +@@ -375,6 +378,12 @@ bool ResourceResponseBase::decode(Decoder& decoder, ResourceResponseBase& respon return false; response.m_httpHeaderFields = WTFMove(*httpHeaderFields); @@ -7877,10 +7851,10 @@ index e09b7b612a69d7cf0d21b0122e948bb9d66a8e2f..b4ed30c1ed25eb436f4697fa3cfbc08e if constexpr (Decoder::isIPCDecoder) { std::optional> networkLoadMetrics; diff --git a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm -index 8f3f4ad592fb624f406d6244dcab766940496b7a..1db5f443608b0387ff0b9b19dab78847bd20be34 100644 +index a32a938cceed433559c00e15c72f6a47465ec575..1759e5d76989670705100cb3427a79b5ce35b761 100644 --- a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm +++ b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm -@@ -471,6 +471,22 @@ void NetworkStorageSession::setCookiesFromDOM(const URL& firstParty, const SameS +@@ -479,6 +479,22 @@ void NetworkStorageSession::setCookiesFromDOM(const URL& firstParty, const SameS END_BLOCK_OBJC_EXCEPTIONS } @@ -7997,7 +7971,7 @@ index 0c39c90aac884fca48849388acc1b42bad16d620..dd8e50686c348b46d5ae92fd67a31eb0 void send(CurlStreamID, UniqueArray&&, size_t); diff --git a/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp b/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp -index e52e4ce08c038f2da84925db03478e271d741465..fc2a9acb1e3e2805d57f7f86de046f8b676cda26 100644 +index 1b93415110a77d443d951890095c31fdadf889e9..b7682f0a2539b1a98c23e5391ec255f169768b32 100644 --- a/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp +++ b/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp @@ -118,6 +118,12 @@ void NetworkStorageSession::setCookieAcceptPolicy(CookieAcceptPolicy policy) con @@ -8058,7 +8032,7 @@ index e106d2e9c4bdf2f099c34d61270ab1ab12e1b1bc..d1ffe11e4fc2a0bece55c4a70f4d1eef SocketStreamHandleImpl::~SocketStreamHandleImpl() diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp -index 9bd65a464e6d669f6cc51f9a149ebafd58d5ffe8..5eb404f32629599adc40b367b9220535f946d2af 100644 +index 1c91f93595ab4362409762530880878e3804c2b8..8848c9d880f341d4a0de089ff0ddc1d0fdde5ea4 100644 --- a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp +++ b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp @@ -410,6 +410,30 @@ void NetworkStorageSession::setCookie(const Cookie& cookie) @@ -8683,19 +8657,6 @@ index fac9402820702989bf72ed2425678bfb82bd6523..40b5a6441d22714fd370ce1a7c2f534e // Returns the line height of the inner renderer. int innerLineHeight() const override; #endif -diff --git a/Source/WebCore/rendering/RenderTreeAsText.cpp b/Source/WebCore/rendering/RenderTreeAsText.cpp -index d2dc7f9d8d1d52a2fe26984c748ff31ca47564b0..aacc1a576323d50ed5fe0600b85cad94767f2393 100644 ---- a/Source/WebCore/rendering/RenderTreeAsText.cpp -+++ b/Source/WebCore/rendering/RenderTreeAsText.cpp -@@ -142,7 +142,7 @@ static bool isEmptyOrUnstyledAppleStyleSpan(const Node* node) - return false; - - const HTMLElement& element = downcast(*node); -- if (element.getAttribute(classAttr) != "Apple-style-span"_s) -+ if (element.getAttribute(classAttr) != AtomString("Apple-style-span"_s)) - return false; - - if (!node->hasChildNodes()) diff --git a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in index 2081154f90fac8f7b9f7c6061cf5dc6da1af44b5..e7c6071a6f2e05e76e0fd1cb4661ebd32a5bb3fd 100644 --- a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.messages.in @@ -8784,7 +8745,7 @@ index 77597632a0e3f5dbac4ed45312c401496cf2387d..c3861e47242b15234101ca02a83f2766 RemoveStorageAccessForFrame(WebCore::FrameIdentifier frameID, WebCore::PageIdentifier pageID); LogUserInteraction(WebCore::RegistrableDomain domain) diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp -index 45dc0534b6cbc236b89ef54844d651f52d5b4ce2..0dd00c548d7fd5c572570a5a88fd34ac03afeb74 100644 +index db42197e01c6e835b41455610ea396ea26920243..1ebb695020d4e8ed8739a288e02241142395140e 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -530,6 +530,12 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) @@ -8801,7 +8762,7 @@ index 45dc0534b6cbc236b89ef54844d651f52d5b4ce2..0dd00c548d7fd5c572570a5a88fd34ac void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index 4e813e3b8cf736553f2ae49ff4d8357eadc3fdd9..e75162d4aa4ad4a45269bec967f992c02f64f302 100644 +index c0d5646aa8964318a999f9a107c493855b2cee7d..35a225a2527732d4d483e07313eac6b7ec4dec86 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -36,6 +36,7 @@ @@ -8830,7 +8791,7 @@ index 4e813e3b8cf736553f2ae49ff4d8357eadc3fdd9..e75162d4aa4ad4a45269bec967f992c0 void clearPrevalentResource(PAL::SessionID, RegistrableDomain&&, CompletionHandler&&); void clearUserInteraction(PAL::SessionID, RegistrableDomain&&, CompletionHandler&&); diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -index 2657c1ea428958b32428fac55793268bc7724fee..d5144290e0f0ddc92f4c6936763bd18edf45928a 100644 +index 34334c3b4fdf491271702fd46b0676e01a34f1e4..7ce428cb543a07ac2559d56de7484e02772f6cb9 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -77,6 +77,8 @@ messages -> NetworkProcess LegacyReceiver { @@ -8865,10 +8826,10 @@ index 11b3fc7c4267ef9e412d7d48bb6cfbe70b2bdfeb..af1fb6660696cf9c91d319670d554272 HashSet> m_keptAliveLoads; diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 1d9c725383fa4ad497de378783e519b98451fb20..44fd5f3b958f8a7bd85b8657fff5bac058a86a69 100644 +index 8b32817b6c0efbcbd221dc7a3ebe420b42d8b51d..a468653cffcfaca8824e94d628c48b7b5d61e164 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -723,7 +723,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall +@@ -720,7 +720,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didRece if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { sessionCocoa->setClientAuditToken(challenge); @@ -8877,7 +8838,7 @@ index 1d9c725383fa4ad497de378783e519b98451fb20..44fd5f3b958f8a7bd85b8657fff5bac0 return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject; -@@ -967,6 +967,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END +@@ -964,6 +964,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -9245,19 +9206,6 @@ index caf67e1dece5b727e43eba780e70814f8fdb0f63..740150d2589d6e16a516daa3bf6ef899 #include #include #include -diff --git a/Source/WebKit/Shared/IPCTester.messages.in b/Source/WebKit/Shared/IPCTester.messages.in -index 3ee8ea4fea2ac058fb7e25eb41aa9ab363db7c55..ca31cfc74453b17cd4062e30e8433190b09c7cfc 100644 ---- a/Source/WebKit/Shared/IPCTester.messages.in -+++ b/Source/WebKit/Shared/IPCTester.messages.in -@@ -27,7 +27,7 @@ messages -> IPCTester NotRefCounted { - StopMessageTesting() -> () Synchronous - CreateStreamTester(WebKit::IPCStreamTesterIdentifier identifier, IPC::StreamConnectionBuffer stream) WantsConnection - ReleaseStreamTester(WebKit::IPCStreamTesterIdentifier identifier) -> () Synchronous -- CreateConnectionTester(WebKit::IPCConnectionTesterIdentifier ideœntifier, IPC::Attachment connection) WantsConnection -+ CreateConnectionTester(WebKit::IPCConnectionTesterIdentifier identifier, IPC::Attachment connection) WantsConnection - CreateConnectionTesterAndSendAsyncMessages(WebKit::IPCConnectionTesterIdentifier identifier, IPC::Attachment connection, uint32_t messageCount) WantsConnection - ReleaseConnectionTester(WebKit::IPCConnectionTesterIdentifier identifier) -> () Synchronous - diff --git a/Source/WebKit/Shared/NativeWebKeyboardEvent.h b/Source/WebKit/Shared/NativeWebKeyboardEvent.h index ee8cac1c980039c4a36de5501ab7f135e710d06b..deae2be9e720ff76186ecea89920dfc39c4f186a 100644 --- a/Source/WebKit/Shared/NativeWebKeyboardEvent.h @@ -9337,7 +9285,7 @@ index f2f3979fcac9dfd97d0e0ead600fe35eb8defd40..ac91412e1a96bdf521b1890a66e465dc NSEvent* nativeEvent() const { return m_nativeEvent.get(); } #elif PLATFORM(GTK) diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -index 44e6cf59eb1b5f6edd05b70d33fec92f1d13a13a..4dbed341290f7eda0a47aeb2fc464956d799a8de 100644 +index 3c37fbf7146d39e8fa3050174f70fbc7f5fcb51e..d64a009948c274db21db74c52602f901dd89019b 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -123,6 +123,10 @@ @@ -9557,7 +9505,7 @@ index cf2adc382b3f59890c43a54b6c28bab2c4a965c6..998e96ec8c997bd1b51434c77e73e942 const WebCore::IntPoint& globalPosition() const { return m_globalPosition; } float deltaX() const { return m_deltaX; } diff --git a/Source/WebKit/Shared/WebPageCreationParameters.cpp b/Source/WebKit/Shared/WebPageCreationParameters.cpp -index 345044e6e121d3d9dfcc3721f41b22ff2b5f03c0..63c65cbf9e2e363efb4ef27602e15069f9db5cea 100644 +index a09735f21a6e29f42cdb4689a76e6f515656fc24..4239e03c964470a2afa6e6f1c1153c603cc1d008 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.cpp +++ b/Source/WebKit/Shared/WebPageCreationParameters.cpp @@ -155,6 +155,8 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const @@ -9582,7 +9530,7 @@ index 345044e6e121d3d9dfcc3721f41b22ff2b5f03c0..63c65cbf9e2e363efb4ef27602e15069 return std::nullopt; diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h -index 14b30937a5c75ae4fd9a9e9fc59e9cd958a138ff..dc1a5a83493748c3ceb948be14a45ee98069dabe 100644 +index a3bf148e49a919fb3e326564936ca9aa725b0222..543f1a4d6fa571eb025b90d27a39aea9d591f0f9 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.h +++ b/Source/WebKit/Shared/WebPageCreationParameters.h @@ -254,6 +254,8 @@ struct WebPageCreationParameters { @@ -9898,10 +9846,10 @@ index 90df093a49c09dc670dfea55077c77d889dd1c1b..6ffd51532e29b941b8dc10f545b7f5b8 return WebTouchEvent(); } diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt -index 8449b98dca13bf468ebd203434694bafdb33dcb2..ec7005d1359069b319a2b3753026f294e52f7fff 100644 +index c03306be47340b44317c7e70c0df9ebe9dbe6fe9..2b2494459e169e2ab0762a494e4110b6e38a67f7 100644 --- a/Source/WebKit/Sources.txt +++ b/Source/WebKit/Sources.txt -@@ -396,11 +396,14 @@ Shared/XR/XRDeviceProxy.cpp +@@ -397,11 +397,14 @@ Shared/XR/XRDeviceProxy.cpp UIProcess/AuxiliaryProcessProxy.cpp UIProcess/BackgroundProcessResponsivenessTimer.cpp @@ -9916,7 +9864,7 @@ index 8449b98dca13bf468ebd203434694bafdb33dcb2..ec7005d1359069b319a2b3753026f294 UIProcess/LegacyGlobalSettings.cpp UIProcess/MediaKeySystemPermissionRequestManagerProxy.cpp UIProcess/MediaKeySystemPermissionRequestProxy.cpp -@@ -409,6 +412,7 @@ UIProcess/PageLoadState.cpp +@@ -410,6 +413,7 @@ UIProcess/PageLoadState.cpp UIProcess/ProcessAssertion.cpp UIProcess/ProcessThrottler.cpp UIProcess/ProvisionalPageProxy.cpp @@ -9966,7 +9914,7 @@ index 0ec8eca8cb9f393c9464a83ebf2ef9984cae1b6a..1bc846e858a4b004817aa050cfa255cb UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm UIProcess/Inspector/mac/WKInspectorViewController.mm diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt -index bc7726cbe2dd19dc5fa32f0ba65c9ef93acefb21..835f2fc17595024fe5830e8a2861b2872ff43406 100644 +index aea86652a260ea0dd130a442a3f5b479eda1f574..171476dc84ed2981059a82ee657feacd1ccd5c39 100644 --- a/Source/WebKit/SourcesGTK.txt +++ b/Source/WebKit/SourcesGTK.txt @@ -128,6 +128,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify @@ -9977,7 +9925,7 @@ index bc7726cbe2dd19dc5fa32f0ba65c9ef93acefb21..835f2fc17595024fe5830e8a2861b287 UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify UIProcess/API/glib/WebKitCookieManager.cpp @no-unify UIProcess/API/glib/WebKitCredential.cpp @no-unify -@@ -245,6 +246,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp +@@ -247,6 +248,7 @@ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp UIProcess/cairo/BackingStoreCairo.cpp @no-unify @@ -9985,7 +9933,7 @@ index bc7726cbe2dd19dc5fa32f0ba65c9ef93acefb21..835f2fc17595024fe5830e8a2861b287 UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -262,6 +264,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify +@@ -264,6 +266,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify UIProcess/gtk/WebDateTimePickerGtk.cpp UIProcess/gtk/GtkSettingsManager.cpp UIProcess/gtk/HardwareAccelerationManager.cpp @@ -9993,7 +9941,7 @@ index bc7726cbe2dd19dc5fa32f0ba65c9ef93acefb21..835f2fc17595024fe5830e8a2861b287 UIProcess/gtk/KeyBindingTranslator.cpp UIProcess/gtk/PointerLockManager.cpp @no-unify UIProcess/gtk/PointerLockManagerWayland.cpp @no-unify -@@ -274,6 +277,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify +@@ -276,6 +279,8 @@ UIProcess/gtk/WaylandCompositor.cpp @no-unify UIProcess/gtk/WebColorPickerGtk.cpp UIProcess/gtk/WebContextMenuProxyGtk.cpp UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp @@ -10003,7 +9951,7 @@ index bc7726cbe2dd19dc5fa32f0ba65c9ef93acefb21..835f2fc17595024fe5830e8a2861b287 UIProcess/gtk/WebPasteboardProxyGtk.cpp UIProcess/gtk/WebPopupMenuProxyGtk.cpp diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt -index ae2181088f8221594c9a2b4fbe5d99f2b6936d67..0c51c08ebf3352f7ec80aa8490e7e10c119da28a 100644 +index f417f7cea69735cd2c558a3ec776982b17e51538..38fec53ff3ad872a2e37f3209ca2e4715bf24d87 100644 --- a/Source/WebKit/SourcesWPE.txt +++ b/Source/WebKit/SourcesWPE.txt @@ -87,6 +87,7 @@ Shared/glib/ProcessExecutablePathGLib.cpp @@ -10030,7 +9978,7 @@ index ae2181088f8221594c9a2b4fbe5d99f2b6936d67..0c51c08ebf3352f7ec80aa8490e7e10c UIProcess/API/glib/WebKitPolicyDecision.cpp @no-unify UIProcess/API/glib/WebKitPrivate.cpp @no-unify UIProcess/API/glib/WebKitProtocolHandler.cpp @no-unify -@@ -187,6 +190,7 @@ UIProcess/API/wpe/InputMethodFilterWPE.cpp @no-unify +@@ -189,6 +192,7 @@ UIProcess/API/wpe/InputMethodFilterWPE.cpp @no-unify UIProcess/API/wpe/PageClientImpl.cpp @no-unify UIProcess/API/wpe/TouchGestureController.cpp @no-unify UIProcess/API/wpe/WebKitColor.cpp @no-unify @@ -10038,7 +9986,7 @@ index ae2181088f8221594c9a2b4fbe5d99f2b6936d67..0c51c08ebf3352f7ec80aa8490e7e10c UIProcess/API/wpe/WebKitInputMethodContextWPE.cpp @no-unify UIProcess/API/wpe/WebKitPopupMenu.cpp @no-unify UIProcess/API/wpe/WebKitRectangle.cpp @no-unify -@@ -203,6 +207,7 @@ UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +@@ -205,6 +209,7 @@ UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp UIProcess/geoclue/GeoclueGeolocationProvider.cpp @@ -10046,8 +9994,8 @@ index ae2181088f8221594c9a2b4fbe5d99f2b6936d67..0c51c08ebf3352f7ec80aa8490e7e10c UIProcess/glib/WebPageProxyGLib.cpp UIProcess/glib/WebProcessPoolGLib.cpp UIProcess/glib/WebProcessProxyGLib.cpp -@@ -229,6 +234,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp - UIProcess/soup/WebCookieManagerProxySoup.cpp +@@ -230,6 +235,11 @@ UIProcess/linux/MemoryPressureMonitor.cpp + UIProcess/soup/WebProcessPoolSoup.cpp +UIProcess/wpe/InspectorTargetProxyWPE.cpp @@ -10058,7 +10006,7 @@ index ae2181088f8221594c9a2b4fbe5d99f2b6936d67..0c51c08ebf3352f7ec80aa8490e7e10c UIProcess/wpe/WebPageProxyWPE.cpp WebProcess/GPU/graphics/gbm/RemoteGraphicsContextGLProxyGBM.cpp -@@ -259,6 +269,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp +@@ -260,6 +270,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp @@ -10291,7 +10239,7 @@ index b8bf936e2eb8ca4dc0f445099dfb899395950bdb..30a2af76de0daac450c7afbb8a2dfe81 #import #import #import -@@ -234,6 +235,11 @@ static WallTime toSystemClockTime(NSDate *date) +@@ -234,6 +235,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple }); } @@ -10470,7 +10418,7 @@ diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/ index 2e235bb880c638a0e74256b6d66cb0244ea0a3f1..3471eebb47e860f7c2071d0e7f2691c9f0a6355d 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm -@@ -257,6 +257,16 @@ +@@ -257,6 +257,16 @@ - (BOOL)processSwapsOnNavigation return _processPoolConfiguration->processSwapsOnNavigation(); } @@ -11696,7 +11644,7 @@ index be5ac6eefad0e4b6f3c02bb5c60765dbfb7eb1ff..dfc01d10998ec98d0affd93c4f176535 { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index 24b29521c80bbcfc9d9b6553aac11a7a02faef99..7358db1001a753a3e67fb99af7b46b928e4f66cc 100644 +index e0da4d3e5e457c1f1d785028f0245c9a610b8e30..22e42a550171be4940574901e2f84e3fcbd0f6c5 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -37,6 +37,7 @@ @@ -11775,10 +11723,10 @@ index 24b29521c80bbcfc9d9b6553aac11a7a02faef99..7358db1001a753a3e67fb99af7b46b92 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index 71171b1292b0f23ef0f0a3101b6c7538c7a593d2..83513ef77cbd2d77865eaa63c738952cff7a6f37 100644 +index e445bba4c08a0a1fc810c69cf2dd1db7e82d780c..4868414f7c03f8e50c1f6a71b45f3168bf6f81aa 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -359,7 +359,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -360,7 +360,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -11787,7 +11735,7 @@ index 71171b1292b0f23ef0f0a3101b6c7538c7a593d2..83513ef77cbd2d77865eaa63c738952c #endif #if PLATFORM(IOS) -@@ -614,8 +614,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -615,8 +615,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -11799,7 +11747,7 @@ index 71171b1292b0f23ef0f0a3101b6c7538c7a593d2..83513ef77cbd2d77865eaa63c738952c 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 a4d0e7c10ffe1cfd50203c996cec083f167ac03f..95cfb310026746a10d36c50bbbcbc40e1a4db37b 100644 +index 1234f6f1344764cdb086ba6b9d05680d23dff34b..a04ecc1d18e5787624af5a86637064484881c3ff 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h @@ -507,6 +507,9 @@ public: @@ -11813,7 +11761,7 @@ index a4d0e7c10ffe1cfd50203c996cec083f167ac03f..95cfb310026746a10d36c50bbbcbc40e void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 02ff741ea45cf7ee4e3848ddbe8ec287435904c4..9f6d8ca4e3b4f7a3518f185ac79570b110a469f4 100644 +index 3ba8cc9fa2a12c225a64246a5df1ac1dbeccb0c4..d76861b85beb4dfbffaa5a1ff7b4d130d84e3055 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm @@ -2776,6 +2776,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() @@ -14247,10 +14195,10 @@ index 0000000000000000000000000000000000000000..d0e11ed81a6257c011df23d5870da740 +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..21c18c2df54097375dee67bb2393bdd6f3242d69 +index 0000000000000000000000000000000000000000..20fd6c8be329f6f18787715736e422821973623f --- /dev/null +++ b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp -@@ -0,0 +1,963 @@ +@@ -0,0 +1,957 @@ +/* + * Copyright (C) 2019 Microsoft Corporation. + * @@ -14282,6 +14230,7 @@ index 0000000000000000000000000000000000000000..21c18c2df54097375dee67bb2393bdd6 +#if ENABLE(REMOTE_INSPECTOR) + +#include "APIGeolocationProvider.h" ++#include "APIHTTPCookieStore.h" +#include "APIPageConfiguration.h" +#include "FrameInfoData.h" +#include "InspectorPlaywrightAgentClient.h" @@ -14292,7 +14241,6 @@ index 0000000000000000000000000000000000000000..21c18c2df54097375dee67bb2393bdd6 +#include "SandboxExtension.h" +#include "StorageNamespaceIdentifier.h" +#include "WebAutomationSession.h" -+#include "WebCookieManagerProxy.h" +#include "WebGeolocationManagerProxy.h" +#include "WebGeolocationPosition.h" +#include "WebInspectorUtilities.h" @@ -14992,10 +14940,9 @@ index 0000000000000000000000000000000000000000..21c18c2df54097375dee67bb2393bdd6 + return; + } + -+ PAL::SessionID sessionID = browserContext->dataStore->sessionID(); + NetworkProcessProxy& networkProcess = browserContext->dataStore->networkProcess(); -+ networkProcess.cookieManager().getAllCookies(sessionID, -+ [callback = WTFMove(callback)](Vector allCookies) { ++ browserContext->dataStore->cookieStore().cookies( ++ [callback = WTFMove(callback)](const Vector& allCookies) { + if (!callback->isActive()) + return; + auto cookies = JSON::ArrayOf::create(); @@ -15013,9 +14960,6 @@ index 0000000000000000000000000000000000000000..21c18c2df54097375dee67bb2393bdd6 + return; + } + -+ NetworkProcessProxy& networkProcess = browserContext->dataStore->networkProcess(); -+ PAL::SessionID sessionID = browserContext->dataStore->sessionID(); -+ + Vector cookies; + for (unsigned i = 0; i < in_cookies->length(); ++i) { + RefPtr item = in_cookies->get(i); @@ -15056,7 +15000,7 @@ index 0000000000000000000000000000000000000000..21c18c2df54097375dee67bb2393bdd6 + cookies.append(WTFMove(cookie)); + } + -+ networkProcess.cookieManager().setCookies(sessionID, WTFMove(cookies), ++ browserContext->dataStore->cookieStore().setCookies(WTFMove(cookies), + [callback = WTFMove(callback)]() { + if (!callback->isActive()) + return; @@ -15072,9 +15016,7 @@ index 0000000000000000000000000000000000000000..21c18c2df54097375dee67bb2393bdd6 + return; + } + -+ NetworkProcessProxy& networkProcess = browserContext->dataStore->networkProcess(); -+ PAL::SessionID sessionID = browserContext->dataStore->sessionID(); -+ networkProcess.cookieManager().deleteAllCookies(sessionID, ++ browserContext->dataStore->cookieStore().deleteAllCookies( + [callback = WTFMove(callback)]() { + if (!callback->isActive()) + return; @@ -15440,7 +15382,7 @@ index 7a14cfba15c103a2d4fe263fa49d25af3c396ec2..3ee0e154349661632799057c71f1d1f1 BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation); diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h -index 87ec521ac54382bb1365d961a0f69d61b44bbff7..a37b2602e6ee5458951a0d204ed41759471bcf5c 100644 +index ffc917d8bcabc32cd5db24fcc454d743b59763dc..e6d36eaf5bca4f19de66fe5640102037d8637c0d 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h @@ -321,6 +321,11 @@ public: @@ -15779,7 +15721,7 @@ index 684b9616573761123fbcc0d94be29de519ecced6..51ff18323ece0ee15c87d63a1d6fd604 namespace WebKit { diff --git a/Source/WebKit/UIProcess/WebContextMenuProxy.h b/Source/WebKit/UIProcess/WebContextMenuProxy.h -index 8a506c2f4b96185560c8ee198f9af9575152b15a..2e76e28266dfd71061373e8ee4211653f4655bd1 100644 +index 72443b5a8da3abba60042c09d4b2c9d42acf9221..bcf13bc87801d5fcfa7f8178a8adf8fc4a50bb44 100644 --- a/Source/WebKit/UIProcess/WebContextMenuProxy.h +++ b/Source/WebKit/UIProcess/WebContextMenuProxy.h @@ -33,6 +33,7 @@ @@ -16463,7 +16405,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979f644f461 100644 +index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63cea674bb0 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -247,6 +247,9 @@ @@ -16775,7 +16717,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4724,6 +4876,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4728,6 +4880,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -16783,7 +16725,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4949,6 +5102,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4953,6 +5106,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -16792,7 +16734,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 // If the provisional page's load fails then we destroy the provisional page. if (m_provisionalPage && m_provisionalPage->mainFrame() == &frame && willContinueLoading == WillContinueLoading::No) m_provisionalPage = nullptr; -@@ -5428,7 +5583,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5432,7 +5587,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, NavigationActionData&& navigationActionData, FrameInfoData&& originatingFrameInfo, std::optional originatingPageID, const WebCore::ResourceRequest& originalRequest, WebCore::ResourceRequest&& request, IPC::FormDataReference&& requestBody, WebCore::ResourceResponse&& redirectResponse, const UserData& userData, uint64_t listenerID) { @@ -16808,7 +16750,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -6017,6 +6179,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6021,6 +6183,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa if (originatingPage) openerAppInitiatedState = originatingPage->lastNavigationWasAppInitiated(); @@ -16816,7 +16758,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 auto completionHandler = [this, protectedThis = Ref { *this }, mainFrameURL, request, reply = WTFMove(reply), privateClickMeasurement = navigationActionData.privateClickMeasurement, openerAppInitiatedState = WTFMove(openerAppInitiatedState)] (RefPtr newPage) mutable { if (!newPage) { reply(std::nullopt, std::nullopt); -@@ -6063,6 +6226,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6067,6 +6230,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -16824,7 +16766,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 } void WebPageProxy::exitFullscreenImmediately() -@@ -6122,6 +6286,10 @@ void WebPageProxy::closePage() +@@ -6126,6 +6290,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -16835,7 +16777,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -6158,6 +6326,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -6162,6 +6330,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f } runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { @@ -16844,7 +16786,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -6179,6 +6349,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -6183,6 +6353,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -16853,7 +16795,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptConfirm(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable { -@@ -6202,6 +6374,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -6206,6 +6378,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -16862,7 +16804,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply), defaultValue](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler&& completion) mutable { page.m_uiClient->runJavaScriptPrompt(page, message, defaultValue, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable { -@@ -6329,6 +6503,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6333,6 +6507,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -16871,7 +16813,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7593,6 +7769,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7597,6 +7773,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -16880,7 +16822,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 } break; } -@@ -7607,10 +7785,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7611,10 +7789,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -16897,7 +16839,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 break; } -@@ -7619,7 +7800,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7623,7 +7804,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) case WebEvent::RawKeyDown: case WebEvent::Char: { LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s (queue empty %d)", webKeyboardEventTypeString(type), m_keyEventQueue.isEmpty()); @@ -16905,7 +16847,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7638,7 +7818,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7642,7 +7822,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) // The call to doneWithKeyEvent may close this WebPage. // Protect against this being destroyed. Ref protect(*this); @@ -16913,7 +16855,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7647,6 +7826,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7651,6 +7830,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -16921,7 +16863,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 } break; } -@@ -7980,7 +8160,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7984,7 +8164,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -16933,7 +16875,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8314,6 +8497,7 @@ static Span gpuMachServices() +@@ -8318,6 +8501,7 @@ static Span gpuMachServices() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -16941,7 +16883,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8506,6 +8690,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8510,6 +8694,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false; @@ -16950,7 +16892,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 #if PLATFORM(IOS) // FIXME: This is also being passed over the to WebProcess via the PreferencesStore. parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload(); -@@ -8578,6 +8764,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8582,6 +8768,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -16965,7 +16907,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8671,6 +8865,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8675,6 +8869,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; @@ -16982,7 +16924,7 @@ index da4ee5f6bca6c3582930f1e933b5de2bb59461c3..f01532b349b4cb1a69faa854b2885979 // and make it one UIClient call that calls the completionHandler with false // if there is no delegate instead of returning the completionHandler diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h -index d0fe14a2e4e169845706abfda163f4da24dd349d..77b735a23b630caa7e3825deafff51645ae61e48 100644 +index f69420b0b67e1d9d37b4af1feb3cea731f1f3285..73b45e8248cb08ef2a4c55081de1e244b566b911 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17144,7 +17086,7 @@ index d0fe14a2e4e169845706abfda163f4da24dd349d..77b735a23b630caa7e3825deafff5164 #if PLATFORM(IOS_FAMILY) && ENABLE(DEVICE_ORIENTATION) std::unique_ptr m_webDeviceOrientationUpdateProviderProxy; diff --git a/Source/WebKit/UIProcess/WebPageProxy.messages.in b/Source/WebKit/UIProcess/WebPageProxy.messages.in -index 5b69c850a57b981ec3156c64264f60c6eba39f88..a179e94dfd9da89d14d0260fcbc4cd1eb5f045df 100644 +index bc758641100c9ab2bb70c878f7a10a6db198cf01..fa3764f7c417363a0da953552fb9b6ff45c4d8f2 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17194,10 +17136,10 @@ index d18d9e197f8a366cd5efeaa63600bec4e7f1d9d6..3c9db1f1cb5523923ec010f935d88393 } diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 582d81e7d79fba2dc7e545d6b61f3e726f872470..2a302375a62e1d6b72c9af3709b0fa1b1ffc8e23 100644 +index 62361654f39a1879689e15ae201f54537a122482..ee93de7e8b9766e84e6fea38b56a0890cca1f7bb 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp -@@ -535,6 +535,14 @@ void WebProcessPool::establishRemoteWorkerContextConnectionToNetworkProcess(Remo +@@ -534,6 +534,14 @@ void WebProcessPool::establishRemoteWorkerContextConnectionToNetworkProcess(Remo RefPtr requestingProcess = requestingProcessIdentifier ? WebProcessProxy::processForIdentifier(*requestingProcessIdentifier) : nullptr; WebProcessPool* processPool = requestingProcess ? &requestingProcess->processPool() : processPools()[0]; @@ -17241,10 +17183,10 @@ index 56789958133037207df23dffd42a5144132e3219..06c9a3d31cf2a08c187087b07f4141d7 WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 812df81bf826eddae029c3d60978e7ccfb91cf48..7d9cdcae47454397791c2e979d95730c33940539 100644 +index 291e189aed4cfe06524ff549a57b50556df20fb8..e8b38d35e03f6f7a3c1cc8f102b797c9213dc4f8 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -2011,6 +2011,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, +@@ -2005,6 +2005,12 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, networkProcess().websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), WTFMove(topOrigin), type, WTFMove(completionHandler)); } @@ -17969,7 +17911,7 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index c38053cab644397a4aaa31d8819b10dec2549fd1..dcdf39a2cff9f719e2a503e1a5b6120add32e94f 100644 +index 8739382008f49e3dc58e3a7a73bb2432081b7726..bf9d909afbd09db070ea381ba3bfcfb04b54c28e 100644 --- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm +++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm @@ -439,6 +439,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) @@ -18170,7 +18112,7 @@ index 0000000000000000000000000000000000000000..721826c8c98fc85b68a4f45deaee69c1 + +#endif diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h -index 3034718c90afa349dc2109654b6338540f7dcbc3..a94412a42547378a33d3fb6897632d472724218d 100644 +index 4d795740f062bf59e99b1ee2098dc56d101d5561..540dc56fb31ac77f07f0c979650fc20fa5d1e00b 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.h +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.h @@ -53,6 +53,8 @@ class PageClientImpl final : public PageClientImplCocoa @@ -18204,7 +18146,7 @@ index 3034718c90afa349dc2109654b6338540f7dcbc3..a94412a42547378a33d3fb6897632d47 void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&) override; void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override; diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm -index 656a0e89b254d505e4a03f39edb3b8a6b3939832..293aea77bf9c24193a188f943f8c7c7c55207c08 100644 +index 496290a54e38ca2931f579fa14e04e6cc3cb747e..5ce3691dcac88c29a33f004a3894e69a8197add2 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm @@ -81,6 +81,7 @@ @@ -18325,7 +18267,7 @@ index 656a0e89b254d505e4a03f39edb3b8a6b3939832..293aea77bf9c24193a188f943f8c7c7c } diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h -index 1a2c89022fd23b5dc5976500d9a3943d6daaffb8..9f66ad2c714018be74e669df4c650d42c6ae9ffe 100644 +index 29b621bd947974bf0d84552bfe502f497f0a1301..986988431e717aff12ed8b3a78bf454394208d99 100644 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h @@ -68,6 +68,7 @@ private: @@ -18337,7 +18279,7 @@ index 1a2c89022fd23b5dc5976500d9a3943d6daaffb8..9f66ad2c714018be74e669df4c650d42 void getContextMenuItem(const WebContextMenuItemData&, CompletionHandler&&); void getContextMenuFromItems(const Vector&, CompletionHandler&&); diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm -index 388231d5569e5fbb2ed8450b6c6b1276e18e4cff..578c6f66ac0ef39ad06c4d7561a3931433476c63 100644 +index ceeea741690315d1c1254f67fd3d6aaf6e7a2f5d..c1c60a1926a1f5b103277feff0223edd305569aa 100644 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm @@ -465,6 +465,12 @@ void WebContextMenuProxyMac::getShareMenuItem(CompletionHandler&&); #endif -@@ -1031,6 +1035,9 @@ public: +@@ -1032,6 +1036,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -20495,7 +20437,7 @@ index 88e937bd7b988632081ef8a7435ddf251899aef0..475a01b48a12f7a56229321c9a6dcc3f #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1265,6 +1272,7 @@ public: +@@ -1266,6 +1273,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -20503,7 +20445,7 @@ index 88e937bd7b988632081ef8a7435ddf251899aef0..475a01b48a12f7a56229321c9a6dcc3f void insertNewlineInQuotedContent(); -@@ -1654,6 +1662,7 @@ private: +@@ -1655,6 +1663,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -20511,7 +20453,7 @@ index 88e937bd7b988632081ef8a7435ddf251899aef0..475a01b48a12f7a56229321c9a6dcc3f void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1691,6 +1700,7 @@ private: +@@ -1692,6 +1701,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -20519,7 +20461,7 @@ index 88e937bd7b988632081ef8a7435ddf251899aef0..475a01b48a12f7a56229321c9a6dcc3f #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1834,9 +1844,7 @@ private: +@@ -1835,9 +1845,7 @@ private: void requestRectForFoundTextRange(const WebFoundTextRange&, CompletionHandler&&); @@ -20529,7 +20471,7 @@ index 88e937bd7b988632081ef8a7435ddf251899aef0..475a01b48a12f7a56229321c9a6dcc3f void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2379,6 +2387,7 @@ private: +@@ -2380,6 +2388,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -20538,7 +20480,7 @@ index 88e937bd7b988632081ef8a7435ddf251899aef0..475a01b48a12f7a56229321c9a6dcc3f bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 7a9cc684eac72478eb4acb6250ab4f37103c04a8..7b3e9a300bcb26769008893eb269d53fe8a7c9f0 100644 +index ba168de76718bb7b4aef2f56f5e66b1494b50126..78b3e10a9a764a0a50dabeb690c7941430cbe7fd 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in @@ -139,6 +139,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType @@ -20590,10 +20532,10 @@ index 7a9cc684eac72478eb4acb6250ab4f37103c04a8..7b3e9a300bcb26769008893eb269d53f RequestDragStart(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) RequestAdditionalItemsForDragSession(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet allowedActionsMask) diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -index dc54788b7076064e6d2fc6ca1f6050ac214ecc43..c6026ad111a3b3a88781d80e5ba5545a78edf3d4 100644 +index fdaca3bcda306311602556e63e7fe3581ce60136..2138b53e7f8c9e1b600b9ae9f3ed56521d61c248 100644 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm -@@ -808,21 +808,37 @@ String WebPage::platformUserAgent(const URL&) const +@@ -801,21 +801,37 @@ String WebPage::platformUserAgent(const URL&) const bool WebPage::hoverSupportedByPrimaryPointingDevice() const { @@ -20718,10 +20660,10 @@ index 8987c3964a9308f2454759de7f8972215a3ae416..bcac0afeb94ed8123d1f9fb0b932c849 SetProcessDPIAware(); return true; diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -index 725c6714b8f75365ba4cdb969df1bd1bbe4c69c1..562571835a5740c5df06e1bad8b6ce9077bf7d66 100644 +index 5fa2c59e5e93bc923d37ae5bb751e2f4d7fe68ee..73378254b62a7ec61b3efc3fd46aadaf45d55601 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -@@ -4189,7 +4189,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) +@@ -4189,7 +4189,7 @@ - (void)mouseDown:(WebEvent *)event _private->handlingMouseDownEvent = NO; } @@ -20734,7 +20676,7 @@ diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/ma index 59cecf9242ab834dadc904ef295365e1476f47f9..ca4cc96e62df62e92c22c3535f5972cc1fdc4cba 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm -@@ -4039,7 +4039,7 @@ IGNORE_WARNINGS_END +@@ -4039,7 +4039,7 @@ + (void)_doNotStartObservingNetworkReachability } #endif // PLATFORM(IOS_FAMILY) @@ -20743,7 +20685,7 @@ index 59cecf9242ab834dadc904ef295365e1476f47f9..ca4cc96e62df62e92c22c3535f5972cc - (NSArray *)_touchEventRegions { -@@ -4081,7 +4081,7 @@ IGNORE_WARNINGS_END +@@ -4081,7 +4081,7 @@ - (NSArray *)_touchEventRegions }).autorelease(); }