From bd08bbe1230f0b5c842aeff8c318fefcc4c1c105 Mon Sep 17 00:00:00 2001 From: Diego Pino Date: Fri, 18 Feb 2022 07:20:02 +0800 Subject: [PATCH] browser(webkit): roll to 02/17/22 (#12173) --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- browser_patches/webkit/patches/bootstrap.diff | 1055 +++++++++-------- 3 files changed, 555 insertions(+), 506 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 85238a45bc..3b9bb5c4ab 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1611 -Changed: dkolesa@igalia.com Mon Feb 7 18:16:16 CET 2022 +1612 +Changed: dpino@igalia.com Thu 17 Feb 2022 07:09:04 AM UTC diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index 5c972a934b..2eb47444b9 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="f522f6f875f2443ba32dc2cce3d8b0cfd97ffc77" +BASE_REVISION="67bba24ec7e94838cdbea3df68108e014a64d2f4" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 5c66b395fd..bcdbbd13e5 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -1,8 +1,8 @@ diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt -index 788377f671399a13b0b51531e0c29c24743db821..3ecf6ef79bc3fdb97282f8a9f0bddd85f693b639 100644 +index c04ef548ccd98cf93f1b9dc87521b850ecfa807d..c7313837c1ea29f93cb5e0ec315948e50b84511a 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1343,22 +1343,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1339,22 +1339,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -502,7 +502,7 @@ index e81573fd0fffaaf6fd2af36635c78fcdf8608c69..4169e227b5fb5a3a7fb51396c4679100 // FrontendChannel FrontendChannel::ConnectionType connectionType() const; diff --git a/Source/JavaScriptCore/inspector/protocol/DOM.json b/Source/JavaScriptCore/inspector/protocol/DOM.json -index 31ef6b8ad406d5e11a566a986bb08e7562e3dc73..be2cf97da7bd3eff027faafbeda9e0ed1b10be56 100644 +index d792b799277c6c5f00cc4fc17c7488ab7c4c25ca..df833fa57c490c4147d9acc0d0c0b12cd29c68a1 100644 --- a/Source/JavaScriptCore/inspector/protocol/DOM.json +++ b/Source/JavaScriptCore/inspector/protocol/DOM.json @@ -80,6 +80,16 @@ @@ -539,7 +539,7 @@ index 31ef6b8ad406d5e11a566a986bb08e7562e3dc73..be2cf97da7bd3eff027faafbeda9e0ed } ], "commands": [ -@@ -541,7 +561,9 @@ +@@ -558,7 +578,9 @@ "description": "Resolves JavaScript node object for given node id.", "targetTypes": ["page"], "parameters": [ @@ -550,7 +550,7 @@ index 31ef6b8ad406d5e11a566a986bb08e7562e3dc73..be2cf97da7bd3eff027faafbeda9e0ed { "name": "objectGroup", "type": "string", "optional": true, "description": "Symbolic group name that can be used to release multiple objects." } ], "returns": [ -@@ -608,6 +630,45 @@ +@@ -625,6 +647,45 @@ "parameters": [ { "name": "allow", "type": "boolean" } ] @@ -1861,7 +1861,7 @@ index 6f134e33eb8ebdd3888fdb068df7bfcd0c4225fd..1e3f2f08ee3bcb1d4a52009907a2dd9e } } // namespace JSC::Wasm diff --git a/Source/PlatformWPE.cmake b/Source/PlatformWPE.cmake -index fabd776e617d07a6c30b9f2df30f884491259359..d9c39df7db565545108c765407ce1cda544856f7 100644 +index 277feac7ce8f20ac94b6a02351f1c29f221fcef7..d9c39df7db565545108c765407ce1cda544856f7 100644 --- a/Source/PlatformWPE.cmake +++ b/Source/PlatformWPE.cmake @@ -8,32 +8,3 @@ list(APPEND DocumentationDependencies @@ -1870,10 +1870,10 @@ index fabd776e617d07a6c30b9f2df30f884491259359..d9c39df7db565545108c765407ce1cda ) - -if (ENABLE_GTKDOC) -- install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/wpe-${WPE_API_VERSION}/html/wpe-${WPE_API_VERSION} +- install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/wpe-${WPE_API_DOC_VERSION}/html/wpe-${WPE_API_DOC_VERSION} - DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html" - ) -- install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/wpe-webextensions-${WPE_API_VERSION}/html/wpe-webextensions-${WPE_API_VERSION} +- install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/wpe-webextensions-${WPE_API_DOC_VERSION}/html/wpe-webextensions-${WPE_API_DOC_VERSION} - DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html" - ) -endif () @@ -1925,10 +1925,10 @@ index be86666961906832f585adb43edeb381ad199222..23b1fd28ee684537fcbcc9c671e2bff8 Source/third_party/opus/src/celt Source/third_party/opus/src/include diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -index ca5473a62ad98bf6b4e0ceb602885645d90f7d23..d2808ac22cfa34f15662941d2dcba7abe4a80d7d 100644 +index 2a57dca5af38edf3e3a0e9a4efef64c8a63e9e6c..5ef0a4e3cb7dd2db50d55d0a7a42b717ed07f339 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp -@@ -332,3 +332,23 @@ __ZNK3rtc14RTCCertificate17GetSSLCertificateEv +@@ -335,3 +335,23 @@ __ZNK3rtc14RTCCertificate17GetSSLCertificateEv __ZTVN6webrtc30WrappingAsyncDnsResolverResultE __ZN6webrtc20pixelBufferFromFrameERKNS_10VideoFrameE __ZN6webrtc14copyVideoFrameERKNS_10VideoFrameEPh @@ -1953,10 +1953,10 @@ index ca5473a62ad98bf6b4e0ceb602885645d90f7d23..d2808ac22cfa34f15662941d2dcba7ab +_vpx_codec_version_str +_vpx_codec_vp8_cx diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig -index 2ee75dd5ff6bb1a30bd27c28600210f70beb17f8..1ad9a018d3431aa1e877983a55578296302b0ae7 100644 +index 18c86b76735a4d8458467e4b96ce0c452232bb3a..aebc45d2f61413fc7a4cd0cac0f82b5e53e93673 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig -@@ -46,7 +46,7 @@ DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(DYLIB_INSTALL_NAME_BASE); +@@ -46,7 +46,7 @@ DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(NORMAL_WEBCORE_FRAMEWORKS DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; @@ -2048,7 +2048,7 @@ index 447a02d3cd2802e028ec16d549654a06adcaaae5..bf576a79f103fe43e375df9be49e0f6e 41323A1D2665288B00B38623 /* packet_sequencer.cc in Sources */, 4131BF2D234B88200028A615 /* rtc_stats_collector.cc in Sources */, diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -index e79c7d92d128a8668f34c32418539146331f2ece..01b4985add6381a37d6bbfe7cb44f1f20f44b3e6 100644 +index 4aa67a3129804da9ff8e6a4494596c4661ff9e16..4fcf5dd448703b5d6a2d738f3cd5c88e4a0de6ac 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml @@ -995,7 +995,7 @@ InspectorStartsAttached: @@ -2060,7 +2060,7 @@ index e79c7d92d128a8668f34c32418539146331f2ece..01b4985add6381a37d6bbfe7cb44f1f2 InspectorWindowFrame: type: String -@@ -1735,6 +1735,17 @@ PluginsEnabled: +@@ -1775,6 +1775,17 @@ PluginsEnabled: WebCore: default: false @@ -2079,7 +2079,7 @@ index e79c7d92d128a8668f34c32418539146331f2ece..01b4985add6381a37d6bbfe7cb44f1f2 type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 5b4d3b625717532554f3ad72a4db45a69eca85e6..30c6a502efdbf0fe619e7ddf2239f1535078958a 100644 +index e3ce812b93f75329a9dc9370ee7c3ca568a7c863..20487ddd08f4ef7cbfb7fd4c88e028476b3e1077 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -455,7 +455,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2103,7 +2103,7 @@ index 5b4d3b625717532554f3ad72a4db45a69eca85e6..30c6a502efdbf0fe619e7ddf2239f153 # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -1314,7 +1314,7 @@ SpeechRecognitionEnabled: +@@ -1316,7 +1316,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2247,10 +2247,10 @@ index 07ddf3854633cb5e4ca9679359c048f13395e4ab..a0be72ba35e7afa09e8ea5976ebf600b WTF_EXPORT_PRIVATE LocalTimeOffset calculateLocalTimeOffset(double utcInMilliseconds, TimeType = UTCTime); diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index 664b0e29f6ba3ce4826e5109d73f86cc9bc6adfd..95e9875d933ff7b9219b2a1d89029b8aede0a73c 100644 +index f541ff99b9453c2dbef4ed3a28453e7c84986897..3f4841caee0df98920dcab3a19fd9561c7d62164 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h -@@ -412,7 +412,7 @@ +@@ -416,7 +416,7 @@ #endif #if !defined(ENABLE_ORIENTATION_EVENTS) @@ -2259,7 +2259,7 @@ index 664b0e29f6ba3ce4826e5109d73f86cc9bc6adfd..95e9875d933ff7b9219b2a1d89029b8a #endif #if OS(WINDOWS) -@@ -473,7 +473,7 @@ +@@ -477,7 +477,7 @@ #endif #if !defined(ENABLE_TOUCH_EVENTS) @@ -2269,7 +2269,7 @@ index 664b0e29f6ba3ce4826e5109d73f86cc9bc6adfd..95e9875d933ff7b9219b2a1d89029b8a #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index 760bc70fee671a73d8cb302cef9480072dbab937..f282ad28a5d857b064eca9c123ecf5fdd9da63c6 100644 +index 057e661a95cf144a01fafb058aa3f213df7c7b99..2268fc8e2a28356918a3189c5c990c1767afd758 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h @@ -215,7 +215,7 @@ @@ -2294,10 +2294,10 @@ index 3901bfb0f5479064f4e7b67c90621ff26d74b580..5b3615a871d0d7123822394c94d5ce10 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 70ca32462835341f4966ada7fbe0875868788773..0266b7b3633c684ae2d6a17fcf9853b05b38b894 100644 +index 25826f61c90738f43470e41ec2e6f186e386b9ef..d7ca54fc0637144531f39cb00e915eaae66b3e7a 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h -@@ -397,7 +397,7 @@ +@@ -404,7 +404,7 @@ #define HAVE_FOUNDATION_WITH_SAME_SITE_COOKIE_SUPPORT 1 #endif @@ -2319,10 +2319,10 @@ index f8bedf1af5d20d9c93a96af565e416bfb0df6faa..a072e5e130822d3658cbab453aef8d16 if (Journald_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index 21a65b9313ae7c53bb158043f5473d29bdf0270e..28ea88e58665703e7b155ec8df65adbf3acf7bfd 100644 +index 87dba79878efbcec50015905cdc7ef630ed4d3ce..bf7a979aa5d66b1e8db266d36294e2c240c19109 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -958,6 +958,10 @@ JS_BINDING_IDLS := \ +@@ -960,6 +960,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2333,7 +2333,7 @@ index 21a65b9313ae7c53bb158043f5473d29bdf0270e..28ea88e58665703e7b155ec8df65adbf $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1500,9 +1504,6 @@ JS_BINDING_IDLS := \ +@@ -1502,9 +1506,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2408,10 +2408,10 @@ index bc5c6219b5dadc3b1cdc590d65c897b7250b1e21..37d07ef4f59ad450077d90d451cf5120 _hasSentSpeechStart = true; _delegateCallback(SpeechRecognitionUpdate::create(_identifier, SpeechRecognitionUpdateType::SpeechStart)); diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake -index bd3dead9cece47e9af0cc5b4ad188d74aabb8fcb..46a89056a878c8c4f015257df69629e76ba3f697 100644 +index 03e96a72e1e763255646a96303fad389577ec116..ca2be7461da997b6eb25b3ab64b54bd2cdf870d9 100644 --- a/Source/WebCore/PlatformWPE.cmake +++ b/Source/WebCore/PlatformWPE.cmake -@@ -48,6 +48,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS +@@ -49,6 +49,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS platform/graphics/wayland/PlatformDisplayWayland.h platform/graphics/wayland/WlUniquePtr.h @@ -2420,13 +2420,13 @@ index bd3dead9cece47e9af0cc5b4ad188d74aabb8fcb..46a89056a878c8c4f015257df69629e7 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 33a896520f78d5b83cb84f181fa76be3e1054942..04bcc6b5170cba64c90c43a500fb3e969325bfae 100644 +index ccb086858c1c9cc311a87fb39588768881090ee7..0eb7ae3219fa283b2dd083b6b3a1d64219415c74 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -617,3 +617,9 @@ platform/graphics/angle/ANGLEUtilities.cpp @no-unify - platform/graphics/angle/ExtensionsGLANGLE.cpp @no-unify - platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify - platform/graphics/angle/TemporaryANGLESetting.cpp @no-unify +@@ -620,3 +620,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 + +// Playwright begin +JSTouch.cpp @@ -2434,12 +2434,12 @@ index 33a896520f78d5b83cb84f181fa76be3e1054942..04bcc6b5170cba64c90c43a500fb3e96 +JSTouchList.cpp +// Playwright end diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt -index 733a99236ad1ceb964471b218f04d08ec6c8f168..16e7ec8087f3a8b3d1cf84e00720fa49042ac4ca 100644 +index c7044912d31213df8355bf1605abbcf54db8ca7c..4e30335cfad9ed79b0573731f52412cbb9d26b36 100644 --- a/Source/WebCore/SourcesGTK.txt +++ b/Source/WebCore/SourcesGTK.txt -@@ -101,7 +101,7 @@ platform/graphics/egl/GLContextEGLLibWPE.cpp @no-unify - platform/graphics/egl/GLContextEGLWayland.cpp @no-unify - platform/graphics/egl/GLContextEGLX11.cpp @no-unify +@@ -103,7 +103,7 @@ platform/graphics/egl/GLContextEGLX11.cpp @no-unify + + platform/graphics/gbm/GBMDevice.cpp -platform/graphics/glx/GLContextGLX.cpp +platform/graphics/glx/GLContextGLX.cpp @no-unify @@ -2447,7 +2447,7 @@ index 733a99236ad1ceb964471b218f04d08ec6c8f168..16e7ec8087f3a8b3d1cf84e00720fa49 platform/graphics/gtk/ColorGtk.cpp platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt -index b9410ccb53442e4a82ae49ea9c8a104ab48cb517..b527f673e23a817274af7718f541c14bde15fd5a 100644 +index 57fa7ca67c4dea4a9e5b9845e72ae25873d8cf55..80b49517655ef1dae7f6e21c3672431d90c7ecf0 100644 --- a/Source/WebCore/SourcesWPE.txt +++ b/Source/WebCore/SourcesWPE.txt @@ -61,6 +61,8 @@ editing/libwpe/EditorLibWPE.cpp @@ -2459,7 +2459,7 @@ index b9410ccb53442e4a82ae49ea9c8a104ab48cb517..b527f673e23a817274af7718f541c14b page/linux/ResourceUsageOverlayLinux.cpp page/linux/ResourceUsageThreadLinux.cpp -@@ -102,8 +104,12 @@ platform/text/LocaleICU.cpp +@@ -104,8 +106,12 @@ platform/text/LocaleICU.cpp platform/unix/LoggingUnix.cpp @@ -2485,10 +2485,10 @@ index c4898d6db6bf06552f602c4b7f0a7267e64e44f4..7cf2e30729671a89c373870c5691d337 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index c5f44ef04a7058b19b24c85d11d63d9454e3db0c..319dc3d3e3c49e73c9b04f9c978a3a6667584258 100644 +index 97f8145694580de4bc0ab7a02286883282e6b155..c829fd58084ca68830f598b62bb1e7a6676513ec 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5485,6 +5485,13 @@ +@@ -5500,6 +5500,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, ); }; }; @@ -2502,7 +2502,7 @@ index c5f44ef04a7058b19b24c85d11d63d9454e3db0c..319dc3d3e3c49e73c9b04f9c978a3a66 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, ); }; }; -@@ -17731,6 +17738,14 @@ +@@ -17771,6 +17778,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 = ""; }; @@ -2517,7 +2517,7 @@ index c5f44ef04a7058b19b24c85d11d63d9454e3db0c..319dc3d3e3c49e73c9b04f9c978a3a66 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 = ""; }; -@@ -24064,7 +24079,12 @@ +@@ -24129,7 +24144,12 @@ 93D6B7A62551D3ED0058DD3A /* DummySpeechRecognitionProvider.h */, 1AF326770D78B9440068F0C4 /* EditorClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2530,7 +2530,7 @@ index c5f44ef04a7058b19b24c85d11d63d9454e3db0c..319dc3d3e3c49e73c9b04f9c978a3a66 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -30025,6 +30045,8 @@ +@@ -30082,6 +30102,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2539,7 +2539,7 @@ index c5f44ef04a7058b19b24c85d11d63d9454e3db0c..319dc3d3e3c49e73c9b04f9c978a3a66 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32334,6 +32356,7 @@ +@@ -32401,6 +32423,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2547,7 +2547,7 @@ index c5f44ef04a7058b19b24c85d11d63d9454e3db0c..319dc3d3e3c49e73c9b04f9c978a3a66 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -33345,6 +33368,7 @@ +@@ -33412,6 +33435,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2555,7 +2555,7 @@ index c5f44ef04a7058b19b24c85d11d63d9454e3db0c..319dc3d3e3c49e73c9b04f9c978a3a66 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -35470,6 +35494,7 @@ +@@ -35541,6 +35565,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2563,7 +2563,7 @@ index c5f44ef04a7058b19b24c85d11d63d9454e3db0c..319dc3d3e3c49e73c9b04f9c978a3a66 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -36581,6 +36606,7 @@ +@@ -36652,6 +36677,7 @@ 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, @@ -2571,23 +2571,23 @@ index c5f44ef04a7058b19b24c85d11d63d9454e3db0c..319dc3d3e3c49e73c9b04f9c978a3a66 CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, CD1F9B032700323D00617EB6 /* PlatformVideoMatrixCoefficients.h in Headers */, -@@ -38619,6 +38645,7 @@ +@@ -38720,6 +38746,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, + F050E17423AD6A800011CE47 /* DocumentTouch.cpp in Sources */, - 6E72F54C229DCD0C00B3E151 /* ExtensionsGLANGLE.cpp in Sources */, 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, -@@ -38691,6 +38718,7 @@ - 6E72F54F229DCD1300B3E151 /* TemporaryANGLESetting.cpp in Sources */, + 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, +@@ -38793,6 +38820,7 @@ + C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, + F050E17123AD669F0011CE47 /* TouchEvent.cpp in Sources */, 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -38739,6 +38767,7 @@ +@@ -38841,6 +38869,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2595,7 +2595,7 @@ index c5f44ef04a7058b19b24c85d11d63d9454e3db0c..319dc3d3e3c49e73c9b04f9c978a3a66 DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -39271,6 +39300,7 @@ +@@ -39373,6 +39402,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2604,7 +2604,7 @@ index c5f44ef04a7058b19b24c85d11d63d9454e3db0c..319dc3d3e3c49e73c9b04f9c978a3a66 2D8B92F5203D13E1009C868F /* UnifiedSource520.cpp in Sources */, 2D8B92F6203D13E1009C868F /* UnifiedSource521.cpp in Sources */, diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp -index ed1c65b61c0eed1be35c8d2d6641887c74cafd80..ed5d78d7c073f8647311d3be6600b30c16357b2e 100644 +index 82770a7f2d66f781b8c7363ce970aab548e89a3b..f36ae22439c760208eba7a7ea06c0df5f5f325c9 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2615,13 +2615,11 @@ index ed1c65b61c0eed1be35c8d2d6641887c74cafd80..ed5d78d7c073f8647311d3be6600b30c #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3617,10 +3618,15 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const - - if (useParentData ? m_isIgnoredFromParentData.isPresentationalChildOfAriaRole : isPresentationalChildOfAriaRole()) - return AccessibilityObjectInclusion::IgnoreObject; -- +@@ -3626,9 +3627,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const + if (roleValue() == AccessibilityRole::ApplicationDialog) + return AccessibilityObjectInclusion::IncludeObject; + - return accessibilityPlatformIncludesObject(); -+ + AccessibilityObjectInclusion platformBehavior = accessibilityPlatformIncludesObject(); + if (platformBehavior != AccessibilityObjectInclusion::DefaultBehavior) { + if (auto* page = this->page()) @@ -2635,18 +2633,18 @@ index ed1c65b61c0eed1be35c8d2d6641887c74cafd80..ed5d78d7c073f8647311d3be6600b30c { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index 153766e6b03376d723128166a61b3f45fbb05962..0272ed7266a896fb53594968fa8dfde3c01d8aaf 100644 +index 632190ae73d71caed24cf043de0efe1e495e6e3f..f9e0feb6a03f7a24c49d2a6470f4290f5a41cae3 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -@@ -109,6 +109,8 @@ namespace WebCore { - macro(Database) \ +@@ -122,6 +122,8 @@ namespace WebCore { macro(DataTransferItem) \ macro(DataTransferItemList) \ + macro(DelayNode) \ + macro(DeviceMotionEvent) \ + macro(DeviceOrientationEvent) \ macro(DocumentTimeline) \ + macro(DynamicsCompressorNode) \ macro(EnterPictureInPictureEvent) \ - macro(ExtendableEvent) \ diff --git a/Source/WebCore/css/MediaQueryEvaluator.cpp b/Source/WebCore/css/MediaQueryEvaluator.cpp index 345cc24534bc0451867035faa033bdf5cd0604f6..59f4a45331219709e98bbc35c479e78b4726714b 100644 --- a/Source/WebCore/css/MediaQueryEvaluator.cpp @@ -2672,27 +2670,6 @@ index 345cc24534bc0451867035faa033bdf5cd0604f6..59f4a45331219709e98bbc35c479e78b if (!value) return userPrefersReducedMotion; -diff --git a/Source/WebCore/dom/AbortSignal.cpp b/Source/WebCore/dom/AbortSignal.cpp -index 1270ee722c6bb40b414e2e636da14e00622f3672..a13bcc589cdd4d60fe860c43974ca41cb8b6a798 100644 ---- a/Source/WebCore/dom/AbortSignal.cpp -+++ b/Source/WebCore/dom/AbortSignal.cpp -@@ -34,6 +34,7 @@ - #include "JSDOMException.h" - #include "ScriptExecutionContext.h" - #include -+#include - #include - - namespace WebCore { -@@ -62,7 +63,7 @@ Ref AbortSignal::timeout(ScriptExecutionContext& context, uint64_t - auto action = [signal](ScriptExecutionContext& context) mutable { - signal->setHasActiveTimeoutTimer(false); - -- auto* globalObject = jsCast(context.globalObject()); -+ auto* globalObject = JSC::jsCast(context.globalObject()); - if (!globalObject) - return; - diff --git a/Source/WebCore/dom/DataTransfer.cpp b/Source/WebCore/dom/DataTransfer.cpp index 86ab889bc0ea15a547357fb64dff9f10b862dc54..ec5f9a66c29431a1bbf24c4013e45042d584965c 100644 --- a/Source/WebCore/dom/DataTransfer.cpp @@ -2727,7 +2704,7 @@ index b084ee416512652220e43a6d4bcccaff7c666d5a..b250f3d0161817efef7e2634a16713b0 static Ref createForDrop(const Document&, std::unique_ptr&&, OptionSet, bool draggingFiles); static Ref createForUpdatingDropTarget(const Document&, std::unique_ptr&&, OptionSet, bool draggingFiles); diff --git a/Source/WebCore/dom/DeviceMotionEvent.idl b/Source/WebCore/dom/DeviceMotionEvent.idl -index fca03d4c02903b5992884c108c317a65160e924f..f42d3f0d7024677e296fba281076c521166ba36e 100644 +index e1a23ca36baf5a6b31653af491b7d9213836b298..1c8b700ad4de11686cfaa633500f8f375dc248a3 100644 --- a/Source/WebCore/dom/DeviceMotionEvent.idl +++ b/Source/WebCore/dom/DeviceMotionEvent.idl @@ -25,6 +25,7 @@ @@ -2739,7 +2716,7 @@ index fca03d4c02903b5992884c108c317a65160e924f..f42d3f0d7024677e296fba281076c521 ] interface DeviceMotionEvent : Event { readonly attribute Acceleration? acceleration; diff --git a/Source/WebCore/dom/DeviceOrientationEvent.idl b/Source/WebCore/dom/DeviceOrientationEvent.idl -index 905bb471d59c7d86a86aa3da193f98506971d3f5..9fd2bba81e821cba25da66a1c1838f1d26fdd109 100644 +index 085eedc5a342543362b811f8018da6bffec982c8..d55ecf7465bd00c01355a6809cb8b2a502bb6af3 100644 --- a/Source/WebCore/dom/DeviceOrientationEvent.idl +++ b/Source/WebCore/dom/DeviceOrientationEvent.idl @@ -25,6 +25,7 @@ @@ -2884,7 +2861,7 @@ index 9d60b85152f378566118574663701c25b001df3d..9811ce9aa6f066c57acf65f629d2ab81 #endif diff --git a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp b/Source/WebCore/editing/libwpe/EditorLibWPE.cpp -index 8595ed1ddf389711422e453988dbbc3de5de8703..8e5f3aef9846a4b82a95ef0081d588b6878b3f78 100644 +index b978e2e8f8e882bbc7d0f91cad76c382508e9a3f..ba014f922a36f0fa6005b4b0bb0d3b4d2bece0c1 100644 --- a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp +++ b/Source/WebCore/editing/libwpe/EditorLibWPE.cpp @@ -33,6 +33,7 @@ @@ -2895,7 +2872,7 @@ index 8595ed1ddf389711422e453988dbbc3de5de8703..8e5f3aef9846a4b82a95ef0081d588b6 #include "markup.h" namespace WebCore { -@@ -99,6 +100,14 @@ void Editor::platformPasteFont() +@@ -98,6 +99,14 @@ void Editor::platformPasteFont() { } @@ -2935,10 +2912,10 @@ index a2377bc1f2b46aa4f48816fc37061e09a49c9762..2a93fc1b820e6ac2e0d071b4b7197fca return; diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp -index 0ea5d77fe5a35f8bcaa51b363a58db1ee0386376..75e29876dbf8812fc0b402ed9bc71f07af1b1ad9 100644 +index ea02ba6e973b974da0c4a2985ed057a6c62f2b37..559b14d71f32a086d2631eee7880880c9b341a00 100644 --- a/Source/WebCore/inspector/InspectorController.cpp +++ b/Source/WebCore/inspector/InspectorController.cpp -@@ -387,8 +387,8 @@ void InspectorController::inspect(Node* node) +@@ -392,8 +392,8 @@ void InspectorController::inspect(Node* node) if (!enabled()) return; @@ -2949,7 +2926,7 @@ index 0ea5d77fe5a35f8bcaa51b363a58db1ee0386376..75e29876dbf8812fc0b402ed9bc71f07 ensureDOMAgent().inspect(node); } -@@ -529,4 +529,24 @@ void InspectorController::didComposite(Frame& frame) +@@ -534,4 +534,24 @@ void InspectorController::didComposite(Frame& frame) InspectorInstrumentation::didComposite(frame); } @@ -2975,7 +2952,7 @@ index 0ea5d77fe5a35f8bcaa51b363a58db1ee0386376..75e29876dbf8812fc0b402ed9bc71f07 + } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorController.h b/Source/WebCore/inspector/InspectorController.h -index 7e8752d156bd0aec787eb1c056be11f37cb16b9e..af1464e343dab656d0c817a92beca1fa2305cde2 100644 +index 4d5a3859ec6a46d07d45c80a3b5870ee2ef13d36..75eb55a024a6ae3892a4fedc535bf6a647cc3bc7 100644 --- a/Source/WebCore/inspector/InspectorController.h +++ b/Source/WebCore/inspector/InspectorController.h @@ -101,6 +101,10 @@ public: @@ -2989,7 +2966,7 @@ index 7e8752d156bd0aec787eb1c056be11f37cb16b9e..af1464e343dab656d0c817a92beca1fa // Testing support. WEBCORE_EXPORT bool isUnderTest() const; void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; } -@@ -153,6 +157,7 @@ private: +@@ -154,6 +158,7 @@ private: bool m_isAutomaticInspection { false }; bool m_pauseAfterInitialization = { false }; bool m_didCreateLazyAgents { false }; @@ -2998,7 +2975,7 @@ index 7e8752d156bd0aec787eb1c056be11f37cb16b9e..af1464e343dab656d0c817a92beca1fa } // namespace WebCore diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp -index fa92adcea9ef8572e2aa853a2072cc645fac10fd..dc994c365d50712a9bd208a33f26f21daebbc82a 100644 +index f96f40cf38395152ec33c48c7a0c4723dfa0c573..d89d2e4bd9e8b4ed3e17e6b73f25062ef2cc99b7 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.cpp +++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp @@ -572,6 +572,13 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i @@ -3015,7 +2992,7 @@ index fa92adcea9ef8572e2aa853a2072cc645fac10fd..dc994c365d50712a9bd208a33f26f21d void InspectorInstrumentation::applyEmulatedMediaImpl(InstrumentingAgents& instrumentingAgents, String& media) { if (auto* pageAgent = instrumentingAgents.enabledPageAgent()) -@@ -639,6 +646,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen +@@ -651,6 +658,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this. } @@ -3028,7 +3005,7 @@ index fa92adcea9ef8572e2aa853a2072cc645fac10fd..dc994c365d50712a9bd208a33f26f21d void InspectorInstrumentation::willLoadXHRSynchronouslyImpl(InstrumentingAgents& instrumentingAgents) { if (auto* networkAgent = instrumentingAgents.enabledNetworkAgent()) -@@ -671,20 +684,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents& +@@ -683,20 +696,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents& void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) { @@ -3052,7 +3029,7 @@ index fa92adcea9ef8572e2aa853a2072cc645fac10fd..dc994c365d50712a9bd208a33f26f21d } void InspectorInstrumentation::frameDetachedFromParentImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) -@@ -765,12 +775,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins +@@ -777,12 +787,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins pageDOMDebuggerAgent->frameDocumentUpdated(frame); } @@ -3065,7 +3042,7 @@ index fa92adcea9ef8572e2aa853a2072cc645fac10fd..dc994c365d50712a9bd208a33f26f21d void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame) { if (frame.isMainFrame()) { -@@ -807,6 +811,12 @@ void InspectorInstrumentation::frameClearedScheduledNavigationImpl(Instrumenting +@@ -819,6 +823,12 @@ void InspectorInstrumentation::frameClearedScheduledNavigationImpl(Instrumenting inspectorPageAgent->frameClearedScheduledNavigation(frame); } @@ -3078,7 +3055,7 @@ index fa92adcea9ef8572e2aa853a2072cc645fac10fd..dc994c365d50712a9bd208a33f26f21d #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) void InspectorInstrumentation::defaultAppearanceDidChangeImpl(InstrumentingAgents& instrumentingAgents, bool useDarkAppearance) { -@@ -1289,6 +1299,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins +@@ -1301,6 +1311,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins layerTreeAgent->renderLayerDestroyed(renderLayer); } @@ -3115,7 +3092,7 @@ index fa92adcea9ef8572e2aa853a2072cc645fac10fd..dc994c365d50712a9bd208a33f26f21d InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(WorkerOrWorkletGlobalScope& globalScope) { return globalScope.inspectorController().m_instrumentingAgents; -@@ -1300,6 +1340,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page) +@@ -1312,6 +1352,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page) return page.inspectorController().m_instrumentingAgents.get(); } @@ -3130,7 +3107,7 @@ index fa92adcea9ef8572e2aa853a2072cc645fac10fd..dc994c365d50712a9bd208a33f26f21d { if (is(context)) diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h -index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd726e8b12e0 100644 +index b61f6a0dcab296bbacbc125caac03586e9c197f0..f2e12e0ac0bdeab14414d3c77ec64dd041f9a5e3 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.h +++ b/Source/WebCore/inspector/InspectorInstrumentation.h @@ -31,6 +31,7 @@ @@ -3164,8 +3141,8 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 + static void applyPlatformOverride(Frame&, String&); static void applyEmulatedMedia(Frame&, String&); - static void willSendRequest(Frame*, ResourceLoaderIdentifier, DocumentLoader*, ResourceRequest&, const ResourceResponse& redirectResponse, const CachedResource*); -@@ -198,6 +202,7 @@ public: + static void flexibleBoxRendererBeganLayout(const RenderObject&); +@@ -201,6 +205,7 @@ public: static void didReceiveData(Frame*, ResourceLoaderIdentifier, const SharedBuffer&, int encodedDataLength); static void didFinishLoading(Frame*, DocumentLoader*, ResourceLoaderIdentifier, const NetworkLoadMetrics&, ResourceLoader*); static void didFailLoading(Frame*, DocumentLoader*, ResourceLoaderIdentifier, const ResourceError&); @@ -3173,7 +3150,7 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 static void willSendRequest(WorkerOrWorkletGlobalScope&, ResourceLoaderIdentifier, ResourceRequest&); static void didReceiveResourceResponse(WorkerOrWorkletGlobalScope&, ResourceLoaderIdentifier, const ResourceResponse&); -@@ -224,11 +229,11 @@ public: +@@ -227,11 +232,11 @@ public: static void frameDetachedFromParent(Frame&); static void didCommitLoad(Frame&, DocumentLoader*); static void frameDocumentUpdated(Frame&); @@ -3186,7 +3163,7 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) static void defaultAppearanceDidChange(Page&, bool useDarkAppearance); #endif -@@ -315,6 +320,12 @@ public: +@@ -318,6 +323,12 @@ public: static void layerTreeDidChange(Page*); static void renderLayerDestroyed(Page*, const RenderLayer&); @@ -3199,7 +3176,7 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 static void frontendCreated(); static void frontendDeleted(); static bool hasFrontends() { return InspectorInstrumentationPublic::hasFrontends(); } -@@ -331,6 +342,8 @@ public: +@@ -334,6 +345,8 @@ public: static void registerInstrumentingAgents(InstrumentingAgents&); static void unregisterInstrumentingAgents(InstrumentingAgents&); @@ -3208,15 +3185,15 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 private: static void didClearWindowObjectInWorldImpl(InstrumentingAgents&, Frame&, DOMWrapperWorld&); static bool isDebuggerPausedImpl(InstrumentingAgents&); -@@ -408,6 +421,7 @@ private: +@@ -411,6 +424,7 @@ private: static void didRecalculateStyleImpl(InstrumentingAgents&); static void didScheduleStyleRecalculationImpl(InstrumentingAgents&, Document&); static void applyUserAgentOverrideImpl(InstrumentingAgents&, String&); + static void applyPlatformOverrideImpl(InstrumentingAgents&, String&); static void applyEmulatedMediaImpl(InstrumentingAgents&, String&); - static void willSendRequestImpl(InstrumentingAgents&, ResourceLoaderIdentifier, DocumentLoader*, ResourceRequest&, const ResourceResponse& redirectResponse, const CachedResource*); -@@ -419,6 +433,7 @@ private: + static void flexibleBoxRendererBeganLayoutImpl(InstrumentingAgents&, const RenderObject&); +@@ -425,6 +439,7 @@ private: static void didReceiveDataImpl(InstrumentingAgents&, ResourceLoaderIdentifier, const SharedBuffer&, int encodedDataLength); static void didFinishLoadingImpl(InstrumentingAgents&, ResourceLoaderIdentifier, DocumentLoader*, const NetworkLoadMetrics&, ResourceLoader*); static void didFailLoadingImpl(InstrumentingAgents&, ResourceLoaderIdentifier, DocumentLoader*, const ResourceError&); @@ -3224,7 +3201,7 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 static void willLoadXHRSynchronouslyImpl(InstrumentingAgents&); static void didLoadXHRSynchronouslyImpl(InstrumentingAgents&); static void scriptImportedImpl(InstrumentingAgents&, ResourceLoaderIdentifier, const String& sourceString); -@@ -429,11 +444,11 @@ private: +@@ -435,11 +450,11 @@ private: static void frameDetachedFromParentImpl(InstrumentingAgents&, Frame&); static void didCommitLoadImpl(InstrumentingAgents&, Frame&, DocumentLoader*); static void frameDocumentUpdatedImpl(InstrumentingAgents&, Frame&); @@ -3237,7 +3214,7 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) static void defaultAppearanceDidChangeImpl(InstrumentingAgents&, bool useDarkAppearance); #endif -@@ -515,6 +530,12 @@ private: +@@ -521,6 +536,12 @@ private: static void layerTreeDidChangeImpl(InstrumentingAgents&); static void renderLayerDestroyedImpl(InstrumentingAgents&, const RenderLayer&); @@ -3250,7 +3227,7 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 static InstrumentingAgents& instrumentingAgents(Page&); static InstrumentingAgents& instrumentingAgents(WorkerOrWorkletGlobalScope&); -@@ -1033,6 +1054,13 @@ inline void InspectorInstrumentation::applyUserAgentOverride(Frame& frame, Strin +@@ -1039,6 +1060,13 @@ inline void InspectorInstrumentation::applyUserAgentOverride(Frame& frame, Strin applyUserAgentOverrideImpl(*agents, userAgent); } @@ -3264,7 +3241,7 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 inline void InspectorInstrumentation::applyEmulatedMedia(Frame& frame, String& media) { FAST_RETURN_IF_NO_FRONTENDS(void()); -@@ -1121,6 +1149,13 @@ inline void InspectorInstrumentation::didFailLoading(WorkerOrWorkletGlobalScope& +@@ -1141,6 +1169,13 @@ inline void InspectorInstrumentation::didFailLoading(WorkerOrWorkletGlobalScope& didFailLoadingImpl(instrumentingAgents(globalScope), identifier, nullptr, error); } @@ -3278,7 +3255,7 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 inline void InspectorInstrumentation::continueAfterXFrameOptionsDenied(Frame& frame, ResourceLoaderIdentifier identifier, DocumentLoader& loader, const ResourceResponse& response) { // Treat the same as didReceiveResponse. -@@ -1211,13 +1246,6 @@ inline void InspectorInstrumentation::frameDocumentUpdated(Frame& frame) +@@ -1231,13 +1266,6 @@ inline void InspectorInstrumentation::frameDocumentUpdated(Frame& frame) frameDocumentUpdatedImpl(*agents, frame); } @@ -3292,7 +3269,7 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 inline void InspectorInstrumentation::frameStartedLoading(Frame& frame) { FAST_RETURN_IF_NO_FRONTENDS(void()); -@@ -1246,6 +1274,13 @@ inline void InspectorInstrumentation::frameClearedScheduledNavigation(Frame& fra +@@ -1266,6 +1294,13 @@ inline void InspectorInstrumentation::frameClearedScheduledNavigation(Frame& fra frameClearedScheduledNavigationImpl(*agents, frame); } @@ -3306,7 +3283,7 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) inline void InspectorInstrumentation::defaultAppearanceDidChange(Page& page, bool useDarkAppearance) { -@@ -1676,6 +1711,42 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren +@@ -1696,6 +1731,42 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren renderLayerDestroyedImpl(*agents, renderLayer); } @@ -3350,7 +3327,7 @@ index 777a7ed4c082bd24ef719956e2a653744e0755f3..ec2d0dafb058d56955c5f5309379cd72 { return context ? instrumentingAgents(*context) : nullptr; diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp -index f2eeb4979b81480cfe751f94ec108bf51f576e4b..ff2a10d2456ba56079cba29adf48c1c27defc5ee 100644 +index 4735111adac014387125bc5f17c842e1d4d946f8..266fbf8659fb5b70b63ef1ca909bf6680dd521e1 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp @@ -62,12 +62,16 @@ @@ -3370,12 +3347,12 @@ index f2eeb4979b81480cfe751f94ec108bf51f576e4b..ff2a10d2456ba56079cba29adf48c1c2 #include "HTMLMediaElement.h" #include "HTMLNames.h" #include "HTMLParserIdioms.h" -@@ -95,11 +99,14 @@ +@@ -95,12 +99,14 @@ #include "Pasteboard.h" #include "PseudoElement.h" #include "RenderGrid.h" +#include "RenderLayer.h" -+#include "RenderObject.h" + #include "RenderObject.h" #include "RenderStyle.h" #include "RenderStyleConstants.h" #include "ScriptController.h" @@ -3385,7 +3362,7 @@ index f2eeb4979b81480cfe751f94ec108bf51f576e4b..ff2a10d2456ba56079cba29adf48c1c2 #include "StaticNodeList.h" #include "StyleProperties.h" #include "StyleResolver.h" -@@ -133,7 +140,8 @@ using namespace HTMLNames; +@@ -134,7 +140,8 @@ using namespace HTMLNames; static const size_t maxTextSize = 10000; static const UChar ellipsisUChar[] = { 0x2026, 0 }; @@ -3395,7 +3372,7 @@ index f2eeb4979b81480cfe751f94ec108bf51f576e4b..ff2a10d2456ba56079cba29adf48c1c2 { if (!colorObject) return std::nullopt; -@@ -152,7 +160,7 @@ static std::optional parseColor(RefPtr&& colorObject) +@@ -153,7 +160,7 @@ static std::optional parseColor(RefPtr&& colorObject) static Color parseConfigColor(const String& fieldName, JSON::Object& configObject) { @@ -3404,7 +3381,7 @@ index f2eeb4979b81480cfe751f94ec108bf51f576e4b..ff2a10d2456ba56079cba29adf48c1c2 } static bool parseQuad(Ref&& quadArray, FloatQuad* quad) -@@ -433,6 +441,20 @@ Node* InspectorDOMAgent::assertNode(Protocol::ErrorString& errorString, Protocol +@@ -440,6 +447,20 @@ Node* InspectorDOMAgent::assertNode(Protocol::ErrorString& errorString, Protocol return node; } @@ -3425,7 +3402,7 @@ index f2eeb4979b81480cfe751f94ec108bf51f576e4b..ff2a10d2456ba56079cba29adf48c1c2 Document* InspectorDOMAgent::assertDocument(Protocol::ErrorString& errorString, Protocol::DOM::NodeId nodeId) { Node* node = assertNode(errorString, nodeId); -@@ -1419,16 +1441,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::highlightSelector(Ref InspectorDOMAgent::highlightSelector(Ref InspectorDOMAgent::highlightNode(Ref&& highlightInspectorObject, std::optional&& nodeId, const Protocol::Runtime::RemoteObjectId& objectId) { Protocol::ErrorString errorString; @@ -3443,7 +3420,7 @@ index f2eeb4979b81480cfe751f94ec108bf51f576e4b..ff2a10d2456ba56079cba29adf48c1c2 if (!node) return makeUnexpected(errorString); -@@ -1630,15 +1643,136 @@ Protocol::ErrorStringOr InspectorDOMAgent::setInspectedNode(Protocol::DOM: +@@ -1672,15 +1684,136 @@ Protocol::ErrorStringOr InspectorDOMAgent::setInspectedNode(Protocol::DOM: return { }; } @@ -3584,7 +3561,7 @@ index f2eeb4979b81480cfe751f94ec108bf51f576e4b..ff2a10d2456ba56079cba29adf48c1c2 if (!object) return makeUnexpected("Missing injected script for given nodeId"_s); -@@ -2876,7 +3010,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::pushNodeByPath +@@ -2935,7 +3068,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::pushNodeByPath return makeUnexpected("Missing node for given path"_s); } @@ -3593,7 +3570,7 @@ index f2eeb4979b81480cfe751f94ec108bf51f576e4b..ff2a10d2456ba56079cba29adf48c1c2 { Document* document = &node->document(); if (auto* templateHost = document->templateDocumentHost()) -@@ -2885,12 +3019,18 @@ RefPtr InspectorDOMAgent::resolveNode(Node* nod +@@ -2944,12 +3077,18 @@ RefPtr InspectorDOMAgent::resolveNode(Node* nod if (!frame) return nullptr; @@ -3615,7 +3592,7 @@ index f2eeb4979b81480cfe751f94ec108bf51f576e4b..ff2a10d2456ba56079cba29adf48c1c2 } Node* InspectorDOMAgent::scriptValueAsNode(JSC::JSValue value) -@@ -2913,4 +3053,42 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT +@@ -2972,4 +3111,42 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT return { }; } @@ -3659,7 +3636,7 @@ index f2eeb4979b81480cfe751f94ec108bf51f576e4b..ff2a10d2456ba56079cba29adf48c1c2 + } // namespace WebCore diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.h b/Source/WebCore/inspector/agents/InspectorDOMAgent.h -index eec24d3eea0c6930c5be29ed653bc549c021ab42..3b0859be4b8b4247f2ebea501651d4dff917cd99 100644 +index fd56c2afd7749f1b145cfe8cf0b5ad4fa653b8a9..ac55eb4498196c1c9b28eaa6483052ed0035b9c8 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.h +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.h @@ -57,6 +57,7 @@ namespace WebCore { @@ -3670,7 +3647,7 @@ index eec24d3eea0c6930c5be29ed653bc549c021ab42..3b0859be4b8b4247f2ebea501651d4df class DOMEditor; class Document; class Element; -@@ -88,6 +89,7 @@ public: +@@ -89,6 +90,7 @@ public: static String toErrorString(Exception&&); static String documentURLString(Document*); @@ -3678,7 +3655,7 @@ index eec24d3eea0c6930c5be29ed653bc549c021ab42..3b0859be4b8b4247f2ebea501651d4df // We represent embedded doms as a part of the same hierarchy. Hence we treat children of frame owners differently. // We also skip whitespace text nodes conditionally. Following methods encapsulate these specifics. -@@ -131,7 +133,7 @@ public: +@@ -132,7 +134,7 @@ public: Inspector::Protocol::ErrorStringOr> performSearch(const String& query, RefPtr&& nodeIds, std::optional&& caseSensitive); Inspector::Protocol::ErrorStringOr>> getSearchResults(const String& searchId, int fromIndex, int toIndex); Inspector::Protocol::ErrorStringOr discardSearchResults(const String& searchId); @@ -3687,7 +3664,7 @@ index eec24d3eea0c6930c5be29ed653bc549c021ab42..3b0859be4b8b4247f2ebea501651d4df Inspector::Protocol::ErrorStringOr>> getAttributes(Inspector::Protocol::DOM::NodeId); #if PLATFORM(IOS_FAMILY) Inspector::Protocol::ErrorStringOr setInspectModeEnabled(bool, RefPtr&& highlightConfig); -@@ -156,6 +158,10 @@ public: +@@ -159,6 +161,10 @@ public: Inspector::Protocol::ErrorStringOr focus(Inspector::Protocol::DOM::NodeId); Inspector::Protocol::ErrorStringOr setInspectedNode(Inspector::Protocol::DOM::NodeId); Inspector::Protocol::ErrorStringOr setAllowEditingUserAgentShadowTrees(bool); @@ -3698,7 +3675,7 @@ index eec24d3eea0c6930c5be29ed653bc549c021ab42..3b0859be4b8b4247f2ebea501651d4df // InspectorInstrumentation Inspector::Protocol::DOM::NodeId identifierForNode(Node&); -@@ -195,7 +201,7 @@ public: +@@ -200,7 +206,7 @@ public: Node* nodeForId(Inspector::Protocol::DOM::NodeId); Inspector::Protocol::DOM::NodeId boundNodeId(const Node*); @@ -3707,7 +3684,7 @@ index eec24d3eea0c6930c5be29ed653bc549c021ab42..3b0859be4b8b4247f2ebea501651d4df bool handleMousePress(); void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags); void inspect(Node*); -@@ -206,12 +212,15 @@ public: +@@ -212,12 +218,15 @@ public: void reset(); Node* assertNode(Inspector::Protocol::ErrorString&, Inspector::Protocol::DOM::NodeId); @@ -3723,7 +3700,7 @@ index eec24d3eea0c6930c5be29ed653bc549c021ab42..3b0859be4b8b4247f2ebea501651d4df private: #if ENABLE(VIDEO) void mediaMetricsTimerFired(); -@@ -240,7 +249,6 @@ private: +@@ -246,7 +255,6 @@ private: void processAccessibilityChildren(AXCoreObject&, JSON::ArrayOf&); Node* nodeForPath(const String& path); @@ -3744,7 +3721,7 @@ index 3386cb879f1178c1b9635775c9a0e864f5b94c52..d2350182f5f061855e8ca172779ad60e class Page; class SecurityOrigin; diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp -index c087f7508c18295714dc75fbbe7fafb6cbd97dbf..a8028d3e4a1d37cc41a61ad8c9091ac2a6a76852 100644 +index 6e5a5fc89ccef05b73ceda257d6c59cb0e82861c..8d32d6cbce1827a32f4aad33f4ac1535886bfb52 100644 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp @@ -45,6 +45,7 @@ @@ -5025,11 +5002,14 @@ index a4ffd1361cdde5ab7d973cd00d19a910ae9ed29f..80d24823328eb8377327ce5c828a3556 } // namespace WebCore diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.h b/Source/WebCore/inspector/agents/InspectorPageAgent.h -index 3d5e566dbe0c5ec11d9e8df67fcf0a70988a2f8f..9db71cc22000a6dc6ddc157cbb0c9a90e0c9fa36 100644 +index 3d5e566dbe0c5ec11d9e8df67fcf0a70988a2f8f..35f38d348513e5c4624ad9efa788ade47b8105fa 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.h +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.h -@@ -34,17 +34,23 @@ +@@ -32,19 +32,26 @@ + #pragma once + #include "CachedResource.h" ++#include "FrameIdentifier.h" #include "InspectorWebAgentBase.h" #include "LayoutRect.h" +#include "ProcessIdentifier.h" @@ -5052,7 +5032,7 @@ index 3d5e566dbe0c5ec11d9e8df67fcf0a70988a2f8f..9db71cc22000a6dc6ddc157cbb0c9a90 class InspectorClient; class InspectorOverlay; class Page; -@@ -69,12 +75,14 @@ public: +@@ -69,12 +76,14 @@ public: PingResource, BeaconResource, WebSocketResource, @@ -5067,7 +5047,7 @@ index 3d5e566dbe0c5ec11d9e8df67fcf0a70988a2f8f..9db71cc22000a6dc6ddc157cbb0c9a90 static bool sharedBufferContent(RefPtr&&, const String& textEncodingName, bool withBase64Encode, String* result); static Vector cachedResourcesForFrame(Frame*); static void resourceContent(Inspector::Protocol::ErrorString&, Frame*, const URL&, String* result, bool* base64Encoded); -@@ -95,15 +103,18 @@ public: +@@ -95,15 +104,18 @@ public: Inspector::Protocol::ErrorStringOr enable(); Inspector::Protocol::ErrorStringOr disable(); Inspector::Protocol::ErrorStringOr reload(std::optional&& ignoreCache, std::optional&& revalidateAllResources); @@ -5087,7 +5067,7 @@ index 3d5e566dbe0c5ec11d9e8df67fcf0a70988a2f8f..9db71cc22000a6dc6ddc157cbb0c9a90 Inspector::Protocol::ErrorStringOr>> searchInResource(const Inspector::Protocol::Network::FrameId&, const String& url, const String& query, std::optional&& caseSensitive, std::optional&& isRegex, const Inspector::Protocol::Network::RequestId&); Inspector::Protocol::ErrorStringOr>> searchInResources(const String&, std::optional&& caseSensitive, std::optional&& isRegex); #if !PLATFORM(IOS_FAMILY) -@@ -114,35 +125,55 @@ public: +@@ -114,35 +126,55 @@ public: #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT) Inspector::Protocol::ErrorStringOr setForcedAppearance(std::optional&&); #endif @@ -5149,7 +5129,7 @@ index 3d5e566dbe0c5ec11d9e8df67fcf0a70988a2f8f..9db71cc22000a6dc6ddc157cbb0c9a90 Frame* frameForId(const Inspector::Protocol::Network::FrameId&); WEBCORE_EXPORT String frameId(Frame*); -@@ -151,6 +182,7 @@ public: +@@ -151,6 +183,7 @@ public: private: double timestamp(); @@ -5157,7 +5137,7 @@ index 3d5e566dbe0c5ec11d9e8df67fcf0a70988a2f8f..9db71cc22000a6dc6ddc157cbb0c9a90 static bool mainResourceContent(Frame*, bool withBase64Encode, String* result); static bool dataContent(const uint8_t* data, unsigned size, const String& textEncodingName, bool withBase64Encode, String* result); -@@ -162,18 +194,20 @@ private: +@@ -162,18 +195,20 @@ private: RefPtr m_backendDispatcher; Page& m_inspectedPage; @@ -5372,19 +5352,6 @@ index 16edb3bc689b8e2dde17597b642b706c1343e1f5..f363b2ca2410f22cff8d6ad908a88527 ~UserGestureEmulationScope(); private: -diff --git a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -index c85b7b875b81c6da4b3ddcf60df0f330bff2acf1..2e5d880289422e432308f8f1740156b657a11016 100644 ---- a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -+++ b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp -@@ -307,7 +307,7 @@ void LineLayout::updateFormattingRootGeometryAndInvalidate() - - auto updateGeometry = [&](auto& root) { - root.setContentBoxWidth(flow.contentLogicalWidth()); -- root.setPadding(Layout::Edges { { flow.paddingStart(), flow.paddingEnd() }, { flow.paddingBefore(), flow.paddingAfter() } }); -+ root.setPadding(Layout::Edges { { flow.paddingStart(), flow.paddingEnd() }, { flow.paddingBefore(), flow.paddingAfter() } }); - root.setBorder(Layout::Edges { { flow.borderStart(), flow.borderEnd() }, { flow.borderBefore(), flow.borderAfter() } }); - root.setHorizontalMargin({ }); - root.setVerticalMargin({ }); diff --git a/Source/WebCore/loader/CookieJar.h b/Source/WebCore/loader/CookieJar.h index 982691dd2dfe2f65201370a12302b5086703c126..4af72beb3b1405ffac78e89e7fbb2b14d6647903 100644 --- a/Source/WebCore/loader/CookieJar.h @@ -5421,7 +5388,7 @@ index 359b63851868423c37a10063501a4df06d9adbaa..3e5593c61d5a73eff267423080c29b2a } diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h -index 123d04213f75354949837089d2065966f929c9e6..976b4266690d08df1b4defc023f720283a10b091 100644 +index c2bea6f6a69b836472c0aff7a0d7070396ba6c2b..80af07d2f4327a400c85b65b640bcfa2ab2f430a 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -179,9 +179,13 @@ public: @@ -5439,7 +5406,7 @@ index 123d04213f75354949837089d2065966f929c9e6..976b4266690d08df1b4defc023f72028 DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 31fb8a5df6a091a343026a996d5751c7562fc16e..64b788bd245f54f22cea8a2c1d4c59bf92b465b4 100644 +index fa27a3004fe662d5a0084a822acfa19002854961..368f3378c19adfafc8031920bd9d111a43ec222a 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -1154,6 +1154,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr stat @@ -5469,7 +5436,7 @@ index 31fb8a5df6a091a343026a996d5751c7562fc16e..64b788bd245f54f22cea8a2c1d4c59bf continueLoadAfterNavigationPolicy(request, formState.get(), navigationPolicyDecision, allowNavigationToInvalidURL); completionHandler(); }, PolicyDecisionMode::Asynchronous); -@@ -2784,12 +2789,17 @@ String FrameLoader::userAgent(const URL& url) const +@@ -2788,12 +2793,17 @@ String FrameLoader::userAgent(const URL& url) const String FrameLoader::navigatorPlatform() const { @@ -5489,7 +5456,7 @@ index 31fb8a5df6a091a343026a996d5751c7562fc16e..64b788bd245f54f22cea8a2c1d4c59bf } void FrameLoader::dispatchOnloadEvents() -@@ -3195,6 +3205,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) +@@ -3199,6 +3209,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) checkCompleted(); if (m_frame.page()) checkLoadComplete(); @@ -5498,7 +5465,7 @@ index 31fb8a5df6a091a343026a996d5751c7562fc16e..64b788bd245f54f22cea8a2c1d4c59bf } void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue) -@@ -3962,9 +3974,6 @@ String FrameLoader::referrer() const +@@ -3966,9 +3978,6 @@ String FrameLoader::referrer() const void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() { @@ -5508,7 +5475,7 @@ index 31fb8a5df6a091a343026a996d5751c7562fc16e..64b788bd245f54f22cea8a2c1d4c59bf Vector> worlds; ScriptController::getAllWorlds(worlds); for (auto& world : worlds) -@@ -3973,13 +3982,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() +@@ -3977,13 +3986,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world) { @@ -5541,7 +5508,7 @@ index 29d2e3f46140aaa51160e6a28562f370e371eb21..676ddc9369050c19454fbf5faffac2b2 virtual bool shouldPerformSecurityChecks() const { return false; } virtual bool havePerformedSecurityChecks(const ResourceResponse&) const { return false; } diff --git a/Source/WebCore/loader/PolicyChecker.cpp b/Source/WebCore/loader/PolicyChecker.cpp -index c3fbb569999a0667188eabe1a460e6f076684f0d..ab5d5925c91e92d2510246aaffa06b1f35af7ac9 100644 +index b24f1d47d4fb0515b3d30cf4f8628970f7e40fd1..64e4bb3281f5d8ae464448e1af410111ee5e6710 100644 --- a/Source/WebCore/loader/PolicyChecker.cpp +++ b/Source/WebCore/loader/PolicyChecker.cpp @@ -46,6 +46,7 @@ @@ -5575,7 +5542,7 @@ index a2c6d72b5ba0f04a49ca6dc710ef6fa5e0125c33..759b0d34b7db839027063a1b6ce8fb0f void ProgressTracker::incrementProgress(ResourceLoaderIdentifier identifier, const ResourceResponse& response) diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h -index 284967df462545fe06cc2eb66a2716282053f2f3..54a62a348579e54013e23f9d65c55b54c4569127 100644 +index 4419ed5553051938b75800bdeebd4f6b4473078c..b4db731a48c091604b1b1e938232a387b677d7c6 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -316,7 +316,7 @@ public: @@ -5588,10 +5555,10 @@ index 284967df462545fe06cc2eb66a2716282053f2f3..54a62a348579e54013e23f9d65c55b54 #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395a536b164 100644 +index ccc33d0e2824af0e1d22711618a00bb9e74ebf6f..0324a3be1db85ae268ae318f3f18902c61b5360f 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp -@@ -140,6 +140,7 @@ +@@ -141,6 +141,7 @@ #if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS) #include "PlatformTouchEvent.h" @@ -5599,7 +5566,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 #endif #if ENABLE(MAC_GESTURE_EVENTS) -@@ -799,9 +800,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve +@@ -801,9 +802,7 @@ bool EventHandler::handleMousePressEvent(const MouseEventWithHitTestResults& eve m_mousePressNode = event.targetNode(); m_frame.document()->setFocusNavigationStartingNode(event.targetNode()); @@ -5609,7 +5576,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 m_mousePressed = true; m_selectionInitiationState = HaveNotStartedSelection; -@@ -841,8 +840,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis +@@ -843,8 +842,6 @@ VisiblePosition EventHandler::selectionExtentRespectingEditingBoundary(const Vis return adjustedTarget->renderer()->positionForPoint(LayoutPoint(selectionEndPoint), nullptr); } @@ -5618,7 +5585,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 #if !PLATFORM(IOS_FAMILY) bool EventHandler::supportsSelectionUpdatesOnMouseDrag() const -@@ -864,8 +861,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -866,8 +863,10 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e Ref protectedFrame(m_frame); @@ -5629,7 +5596,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 RefPtr targetNode = event.targetNode(); if (event.event().button() != LeftButton || !targetNode) -@@ -886,7 +885,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -888,7 +887,9 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e ASSERT(mouseDownMayStartSelect() || m_mouseDownMayStartAutoscroll); #endif @@ -5639,7 +5606,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 if (m_mouseDownMayStartAutoscroll && !panScrollInProgress()) { m_autoscrollController->startAutoscrollForSelection(renderer); -@@ -903,6 +904,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e +@@ -905,6 +906,8 @@ bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& e return true; } @@ -5648,7 +5615,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 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 -@@ -934,6 +937,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const +@@ -936,6 +939,8 @@ bool EventHandler::eventMayStartDrag(const PlatformMouseEvent& event) const return targetElement && page->dragController().draggableElement(&m_frame, targetElement.get(), result.roundedPointInInnerNodeFrame(), state); } @@ -5657,7 +5624,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 void EventHandler::updateSelectionForMouseDrag() { if (!supportsSelectionUpdatesOnMouseDrag()) -@@ -1028,7 +1033,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul +@@ -1030,7 +1035,6 @@ void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResul if (oldSelection != newSelection && ImageOverlay::isOverlayText(newSelection.start().containerNode()) && ImageOverlay::isOverlayText(newSelection.end().containerNode())) invalidateClick(); } @@ -5665,7 +5632,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 void EventHandler::lostMouseCapture() { -@@ -1076,9 +1080,7 @@ bool EventHandler::handleMouseReleaseEvent(const MouseEventWithHitTestResults& e +@@ -1078,9 +1082,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 @@ -5675,7 +5642,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 && m_frame.selection().isRange() && event.event().button() != RightButton) { VisibleSelection newSelection; -@@ -2045,10 +2047,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE +@@ -2050,10 +2052,8 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseE swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), 0, platformMouseEvent, FireMouseOverOut::Yes); @@ -5686,7 +5653,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 return swallowEvent; } -@@ -4117,7 +4117,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4141,7 +4141,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -5702,7 +5669,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4506,7 +4513,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4530,7 +4537,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -5712,7 +5679,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4633,6 +4641,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4657,6 +4665,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -5723,7 +5690,7 @@ index 27517c22e7709eaae55123f99ee697ed6685a901..90d55bd1e045b12b1b0e7a2367978395 m_touchPressed = touches->length() > 0; if (allTouchReleased) diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h -index 6b359e7556a2d6a1485e04e8c20fa5f470c5a04a..4eda11b09ed371ff7bafd6d6f37a96b58f5c2075 100644 +index de408bfdd161f86de51d9b528a9d27452a76b82a..d9b2374b0f7abf2789729fcc805c65050eba43b4 100644 --- a/Source/WebCore/page/EventHandler.h +++ b/Source/WebCore/page/EventHandler.h @@ -135,9 +135,7 @@ public: @@ -5736,7 +5703,7 @@ index 6b359e7556a2d6a1485e04e8c20fa5f470c5a04a..4eda11b09ed371ff7bafd6d6f37a96b5 #if ENABLE(PAN_SCROLLING) void didPanScrollStart(); -@@ -384,10 +382,8 @@ private: +@@ -385,10 +383,8 @@ private: bool startKeyboardScrolling(KeyboardEvent&); void stopKeyboardScrolling(); @@ -5747,7 +5714,7 @@ index 6b359e7556a2d6a1485e04e8c20fa5f470c5a04a..4eda11b09ed371ff7bafd6d6f37a96b5 WEBCORE_EXPORT bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&); -@@ -487,10 +483,8 @@ private: +@@ -488,10 +484,8 @@ private: void defaultTabEventHandler(KeyboardEvent&); void defaultArrowEventHandler(FocusDirection, KeyboardEvent&); @@ -5758,7 +5725,7 @@ index 6b359e7556a2d6a1485e04e8c20fa5f470c5a04a..4eda11b09ed371ff7bafd6d6f37a96b5 // The following are called at the beginning of handleMouseUp and handleDrag. // If they return true it indicates that they have consumed the event. -@@ -498,9 +492,10 @@ private: +@@ -499,9 +493,10 @@ private: #if ENABLE(DRAG_SUPPORT) bool eventLoopHandleMouseDragged(const MouseEventWithHitTestResults&); @@ -5770,7 +5737,7 @@ index 6b359e7556a2d6a1485e04e8c20fa5f470c5a04a..4eda11b09ed371ff7bafd6d6f37a96b5 enum class SetOrClearLastScrollbar { Clear, Set }; void updateLastScrollbarUnderMouse(Scrollbar*, SetOrClearLastScrollbar); -@@ -592,8 +587,8 @@ private: +@@ -593,8 +588,8 @@ private: Timer m_autoHideCursorTimer; #endif @@ -5801,7 +5768,7 @@ index 8cc8df1ac26cd347924d76bdbfec92af910e1369..5df20918a9b9e0b89f8b4747f2e615c1 request.setHTTPHeaderField(HTTPHeaderName::Accept, "text/event-stream"); request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache"); diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp -index a47ea0d84400580cebe121c89ebc0f877247fc88..f97db5fd5276e52731663248a19032fe5cdc1783 100644 +index 4aa1e77a3ab2d0ec7961b661d5ce7fb8fc190cfc..6a2ffb8d3fbbe1d0bd957081de63b6d9ff29e260 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -39,6 +39,7 @@ @@ -5810,9 +5777,9 @@ index a47ea0d84400580cebe121c89ebc0f877247fc88..f97db5fd5276e52731663248a19032fe #include "ChromeClient.h" +#include "ComposedTreeIterator.h" #include "DOMWindow.h" - #include "DocumentTimeline.h" #include "DocumentTimelinesController.h" -@@ -73,6 +74,7 @@ + #include "DocumentType.h" +@@ -72,6 +73,7 @@ #include "NavigationScheduler.h" #include "Navigator.h" #include "NodeList.h" @@ -5820,7 +5787,7 @@ index a47ea0d84400580cebe121c89ebc0f877247fc88..f97db5fd5276e52731663248a19032fe #include "NodeTraversal.h" #include "Page.h" #include "ProcessWarming.h" -@@ -191,6 +193,7 @@ Frame::Frame(Page& page, HTMLFrameOwnerElement* ownerElement, UniqueRefinit(); @@ -5828,7 +5795,7 @@ index a47ea0d84400580cebe121c89ebc0f877247fc88..f97db5fd5276e52731663248a19032fe } Ref Frame::create(Page* page, HTMLFrameOwnerElement* ownerElement, UniqueRef&& client) -@@ -370,7 +373,7 @@ void Frame::orientationChanged() +@@ -369,7 +372,7 @@ void Frame::orientationChanged() int Frame::orientation() const { if (m_page) @@ -5837,7 +5804,7 @@ index a47ea0d84400580cebe121c89ebc0f877247fc88..f97db5fd5276e52731663248a19032fe return 0; } #endif // ENABLE(ORIENTATION_EVENTS) -@@ -1150,6 +1153,362 @@ DataDetectionResultsStorage& Frame::dataDetectionResults() +@@ -1147,6 +1150,362 @@ DataDetectionResultsStorage& Frame::dataDetectionResults() #endif @@ -6311,7 +6278,7 @@ index 1b77026f51092001cda86e32480890395b145b2e..6026bc23508016454f331b06c9f071a8 struct SnapshotOptions { diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp -index 28d1fc3242174a680711027877d4153923790220..058b5309eed081fcc1e4158f66e806421dcc9d56 100644 +index f1da2c85a008476ff08832f3a0b8e7c405bb9764..d27abce0760ec3dea146cbcaef3d493906e5e53b 100644 --- a/Source/WebCore/page/History.cpp +++ b/Source/WebCore/page/History.cpp @@ -33,6 +33,7 @@ @@ -6331,7 +6298,7 @@ index 28d1fc3242174a680711027877d4153923790220..058b5309eed081fcc1e4158f66e80642 if (stateObjectType == StateObjectType::Push) { frame->loader().history().pushState(WTFMove(data), title, fullURL.string()); diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp -index 83a50e2421ee0d0c6fcb75007a804a6edd711975..858e02caa87de9739cf03aad914617f294ac55d8 100644 +index fb56ae191a6227dd6ea44e867d34625940e10b53..bbfa68485164990bb22467ba1f386b8e47131c66 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -471,6 +471,37 @@ void Page::setOverrideViewportArguments(const std::optional& @@ -6383,7 +6350,7 @@ index 83a50e2421ee0d0c6fcb75007a804a6edd711975..858e02caa87de9739cf03aad914617f2 resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3350,6 +3377,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3355,6 +3382,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6401,7 +6368,7 @@ index 83a50e2421ee0d0c6fcb75007a804a6edd711975..858e02caa87de9739cf03aad914617f2 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 8fd51eb67d1eba2ff0a9cd5881a7ce767e22abb9..0b51d4b0bfc01e93b3cffa5f1d592b8f4ffb5a84 100644 +index 51c80d8c1e2cec66b6a2fb26e6eaa36071c67fd8..31137c300cd213ed1a1ed94c440d5beab5343ba6 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h @@ -273,6 +273,9 @@ public: @@ -6446,7 +6413,7 @@ index 8fd51eb67d1eba2ff0a9cd5881a7ce767e22abb9..0b51d4b0bfc01e93b3cffa5f1d592b8f #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -996,6 +1010,9 @@ private: +@@ -997,6 +1011,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6456,7 +6423,7 @@ index 8fd51eb67d1eba2ff0a9cd5881a7ce767e22abb9..0b51d4b0bfc01e93b3cffa5f1d592b8f #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1075,6 +1092,7 @@ private: +@@ -1076,6 +1093,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6464,7 +6431,7 @@ index 8fd51eb67d1eba2ff0a9cd5881a7ce767e22abb9..0b51d4b0bfc01e93b3cffa5f1d592b8f #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1253,6 +1271,11 @@ private: +@@ -1254,6 +1272,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6538,10 +6505,10 @@ index 04fff21a26adbc73d8b74dbf55acc8e9824f35da..cd7346fe3b4701724431bc1617e13d2e #endif diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h -index cf2f08941f63a7c103a6a73db88b643986d200a4..2842d5edcbecda27e6caec1d30315250ed8af934 100644 +index 3fe51fd1e4360b0fd17b6d86da410faa131359b6..8c464be4352a3aa901af54d5cad1e7ece4a5a2d4 100644 --- a/Source/WebCore/page/RuntimeEnabledFeatures.h +++ b/Source/WebCore/page/RuntimeEnabledFeatures.h -@@ -185,6 +185,7 @@ public: +@@ -188,6 +188,7 @@ public: void setMouseEventsSimulationEnabled(bool isEnabled) { m_mouseEventsSimulationEnabled = isEnabled; } bool touchEventsEnabled() const; void setTouchEventsEnabled(bool isEnabled) { m_touchEventsEnabled = isEnabled; } @@ -6907,7 +6874,7 @@ index be373f080140728d3e0bfc1e7db9f163ed3aedc8..12f49cdf02ec892acef95e524e72929c #endif diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h -index a36e198c695b1b8465ac050fe1c34a68e1e985ae..ebed9d692157d1e310568eb19dda68e4addc0d32 100644 +index 2bdc18a1988004fafc237572daf2927291ed8def..e915cabfee73cd0abdc6ce2cc518db2cb5ee4603 100644 --- a/Source/WebCore/platform/ScrollableArea.h +++ b/Source/WebCore/platform/ScrollableArea.h @@ -103,7 +103,7 @@ public: @@ -7006,10 +6973,10 @@ index 0000000000000000000000000000000000000000..f0c3a183e5bc44bdfa4201e0db2067b4 + +#endif // ENABLE(SPEECH_SYNTHESIS) diff --git a/Source/WebCore/platform/graphics/FontCascade.h b/Source/WebCore/platform/graphics/FontCascade.h -index 24cfb7137431a77ecb01fedaa4473c69784476c3..9c1413baafa7675fd62d8eb85a267575f47c99be 100644 +index 09f41d601d60cb10fb996540149a1bc652fce835..d69f7dc19d76d2b9174cedb11692b4c0cb1316d7 100644 --- a/Source/WebCore/platform/graphics/FontCascade.h +++ b/Source/WebCore/platform/graphics/FontCascade.h -@@ -304,7 +304,8 @@ private: +@@ -303,7 +303,8 @@ private: return true; if (textRenderingMode == TextRenderingMode::OptimizeSpeed) return false; @@ -7019,21 +6986,6 @@ index 24cfb7137431a77ecb01fedaa4473c69784476c3..9c1413baafa7675fd62d8eb85a267575 return true; #else return false; -diff --git a/Source/WebCore/platform/graphics/PlatformDisplay.cpp b/Source/WebCore/platform/graphics/PlatformDisplay.cpp -index 0db17070922ca03cd57433871670a11df671a3cb..89f15190dd0396088a4e6ed486c426c49c3616f4 100644 ---- a/Source/WebCore/platform/graphics/PlatformDisplay.cpp -+++ b/Source/WebCore/platform/graphics/PlatformDisplay.cpp -@@ -84,6 +84,10 @@ - #include - #endif - -+#if USE(GLIB) -+#include -+#endif -+ - namespace WebCore { - - std::unique_ptr PlatformDisplay::createPlatformDisplay() diff --git a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp index 4db603a94f3af1b1bce94ab0f1ae36054c004fcc..c1820f48eb86348f8ca678fde636244e8c91267e 100644 --- a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp @@ -7159,7 +7111,7 @@ index b60f9a64bacc8282860da6de299b75aeb295b9b5..55bd017c03c6478ca334bd5ef164160f namespace WebCore { diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp -index 68b6cd3f524bf6a09eaf7fd6848fbac1da733ab3..991d7f20c21290db6732f02f8455974167e34bcf 100644 +index c35b2f0f15d9cd09b9b28be0bf44778874305738..5bc1b35e603afe5ae979ece6d3813bcb1e8492ad 100644 --- a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp +++ b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp @@ -27,7 +27,7 @@ @@ -8142,10 +8094,10 @@ index a8f57a72d0eacca7755be84fcaa1c9bf10958c0b..a5d67b8016a86b9184ded0904e317048 SocketStreamHandleImpl::~SocketStreamHandleImpl() diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp -index fcfa4e995212ae926f6339d37dbbb3d1051e0fc3..b2341ee77f6b1c2c0b4ebecc6e861f36522e2a7f 100644 +index fab574233fe00f4b0bf22e0baec09db116a4d3ce..79e4ba64115d88aec771175833e9d3ed71591692 100644 --- a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp +++ b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp -@@ -408,6 +408,30 @@ void NetworkStorageSession::setCookie(const Cookie& cookie) +@@ -410,6 +410,30 @@ void NetworkStorageSession::setCookie(const Cookie& cookie) soup_cookie_jar_add_cookie(cookieStorage(), cookie.toSoupCookie()); } @@ -8768,10 +8720,10 @@ index 2e90534ffd8da83b7dc54d46fa7def16319bbb43..2493c00d58957751c65c37eb409fa8d6 int innerLineHeight() const override; #endif diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index a34f79bde3e081696d73a55fbf59058bf6d8f379..dd0004e8281c53877f4133a0caf4b94ef6b006b7 100644 +index 40a7e2aea4a1bcf9fdf7eb32b33266b0bd6a551f..c7ce89d3063e1115eefae48c5df41c2cdb695038 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -@@ -77,6 +77,11 @@ +@@ -83,6 +83,11 @@ #include #include @@ -8783,7 +8735,7 @@ index a34f79bde3e081696d73a55fbf59058bf6d8f379..dd0004e8281c53877f4133a0caf4b94e #if ENABLE(APPLE_PAY_REMOTE_UI) #include "WebPaymentCoordinatorProxyMessages.h" #endif -@@ -465,6 +470,10 @@ void NetworkConnectionToWebProcess::createSocketStream(URL&& url, String cachePa +@@ -488,6 +493,10 @@ void NetworkConnectionToWebProcess::createSocketStream(URL&& url, String cachePa if (auto* session = networkSession()) acceptInsecureCertificates = session->shouldAcceptInsecureCertificatesForWebSockets(); #endif @@ -8794,7 +8746,7 @@ index a34f79bde3e081696d73a55fbf59058bf6d8f379..dd0004e8281c53877f4133a0caf4b94e m_networkSocketStreams.add(identifier, NetworkSocketStream::create(m_networkProcess.get(), WTFMove(url), m_sessionID, cachePartition, identifier, m_connection, WTFMove(token), acceptInsecureCertificates)); } -@@ -1011,6 +1020,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) +@@ -1036,6 +1045,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID) #endif } @@ -8810,10 +8762,10 @@ index a34f79bde3e081696d73a55fbf59058bf6d8f379..dd0004e8281c53877f4133a0caf4b94e void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID) { diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -index ab96657d0df4a2331040ac51fc43c06847848047..c284d1a4eb98e10f43a10acf8a776c306f3fa7fb 100644 +index d0aa4ef74520a2ca0b551b469e86ea7668b678e7..c42b9217d166efc789d194fe5ec848398767bb7c 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h -@@ -294,6 +294,8 @@ private: +@@ -305,6 +305,8 @@ private: void clearPageSpecificData(WebCore::PageIdentifier); @@ -8823,7 +8775,7 @@ index ab96657d0df4a2331040ac51fc43c06847848047..c284d1a4eb98e10f43a10acf8a776c30 void removeStorageAccessForFrame(WebCore::FrameIdentifier, WebCore::PageIdentifier); diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in -index 242835050b24970c5eac1e26bf86b5b025a80e53..7e5277d3613d45054d349ce4935202ff4d176e1f 100644 +index b97ca3479b4d9d5579a7e7e55a691a60dd8866bc..9cf3a813e7822b1c9be379fac7e5a4d868a7a936 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in @@ -66,6 +66,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver { @@ -8836,7 +8788,7 @@ index 242835050b24970c5eac1e26bf86b5b025a80e53..7e5277d3613d45054d349ce4935202ff 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 7c79e2a20976a139c7f667f113c48946dedd5641..9b699a12467f20f029c0f933d0e3e343f168475c 100644 +index 12f8e8a5b59f00dd7b7efd3b2ad1357fa2516933..7208d6d1fbafa3bbdf9ead9d868e14e5c4ff60af 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -8847,7 +8799,7 @@ index 7c79e2a20976a139c7f667f113c48946dedd5641..9b699a12467f20f029c0f933d0e3e343 #include "ArgumentCoders.h" #include "Attachment.h" #include "AuthenticationManager.h" -@@ -535,6 +534,41 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) +@@ -532,6 +531,41 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) m_sessionsControlledByAutomation.remove(sessionID); } @@ -8890,18 +8842,18 @@ index 7c79e2a20976a139c7f667f113c48946dedd5641..9b699a12467f20f029c0f933d0e3e343 void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index 7877927a17c5596eb03bd4acf4d58e418ac8ba23..901fb80d71c8cac0eb0414153184ad928ff498ad 100644 +index 0f8533ed13dd26277a6dd52ab6dabe20c3e08805..460cad5f9a89c82eb3921dbd3e87000bb79da404 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h -@@ -35,6 +35,7 @@ - #include "NetworkResourceLoadIdentifier.h" +@@ -36,6 +36,7 @@ + #include "QuotaIncreaseRequestIdentifier.h" #include "RTCDataChannelRemoteManagerProxy.h" #include "SandboxExtension.h" +#include "StorageNamespaceIdentifier.h" #include "WebPageProxyIdentifier.h" #include "WebResourceLoadStatisticsStore.h" #include "WebsiteData.h" -@@ -79,6 +80,7 @@ class SessionID; +@@ -80,6 +81,7 @@ class SessionID; namespace WebCore { class CertificateInfo; @@ -8909,7 +8861,7 @@ index 7877927a17c5596eb03bd4acf4d58e418ac8ba23..901fb80d71c8cac0eb0414153184ad92 class CurlProxySettings; class ProtectionSpace; class NetworkStorageSession; -@@ -201,6 +203,11 @@ public: +@@ -202,6 +204,11 @@ public: void addWebsiteDataStore(WebsiteDataStoreParameters&&); @@ -8922,7 +8874,7 @@ index 7877927a17c5596eb03bd4acf4d58e418ac8ba23..901fb80d71c8cac0eb0414153184ad92 void clearPrevalentResource(PAL::SessionID, const RegistrableDomain&, CompletionHandler&&); void clearUserInteraction(PAL::SessionID, const RegistrableDomain&, CompletionHandler&&); diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -index 637e159f186393bec5cc05ab5bd5780be8c6fce4..8032679d6f8a585441d4c5984f3cc7cdeb929e34 100644 +index 631e2b6073c019213068c2096b827b279dbc7de0..242797845981dab94c3425e910d84cedacd7466c 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in @@ -78,6 +78,11 @@ messages -> NetworkProcess LegacyReceiver { @@ -8938,10 +8890,10 @@ index 637e159f186393bec5cc05ab5bd5780be8c6fce4..8032679d6f8a585441d4c5984f3cc7cd ClearPrevalentResource(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async ClearUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async diff --git a/Source/WebKit/NetworkProcess/NetworkSession.h b/Source/WebKit/NetworkProcess/NetworkSession.h -index 19307cf40be3b2f26057d016c766edce498c9542..091438735aa757887d534d122bb01a1c6144ea7a 100644 +index 85c7cbd69034d9cba7f445da9de475a1d7b35118..f5a50c9773902bd9e376ebd07df5889699b7c63e 100644 --- a/Source/WebKit/NetworkProcess/NetworkSession.h +++ b/Source/WebKit/NetworkProcess/NetworkSession.h -@@ -192,6 +192,9 @@ public: +@@ -193,6 +193,9 @@ public: void lowMemoryHandler(WTF::Critical); @@ -8951,7 +8903,7 @@ index 19307cf40be3b2f26057d016c766edce498c9542..091438735aa757887d534d122bb01a1c #if ENABLE(SERVICE_WORKER) void addSoftUpdateLoader(std::unique_ptr&& loader) { m_softUpdateLoaders.add(WTFMove(loader)); } void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); } -@@ -279,6 +282,7 @@ protected: +@@ -277,6 +280,7 @@ protected: bool m_privateClickMeasurementDebugModeEnabled { false }; std::optional m_ephemeralMeasurement; bool m_isRunningEphemeralMeasurementTest { false }; @@ -9041,10 +8993,10 @@ index f57a72b6bdc3382469d69adb1b1201c7a9f07a84..c501211b094312ca44f0bf92de5d6ebc void clear(); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 834e5261733119e70e1ef20d177a73819feffc91..565b653f77e70e63679e9c6128539fb37e334b8c 100644 +index 9eaa83feae195de9c06c5e418ddc1b83080f864e..25aadcc715b351a366700bb91d5d3bab142d6c55 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -@@ -736,7 +736,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall +@@ -718,7 +718,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { sessionCocoa->setClientAuditToken(challenge); @@ -9053,7 +9005,7 @@ index 834e5261733119e70e1ef20d177a73819feffc91..565b653f77e70e63679e9c6128539fb3 return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject; -@@ -974,6 +974,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END +@@ -956,6 +956,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -9243,7 +9195,7 @@ index e55864a95f7bcbc085c46628bff058573573286c..d82268c1877a29e3e9e848185e4df4e7 WebCore::ShouldRelaxThirdPartyCookieBlocking m_shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No }; diff --git a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp -index 81d990d2b653d8e8018afdec45c79f271d4c1c9c..79e7d85c2576eb355e5cf1b5077ab66d6fdaa18c 100644 +index 66e4895549a3aec8d1df994d25fdcda4ed2d7e66..b69f2b4fc68f483b4272704be56ef958fef2785e 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp @@ -494,6 +494,8 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr&& inputStream) @@ -9540,6 +9492,19 @@ index 24bd842672aa8101d1c1eb6db4335f1e5f0b840d..52e9e574d103d5e831d022affe24601b ) endif () +diff --git a/Source/WebKit/Scripts/generate-unified-sources.sh b/Source/WebKit/Scripts/generate-unified-sources.sh +index defd969315770cf57bcb6aee427af4cb6ccbbbf0..4e305bbdbb9196444461d468efb666e4a98d5546 100755 +--- a/Source/WebKit/Scripts/generate-unified-sources.sh ++++ b/Source/WebKit/Scripts/generate-unified-sources.sh +@@ -14,7 +14,7 @@ if [ -z "${BUILD_SCRIPTS_DIR}" ]; then + fi + fi + +-UnifiedSourceCppFileCount=120 ++UnifiedSourceCppFileCount=122 + UnifiedSourceMmFileCount=80 + + if [ $# -eq 0 ]; then diff --git a/Source/WebKit/Shared/API/c/wpe/WebKit.h b/Source/WebKit/Shared/API/c/wpe/WebKit.h index caf67e1dece5b727e43eba780e70814f8fdb0f63..740150d2589d6e16a516daa3bf6ef899ac538c99 100644 --- a/Source/WebKit/Shared/API/c/wpe/WebKit.h @@ -9601,10 +9566,10 @@ index ee8cac1c980039c4a36de5501ab7f135e710d06b..deae2be9e720ff76186ecea89920dfc3 #if USE(APPKIT) diff --git a/Source/WebKit/Shared/NativeWebMouseEvent.h b/Source/WebKit/Shared/NativeWebMouseEvent.h -index 001558dd58f4d85f360d5711caa03db33889011e..1e0898f985f1d13036d31e3e284258a3c64fa0a4 100644 +index fef57e34be6ed7592187c3e1fd73c989bf79da1a..e35612e9b88877627802df18e9084e7f4022e629 100644 --- a/Source/WebKit/Shared/NativeWebMouseEvent.h +++ b/Source/WebKit/Shared/NativeWebMouseEvent.h -@@ -77,6 +77,11 @@ public: +@@ -78,6 +78,11 @@ public: NativeWebMouseEvent(HWND, UINT message, WPARAM, LPARAM, bool); #endif @@ -9631,7 +9596,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 28345004e5d182dbfd43584f59846e86aae8d7a6..8b707077d6628fcbefd7a120c3801317777d06ac 100644 +index 9987b1a84768f273863dc0b1a5539153c4981783..4587d56e8e194cde51ad2a8d31d573e424a0ae46 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp @@ -117,6 +117,10 @@ @@ -9839,10 +9804,10 @@ index 1817691d3e12ddec8169248c791826cc13b057e3..cdc90eda23ed5ba20ee78a02c0dd632b const String& text() const { return m_text; } diff --git a/Source/WebKit/Shared/WebMouseEvent.h b/Source/WebKit/Shared/WebMouseEvent.h -index 3dbe10d49b4de34636900efe31fb57e7e60e341c..1457cbaad0bf5c3b17902fd8c2f243a2c0688716 100644 +index cf2adc382b3f59890c43a54b6c28bab2c4a965c6..998e96ec8c997bd1b51434c77e73e9420f5ebaa7 100644 --- a/Source/WebKit/Shared/WebMouseEvent.h +++ b/Source/WebKit/Shared/WebMouseEvent.h -@@ -59,6 +59,7 @@ public: +@@ -62,6 +62,7 @@ public: Button button() const { return static_cast