diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 268280f5f3..460578b2de 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1625 -Changed: yurys@chromium.org Tue 05 Apr 2022 10:51:30 AM PDT +1626 +Changed: yurys@chromium.org Wed 06 Apr 2022 02:18:45 PM PDT diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index a9dca04b1a..1e0e928948 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="9546be2cec957699995d4c7cb38709686db0507d" +BASE_REVISION="7a58e66ff4b54177b5d8ef24993d6c3fa2c07d09" diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 714e74db45..d7fd7e51b3 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 74e23df54de6fc8840423325e48101d63e87c681..b21a6bf6bd8671bf4c9ff27eca527689a0a9d618 100644 +index 29a7af9a2de68629b78f020f1d9d81709da3b25e..641ce3ac2f06c8bf07b6b7282896e009ccc0cba7 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1346,22 +1346,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1345,22 +1345,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -79,18 +79,18 @@ index 52d955b1e4929f6d0dede53097d275559b29b91d..71c538e57acf3912f9a777f7bc7eba6e return nullptr; inspectorObject->setValue(name.string(), inspectorValue.releaseNonNull()); diff --git a/Source/JavaScriptCore/inspector/IdentifiersFactory.cpp b/Source/JavaScriptCore/inspector/IdentifiersFactory.cpp -index 95cd87b01b15cb8667e57bc5bb51a71f06bc3760..0481fa93227f297be9d9cf000c5a72235956a390 100644 +index 18b6dab3b9df38d781c5c767f76a29d8d18dbe02..0f3a341056f429ff282abcab22be4843c60f546c 100644 --- a/Source/JavaScriptCore/inspector/IdentifiersFactory.cpp +++ b/Source/JavaScriptCore/inspector/IdentifiersFactory.cpp -@@ -30,14 +30,21 @@ +@@ -32,14 +32,21 @@ namespace Inspector { namespace { +static uint64_t s_processID = 0; - static long s_lastUsedIdentifier = 0; + static unsigned long s_lastUsedIdentifier = 0; } - static String addPrefixToIdentifier(const String& identifier) + static String addPrefixToIdentifier(unsigned long identifier) { - return makeString("0.", identifier); + return makeString(s_processID, ".", identifier); @@ -104,7 +104,7 @@ index 95cd87b01b15cb8667e57bc5bb51a71f06bc3760..0481fa93227f297be9d9cf000c5a7223 + String IdentifiersFactory::createIdentifier() { - return addPrefixToIdentifier(String::number(++s_lastUsedIdentifier)); + return addPrefixToIdentifier(++s_lastUsedIdentifier); diff --git a/Source/JavaScriptCore/inspector/IdentifiersFactory.h b/Source/JavaScriptCore/inspector/IdentifiersFactory.h index eb25aedee4cd9ebe007e06c2515b37ee095b06f4..badf6559595c8377db1089ca3c25008e1be2c8f1 100644 --- a/Source/JavaScriptCore/inspector/IdentifiersFactory.h @@ -321,15 +321,15 @@ index 0cc2127c9c12c2d82dea9550bad73f4ffb99ba24..8ca65cc042d435cbc0e05dcc5c5dfc95 } diff --git a/Source/JavaScriptCore/inspector/InspectorTarget.h b/Source/JavaScriptCore/inspector/InspectorTarget.h -index 4b95964db4d902b4b7f4b0b4c40afea51654ff2f..966a5927702b65edb343369decafda7fc83eaec7 100644 +index 4b95964db4d902b4b7f4b0b4c40afea51654ff2f..653842a82ed7a7be8603c9ef88ff48d1cda421be 100644 --- a/Source/JavaScriptCore/inspector/InspectorTarget.h +++ b/Source/JavaScriptCore/inspector/InspectorTarget.h @@ -56,8 +56,12 @@ public: virtual void connect(FrontendChannel::ConnectionType) = 0; virtual void disconnect() = 0; virtual void sendMessageToTargetBackend(const String&) = 0; -+ virtual void activate(String& error) { error = "Target cannot be activated"; } -+ virtual void close(String& error, bool /* runBeforeUnload */) { error = "Target cannot be closed"; } ++ virtual void activate(String& error) { error = "Target cannot be activated"_s; } ++ virtual void close(String& error, bool /* runBeforeUnload */) { error = "Target cannot be closed"_s; } private: + virtual void willResume() { } @@ -949,10 +949,10 @@ index 0000000000000000000000000000000000000000..b9ab57a2b5739ed997231399b4bd4042 + ] +} diff --git a/Source/JavaScriptCore/inspector/protocol/Network.json b/Source/JavaScriptCore/inspector/protocol/Network.json -index 882a2d56befef0aba460cc8ff041969e0d2c1ed3..9aecd6067741af596e5ec7fdf9c832ea1267715a 100644 +index 2fc4aaf98e06c468a2500cbf7d8676e523cf6327..6d005cd9de8450196a91a8a61cdce61977554cfc 100644 --- a/Source/JavaScriptCore/inspector/protocol/Network.json +++ b/Source/JavaScriptCore/inspector/protocol/Network.json -@@ -324,6 +324,13 @@ +@@ -325,6 +325,13 @@ { "name": "requestId", "$ref": "RequestId", "description": "Identifier for the intercepted Network request to fail." }, { "name": "errorType", "$ref": "ResourceErrorType", "description": "Deliver error reason for the request failure." } ] @@ -1796,7 +1796,7 @@ index 2decf8a83c80e80ca8677f4c787bf79c6c2995fa..9010384a32f7c2ab69a8fb20eb19cd56 } diff --git a/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp b/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp -index c2d49da98a660bc62b04afe19c578f2592fd4bb9..f27c12db93e099a2dea9ffeb57be72a0eedf656a 100644 +index 01941453ee989a064587592202a36c9adfc02761..9ae20416c6895abe42f24e2444273e651d28010a 100644 --- a/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp +++ b/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp @@ -36,6 +36,7 @@ @@ -1864,43 +1864,6 @@ index fc6fd38ecb392e9d5ea54d5702578562289434fb..6d4be8e5288a5a3307d7803246dcc16b // Do not use icu::TimeZone::createDefault. ICU internally has a cache for timezone and createDefault returns this cached value. m_timeZoneCache = std::unique_ptr(bitwise_cast(icu::TimeZone::detectHostTimeZone())); #endif -diff --git a/Source/PlatformWPE.cmake b/Source/PlatformWPE.cmake -index 277feac7ce8f20ac94b6a02351f1c29f221fcef7..d9c39df7db565545108c765407ce1cda544856f7 100644 ---- a/Source/PlatformWPE.cmake -+++ b/Source/PlatformWPE.cmake -@@ -8,32 +8,3 @@ list(APPEND DocumentationDependencies - "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/docs/wpe-${WPE_API_DOC_VERSION}-sections.txt" - "${CMAKE_SOURCE_DIR}/Source/WebKit/WebProcess/InjectedBundle/API/wpe/docs/wpe-webextensions-${WPE_API_DOC_VERSION}-sections.txt" - ) -- --if (ENABLE_GTKDOC) -- 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_DOC_VERSION}/html/wpe-webextensions-${WPE_API_DOC_VERSION} -- DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html" -- ) --endif () -- --ADD_GTKDOC_GENERATOR("docs-build.stamp" "--wpe") --if (ENABLE_GTKDOC) -- add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp") --elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE) -- add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp") -- -- # Add a default build step which check that documentation does not have any warnings -- # or errors. This is useful to prevent breaking documentation inadvertently during -- # the course of development. -- if (DEVELOPER_MODE) -- ADD_GTKDOC_GENERATOR("docs-build-no-html.stamp" "--wpe;--skip-html") -- add_custom_target(gtkdoc-no-html ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build-no-html.stamp") -- endif () --endif () -- --if (DEVELOPER_MODE) -- add_custom_target(Documentation DEPENDS gtkdoc) -- WEBKIT_DECLARE_DIST_TARGETS(WPE wpewebkit ${TOOLS_DIR}/wpe/manifest.txt.in) --endif () diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt index 0d42c17c6a85b2a9f6af319431332f7f8a709188..8899c8e85b11db81d1da14c7f27814883f75da50 100644 --- a/Source/ThirdParty/libwebrtc/CMakeLists.txt @@ -1957,10 +1920,10 @@ index fa280a4a4fd86851ccb31f3c9de76b8ea88958dc..f995e6a5a747d2c10fb29e1fe991b11d +_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 d5e0d020c65c61e767e35360c34cf8a322f676e1..b7e620c882ffcd8fa3cafad5c186d51668c3ebca 100644 +index 4fa76966397a86dd9563e54e79677a15e1127306..4a83720f9a0550a337dcc8297dc0dbba4f6ef8c8 100644 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig -@@ -53,7 +53,7 @@ DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(NORMAL_WEBCORE_FRAMEWORKS +@@ -52,7 +52,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; @@ -1970,30 +1933,65 @@ index d5e0d020c65c61e767e35360c34cf8a322f676e1..b7e620c882ffcd8fa3cafad5c186d516 PUBLIC_HEADERS_FOLDER_PREFIX = /usr/local/include; INSTALL_PUBLIC_HEADER_PREFIX = $(INSTALL_PATH_PREFIX)$(PUBLIC_HEADERS_FOLDER_PREFIX); diff --git a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj -index 4d86771f9ef95330f2fd6a0dfac15296d095ccef..3f5d7a4689349ebc996a69ef3d98bce471ee1aeb 100644 +index 589133f4e501728e62836b75b88dc58ec89e9da2..9c6a36f10ce1cad52cda27a5eec897359be8324a 100644 --- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj +++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj -@@ -3861,6 +3861,9 @@ - CDFD2FCC24C4DAF70048DAC3 /* reader.h in Headers */ = {isa = PBXBuildFile; fileRef = CDEBB40524C0191A00ADBD44 /* reader.h */; settings = {ATTRIBUTES = (Public, ); }; }; - CDFD2FCD24C4DAF70048DAC3 /* status.h in Headers */ = {isa = PBXBuildFile; fileRef = CDEBB40624C0191A00ADBD44 /* status.h */; settings = {ATTRIBUTES = (Public, ); }; }; - CDFD2FCE24C4DAF70048DAC3 /* webm_parser.h in Headers */ = {isa = PBXBuildFile; fileRef = CDEBB40824C0191A00ADBD44 /* webm_parser.h */; settings = {ATTRIBUTES = (Public, ); }; }; +@@ -6,6 +6,20 @@ + objectVersion = 46; + objects = { + ++/* Begin PBXAggregateTarget section */ ++ F31720AC27FE215900EEE407 /* Copy libvpx headers */ = { ++ isa = PBXAggregateTarget; ++ buildConfigurationList = F31720B027FE215900EEE407 /* Build configuration list for PBXAggregateTarget "Copy libvpx headers" */; ++ buildPhases = ( ++ F31720B127FE216400EEE407 /* ShellScript */, ++ ); ++ dependencies = ( ++ ); ++ name = "Copy libvpx headers"; ++ productName = "Copy libvpx headers"; ++ }; ++/* End PBXAggregateTarget section */ ++ + /* Begin PBXBuildFile section */ + 410091CF242CFD6500C5EDA2 /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 41A391FA1EFC493000C4516A /* internal.h */; }; + 410091D2242CFF6F00C5EDA2 /* gcm_nohw.c in Sources */ = {isa = PBXBuildFile; fileRef = 410091D0242CFD8200C5EDA2 /* gcm_nohw.c */; }; +@@ -4527,6 +4541,9 @@ + DDF30D9127C5C725006A526F /* receive_side_congestion_controller.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF30D9027C5C725006A526F /* receive_side_congestion_controller.h */; }; + DDF30D9527C5C756006A526F /* bwe_defines.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF30D9327C5C756006A526F /* bwe_defines.h */; }; + DDF30D9627C5C756006A526F /* remote_bitrate_estimator.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF30D9427C5C756006A526F /* remote_bitrate_estimator.h */; }; + F3B7819924C7CC5200FCB122 /* mkvmuxerutil.cc in Sources */ = {isa = PBXBuildFile; fileRef = F3B7819624C7CC5100FCB122 /* mkvmuxerutil.cc */; }; + F3B7819A24C7CC5200FCB122 /* mkvmuxer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F3B7819724C7CC5200FCB122 /* mkvmuxer.cc */; }; + F3B7819B24C7CC5200FCB122 /* mkvwriter.cc in Sources */ = {isa = PBXBuildFile; fileRef = F3B7819824C7CC5200FCB122 /* mkvwriter.cc */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ -@@ -8290,6 +8293,9 @@ - CDEBB49D24C0191A00ADBD44 /* master_parser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = master_parser.h; sourceTree = ""; }; - CDFD2F9624C4B2F90048DAC3 /* vp9_header_parser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = vp9_header_parser.h; sourceTree = ""; }; - CDFD2F9A24C4B2F90048DAC3 /* vp9_header_parser.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = vp9_header_parser.cc; sourceTree = ""; }; +@@ -4777,6 +4794,13 @@ + remoteGlobalIDString = DDF30D0527C5C003006A526F; + remoteInfo = absl; + }; ++ F31720B327FE273100EEE407 /* PBXContainerItemProxy */ = { ++ isa = PBXContainerItemProxy; ++ containerPortal = FB39D0701200ED9200088E69 /* Project object */; ++ proxyType = 1; ++ remoteGlobalIDString = F31720AC27FE215900EEE407; ++ remoteInfo = "Copy libvpx headers"; ++ }; + /* End PBXContainerItemProxy section */ + + /* Begin PBXCopyFilesBuildPhase section */ +@@ -9554,6 +9578,9 @@ + DDF30D9027C5C725006A526F /* receive_side_congestion_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = receive_side_congestion_controller.h; sourceTree = ""; }; + DDF30D9327C5C756006A526F /* bwe_defines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bwe_defines.h; sourceTree = ""; }; + DDF30D9427C5C756006A526F /* remote_bitrate_estimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = remote_bitrate_estimator.h; sourceTree = ""; }; + F3B7819624C7CC5100FCB122 /* mkvmuxerutil.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mkvmuxerutil.cc; path = mkvmuxer/mkvmuxerutil.cc; sourceTree = ""; }; + F3B7819724C7CC5200FCB122 /* mkvmuxer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mkvmuxer.cc; path = mkvmuxer/mkvmuxer.cc; sourceTree = ""; }; + F3B7819824C7CC5200FCB122 /* mkvwriter.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mkvwriter.cc; path = mkvmuxer/mkvwriter.cc; sourceTree = ""; }; FB39D0D11200F0E300088E69 /* libwebrtc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwebrtc.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ -@@ -15229,6 +15235,7 @@ +@@ -16870,6 +16897,7 @@ isa = PBXGroup; children = ( CDFD2F9224C4B2F90048DAC3 /* common */, @@ -2001,8 +1999,8 @@ index 4d86771f9ef95330f2fd6a0dfac15296d095ccef..3f5d7a4689349ebc996a69ef3d98bce4 CDEBB19224C0191800ADBD44 /* webm_parser */, ); path = libwebm; -@@ -15363,6 +15370,16 @@ - path = common; +@@ -17337,6 +17365,16 @@ + path = include; sourceTree = ""; }; + F3B7819524C7CC1300FCB122 /* mkvmuxer */ = { @@ -2018,16 +2016,47 @@ index 4d86771f9ef95330f2fd6a0dfac15296d095ccef..3f5d7a4689349ebc996a69ef3d98bce4 FB39D06E1200ED9200088E69 = { isa = PBXGroup; children = ( -@@ -17428,7 +17445,7 @@ +@@ -20023,6 +20061,7 @@ + DDF30CFA27C5A98F006A526F /* PBXBuildRule */, + ); + dependencies = ( ++ F31720B427FE273100EEE407 /* PBXTargetDependency */, + DD2E76E827C6B69A00F2A74C /* PBXTargetDependency */, + CDEBB4CC24C01AB400ADBD44 /* PBXTargetDependency */, + 411ED040212E0811004320BA /* PBXTargetDependency */, +@@ -20084,6 +20123,7 @@ + 41F77D15215BE45E00E72967 /* yasm */, + CDEBB11824C0187400ADBD44 /* webm */, + DDF30D0527C5C003006A526F /* absl */, ++ F31720AC27FE215900EEE407 /* Copy libvpx headers */, ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; -- shellScript = "PRIVATE_HEADERS_FOLDER_PATH=usr/local/include\n\nif [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n PRIVATE_HEADERS_PATH=\"${DSTROOT}${INSTALL_PATH_PREFIX%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\necho \"#### PRIVATE_HEADERS_PATH = ${PRIVATE_HEADERS_PATH}\"\necho\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/Source/webrtc\" \"${PRIVATE_HEADERS_PATH}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/Source/third_party/abseil-cpp/absl\" \"${PRIVATE_HEADERS_PATH}\"\n"; -+ shellScript = "PRIVATE_HEADERS_FOLDER_PATH=usr/local/include\n\nif [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n PRIVATE_HEADERS_PATH=\"${DSTROOT}${INSTALL_PATH_PREFIX%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\necho \"#### PRIVATE_HEADERS_PATH = ${PRIVATE_HEADERS_PATH}\"\necho\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/Source/webrtc\" \"${PRIVATE_HEADERS_PATH}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/Source/third_party/abseil-cpp/absl\" \"${PRIVATE_HEADERS_PATH}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/Source/third_party/libyuv/include/\" \"${PRIVATE_HEADERS_PATH}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"src\" --exclude \"internal\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/Source/third_party/libvpx/source/libvpx/vpx\" \"${PRIVATE_HEADERS_PATH}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/Source/third_party/libwebm/\" \"${PRIVATE_HEADERS_PATH}\"\n"; }; - 5CD286461E6E154E0094FDC8 /* Check for Weak VTables and Externals */ = { - isa = PBXShellScriptBuildPhase; -@@ -18629,6 +18646,7 @@ + /* End PBXProject section */ +@@ -20217,6 +20257,23 @@ + shellPath = /bin/sh; + shellScript = "[ \"${WK_USE_NEW_BUILD_SYSTEM}\" = YES ] && exit 0\nxcodebuild -project \"${PROJECT_FILE_PATH}\" -target \"${TARGET_NAME}\" installhdrs SYMROOT=\"${TARGET_TEMP_DIR}/LegacyNestHeaders-build\" DSTROOT=\"${BUILT_PRODUCTS_DIR}\" SDKROOT=\"${SDKROOT}\" -UseNewBuildSystem=YES\n"; + }; ++ F31720B127FE216400EEE407 /* ShellScript */ = { ++ isa = PBXShellScriptBuildPhase; ++ buildActionMask = 2147483647; ++ files = ( ++ ); ++ inputFileListPaths = ( ++ ); ++ inputPaths = ( ++ ); ++ outputFileListPaths = ( ++ ); ++ outputPaths = ( ++ ); ++ runOnlyForDeploymentPostprocessing = 0; ++ shellPath = /bin/sh; ++ shellScript = "PRIVATE_HEADERS_FOLDER_PATH=usr/local/include\n\nif [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n PRIVATE_HEADERS_PATH=\"${DSTROOT}${INSTALL_PATH_PREFIX%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\necho \"#### PRIVATE_HEADERS_PATH = ${PRIVATE_HEADERS_PATH}\"\necho\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/Source/third_party/libyuv/include/\" \"${PRIVATE_HEADERS_PATH}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"src\" --exclude \"internal\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/Source/third_party/libvpx/source/libvpx/vpx\" \"${PRIVATE_HEADERS_PATH}\"\n\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/Source/third_party/libwebm/\" \"${PRIVATE_HEADERS_PATH}\"\n\n"; ++ }; + /* End PBXShellScriptBuildPhase section */ + + /* Begin PBXSourcesBuildPhase section */ +@@ -21348,6 +21405,7 @@ 419C82F51FE20EB50040C30F /* audio_encoder_opus.cc in Sources */, 419C82F31FE20EB50040C30F /* audio_encoder_opus_config.cc in Sources */, 4140B8201E4E3383007409E6 /* audio_encoder_pcm.cc in Sources */, @@ -2035,7 +2064,7 @@ index 4d86771f9ef95330f2fd6a0dfac15296d095ccef..3f5d7a4689349ebc996a69ef3d98bce4 5CDD8FFE1E43CE3A00621E92 /* audio_encoder_pcm16b.cc in Sources */, 5CD285461E6A61D20094FDC8 /* audio_format.cc in Sources */, 41DDB26F212679D200296D47 /* audio_format_to_string.cc in Sources */, -@@ -19075,6 +19093,7 @@ +@@ -21786,6 +21844,7 @@ 417953DB216983910028266B /* metrics.cc in Sources */, 5CDD865E1E43B8B500621E92 /* min_max_operations.c in Sources */, 4189395B242A71F5007FDC41 /* min_video_bitrate_experiment.cc in Sources */, @@ -2043,19 +2072,76 @@ index 4d86771f9ef95330f2fd6a0dfac15296d095ccef..3f5d7a4689349ebc996a69ef3d98bce4 4131C387234B957D0028A615 /* moving_average.cc in Sources */, 41FCBB1521B1F7AA00A5DF27 /* moving_average.cc in Sources */, 5CD286101E6A64C90094FDC8 /* moving_max.cc in Sources */, -@@ -19305,6 +19324,7 @@ +@@ -22019,6 +22078,7 @@ 4131C53B234C8B190028A615 /* rtc_event_rtp_packet_outgoing.cc in Sources */, 4131C552234C8B190028A615 /* rtc_event_video_receive_stream_config.cc in Sources */, 4131C554234C8B190028A615 /* rtc_event_video_send_stream_config.cc in Sources */, + F3B7819924C7CC5200FCB122 /* mkvmuxerutil.cc in Sources */, 4131C3CF234B98420028A615 /* rtc_stats.cc in Sources */, - 41323A1D2665288B00B38623 /* packet_sequencer.cc in Sources */, 4131BF2D234B88200028A615 /* rtc_stats_collector.cc in Sources */, + 4131C3CE234B98420028A615 /* rtc_stats_report.cc in Sources */, +@@ -22469,6 +22529,11 @@ + target = DDF30D0527C5C003006A526F /* absl */; + targetProxy = DD2E76E727C6B69A00F2A74C /* PBXContainerItemProxy */; + }; ++ F31720B427FE273100EEE407 /* PBXTargetDependency */ = { ++ isa = PBXTargetDependency; ++ target = F31720AC27FE215900EEE407 /* Copy libvpx headers */; ++ targetProxy = F31720B327FE273100EEE407 /* PBXContainerItemProxy */; ++ }; + /* End PBXTargetDependency section */ + + /* Begin XCBuildConfiguration section */ +@@ -22717,6 +22782,27 @@ + }; + name = Production; + }; ++ F31720AD27FE215900EEE407 /* Debug */ = { ++ isa = XCBuildConfiguration; ++ buildSettings = { ++ PRODUCT_NAME = "$(TARGET_NAME)"; ++ }; ++ name = Debug; ++ }; ++ F31720AE27FE215900EEE407 /* Release */ = { ++ isa = XCBuildConfiguration; ++ buildSettings = { ++ PRODUCT_NAME = "$(TARGET_NAME)"; ++ }; ++ name = Release; ++ }; ++ F31720AF27FE215900EEE407 /* Production */ = { ++ isa = XCBuildConfiguration; ++ buildSettings = { ++ PRODUCT_NAME = "$(TARGET_NAME)"; ++ }; ++ name = Production; ++ }; + FB39D0711200ED9200088E69 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */; +@@ -22849,6 +22935,16 @@ + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Production; + }; ++ F31720B027FE215900EEE407 /* Build configuration list for PBXAggregateTarget "Copy libvpx headers" */ = { ++ isa = XCConfigurationList; ++ buildConfigurations = ( ++ F31720AD27FE215900EEE407 /* Debug */, ++ F31720AE27FE215900EEE407 /* Release */, ++ F31720AF27FE215900EEE407 /* Production */, ++ ); ++ defaultConfigurationIsVisible = 0; ++ defaultConfigurationName = Production; ++ }; + FB39D0731200ED9200088E69 /* Build configuration list for PBXProject "libwebrtc" */ = { + isa = XCConfigurationList; + buildConfigurations = ( diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -index b66c740e8072cc59c5ba27c5ee4336416f9f1cfe..d0b201f8268c551c48291736dd94dfdcca98a636 100644 +index f8edbb7e0638916d22209b9c0baf5b9ed5af9858..aa345b4470460ecfbb33cd301007da5af5c312a9 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -@@ -995,7 +995,7 @@ InspectorStartsAttached: +@@ -1007,7 +1007,7 @@ InspectorStartsAttached: exposed: [ WebKit ] defaultValue: WebKit: @@ -2064,7 +2150,7 @@ index b66c740e8072cc59c5ba27c5ee4336416f9f1cfe..d0b201f8268c551c48291736dd94dfdc InspectorWindowFrame: type: String -@@ -1777,6 +1777,17 @@ PluginsEnabled: +@@ -1789,6 +1789,17 @@ PluginsEnabled: WebCore: default: false @@ -2083,7 +2169,7 @@ index b66c740e8072cc59c5ba27c5ee4336416f9f1cfe..d0b201f8268c551c48291736dd94dfdc type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 51878a8f49532b758568fbcb68a1d1fdbd856cf6..90cbb18c4790ab507683e3012f62e30ba91849ad 100644 +index 6b5f33fc5c9e1dc0dedecf0f2070e0483c197f21..5c44cde5ed6626c6a34e6dff062bd49ba76857b2 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -455,7 +455,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2095,7 +2181,7 @@ index 51878a8f49532b758568fbcb68a1d1fdbd856cf6..90cbb18c4790ab507683e3012f62e30b WebCore: default: false -@@ -846,9 +846,9 @@ MaskWebGLStringsEnabled: +@@ -832,9 +832,9 @@ MaskWebGLStringsEnabled: WebKitLegacy: default: true WebKit: @@ -2107,7 +2193,7 @@ index 51878a8f49532b758568fbcb68a1d1fdbd856cf6..90cbb18c4790ab507683e3012f62e30b # FIXME: This is on by default in WebKit2. Perhaps we should consider turning it on for WebKitLegacy as well. MediaCapabilitiesExtensionsEnabled: -@@ -1344,7 +1344,7 @@ SpeechRecognitionEnabled: +@@ -1341,7 +1341,7 @@ SpeechRecognitionEnabled: WebKitLegacy: default: false WebKit: @@ -2116,6 +2202,44 @@ index 51878a8f49532b758568fbcb68a1d1fdbd856cf6..90cbb18c4790ab507683e3012f62e30b default: false WebCore: default: false +@@ -1456,6 +1456,7 @@ UseGPUProcessForDisplayCapture: + WebKit: + default: false + ++# Playwright: force-disable on Windows + UseGPUProcessForWebGLEnabled: + type: bool + humanReadableName: "GPU Process: WebGL" +@@ -1466,7 +1467,7 @@ UseGPUProcessForWebGLEnabled: + defaultValue: + WebKit: + "ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY) && !HAVE(UIKIT_WEBKIT_INTERNALS)": true +- "PLATFORM(WIN)": true ++ "PLATFORM(WIN)": false + default: false + + UseScreenCaptureKit: +diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml +index 65aca5319527cb7c4d67e80b6974362dbb7ef472..1e98cb197bd40b7e46aaaba4105bfe13bc3e068b 100644 +--- a/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml ++++ b/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml +@@ -968,6 +968,7 @@ UseCGDisplayListsForDOMRendering: + WebKit: + default: true + ++# Playwright: force-disable on Windows + UseGPUProcessForCanvasRenderingEnabled: + type: bool + humanReadableName: "GPU Process: Canvas Rendering" +@@ -978,7 +979,7 @@ UseGPUProcessForCanvasRenderingEnabled: + defaultValue: + WebKit: + "ENABLE(GPU_PROCESS_BY_DEFAULT)": true +- "PLATFORM(WIN)": true ++ "PLATFORM(WIN)": false; + default: false + + UseGPUProcessForMediaEnabled: diff --git a/Source/WTF/wtf/DateMath.cpp b/Source/WTF/wtf/DateMath.cpp index 01976e039682c467765ef77d54925dd84a4b7da1..b8c108fc4a165256f7fed2572fadac70a64770eb 100644 --- a/Source/WTF/wtf/DateMath.cpp @@ -2286,10 +2410,10 @@ index b0d2759faf139f416d441b673b19bfe3cbf638da..ec980b87235c594f8ad126d171f59abc #endif diff --git a/Source/WTF/wtf/PlatformGTK.cmake b/Source/WTF/wtf/PlatformGTK.cmake -index 3901bfb0f5479064f4e7b67c90621ff26d74b580..5b3615a871d0d7123822394c94d5ce1005e80394 100644 +index bb01bfeeac63f854fa656ec6b8d262fafc4c9df5..f8376ea8aada69d2e53734ba8fd234c2455c2b09 100644 --- a/Source/WTF/wtf/PlatformGTK.cmake +++ b/Source/WTF/wtf/PlatformGTK.cmake -@@ -77,6 +77,7 @@ list(APPEND WTF_LIBRARIES +@@ -79,6 +79,7 @@ list(APPEND WTF_LIBRARIES ${GLIB_LIBRARIES} Threads::Threads ZLIB::ZLIB @@ -2298,10 +2422,10 @@ index 3901bfb0f5479064f4e7b67c90621ff26d74b580..5b3615a871d0d7123822394c94d5ce10 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 1bb252cb5e5e7760df48a3d3f33b78a70ad18a1f..9d7e465872e1f5d1ba5439f7e0ad0510fc6f1753 100644 +index b4ec79afeb7f2f2e5b3f127715f39b12fea367c8..8d522bb769c639042627bd19fe1ef655736cc972 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h -@@ -416,7 +416,7 @@ +@@ -414,7 +414,7 @@ #define HAVE_FOUNDATION_WITH_SAME_SITE_COOKIE_SUPPORT 1 #endif @@ -2311,10 +2435,10 @@ index 1bb252cb5e5e7760df48a3d3f33b78a70ad18a1f..9d7e465872e1f5d1ba5439f7e0ad0510 #endif diff --git a/Source/WTF/wtf/PlatformWPE.cmake b/Source/WTF/wtf/PlatformWPE.cmake -index f8bedf1af5d20d9c93a96af565e416bfb0df6faa..a072e5e130822d3658cbab453aef8d160a0a73de 100644 +index 09d4af604a835c7c6be1e43c249565bd1053aff4..0d6112342480454ce41a6b56dd925e1d41880e0b 100644 --- a/Source/WTF/wtf/PlatformWPE.cmake +++ b/Source/WTF/wtf/PlatformWPE.cmake -@@ -50,6 +50,7 @@ list(APPEND WTF_LIBRARIES +@@ -52,6 +52,7 @@ list(APPEND WTF_LIBRARIES ${GLIB_LIBRARIES} Threads::Threads ZLIB::ZLIB @@ -2323,10 +2447,10 @@ index f8bedf1af5d20d9c93a96af565e416bfb0df6faa..a072e5e130822d3658cbab453aef8d16 if (Journald_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index 1ec22835adece9c3b2bc6aba6c53c4fec0027430..46ea0bfbcd6e9617efbba223b3a725d79ab7e715 100644 +index 71a8ce7086fa79daa8b751315bf43a443a619afb..fec3566469dc5566641b65421b83010cfacf046f 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -965,6 +965,10 @@ JS_BINDING_IDLS := \ +@@ -976,6 +976,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2337,7 +2461,7 @@ index 1ec22835adece9c3b2bc6aba6c53c4fec0027430..46ea0bfbcd6e9617efbba223b3a725d7 $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1507,9 +1511,6 @@ JS_BINDING_IDLS := \ +@@ -1518,9 +1522,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2363,10 +2487,10 @@ index cd372f43691add4d7df0c9e52570eaffd2934037..55ee984ef83a06ba7cc47b0d3beee254 } diff --git a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm -index b6229908e74ac02799d7742b14329fd33dc476a9..97324f0e5420e14ebbce05f5f88d7d55269941a6 100644 +index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d768ace22 100644 --- a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm +++ b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm -@@ -200,6 +200,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -198,6 +198,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognizer:(SFSpeechRecognizer *)speechRecognizer availabilityDidChange:(BOOL)available { @@ -2374,7 +2498,7 @@ index b6229908e74ac02799d7742b14329fd33dc476a9..97324f0e5420e14ebbce05f5f88d7d55 ASSERT(isMainThread()); if (available || !_task) -@@ -213,6 +214,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -211,6 +212,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didHypothesizeTranscription:(SFTranscription *)transcription { @@ -2382,7 +2506,7 @@ index b6229908e74ac02799d7742b14329fd33dc476a9..97324f0e5420e14ebbce05f5f88d7d55 ASSERT(isMainThread()); [self sendSpeechStartIfNeeded]; -@@ -221,6 +223,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -219,6 +221,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didFinishRecognition:(SFSpeechRecognitionResult *)recognitionResult { @@ -2390,7 +2514,7 @@ index b6229908e74ac02799d7742b14329fd33dc476a9..97324f0e5420e14ebbce05f5f88d7d55 ASSERT(isMainThread()); [self callbackWithTranscriptions:recognitionResult.transcriptions isFinal:YES]; -@@ -232,6 +235,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -230,6 +233,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)speechRecognitionTaskWasCancelled:(SFSpeechRecognitionTask *)task { @@ -2399,10 +2523,10 @@ index b6229908e74ac02799d7742b14329fd33dc476a9..97324f0e5420e14ebbce05f5f88d7d55 [self sendSpeechEndIfNeeded]; diff --git a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm -index c72759b767aa9587d737ea4029a3167f8c97f2e8..00008893eb30af407cc325baa9bc4ba73068f331 100644 +index bef3a522517f4c2e32f58323da98430bb0d195b6..1b5176c119145040942c0c0eb5fb524b486bc7ff 100644 --- a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm +++ b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTaskMock.mm -@@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -54,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)audioSamplesAvailable:(CMSampleBufferRef)sampleBuffer { UNUSED_PARAM(sampleBuffer); @@ -2410,7 +2534,7 @@ index c72759b767aa9587d737ea4029a3167f8c97f2e8..00008893eb30af407cc325baa9bc4ba7 + if (!_hasSentSpeechStart) { _hasSentSpeechStart = true; - _delegateCallback(SpeechRecognitionUpdate::create(_identifier, SpeechRecognitionUpdateType::SpeechStart)); + _delegateCallback(WebCore::SpeechRecognitionUpdate::create(_identifier, WebCore::SpeechRecognitionUpdateType::SpeechStart)); diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake index 9d021a1a887fb06779b063b525ac985f8f4ba37a..8378753eacb14e9fd34e906111352b5833032d38 100644 --- a/Source/WebCore/PlatformWPE.cmake @@ -2424,10 +2548,10 @@ index 9d021a1a887fb06779b063b525ac985f8f4ba37a..8378753eacb14e9fd34e906111352b58 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 8933b9f95b4c30df7514179b60317e389d142930..70627e779ac88f788bc771d0f8a4958a079c3fa0 100644 +index 2160349b0834db01052c496958b96ce90d700a60..1c28bc44b0ebb19ae49eeae27c7076628e4407ed 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -630,3 +630,9 @@ platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify +@@ -631,3 +631,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 @@ -2516,10 +2640,10 @@ index c4898d6db6bf06552f602c4b7f0a7267e64e44f4..7cf2e30729671a89c373870c5691d337 __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1ed98ad3fd 100644 +index f978f52fde6df80de39a34adb6535a4202743240..22f76c7f990652193c4bc9cb3f4faff94f802117 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5518,6 +5518,13 @@ +@@ -5523,6 +5523,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, ); }; }; @@ -2533,7 +2657,7 @@ index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1e 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, ); }; }; -@@ -17799,6 +17806,14 @@ +@@ -17842,6 +17849,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 = ""; }; @@ -2548,7 +2672,7 @@ index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1e 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 = ""; }; -@@ -24172,7 +24187,12 @@ +@@ -24252,7 +24267,12 @@ 1AF326770D78B9440068F0C4 /* EditorClient.h */, E36D701E27B71F04006531B7 /* EmptyAttachmentElementClient.h */, 93C09A800B064F00005ABD4D /* EventHandler.cpp */, @@ -2561,7 +2685,7 @@ index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1e E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -30152,6 +30172,8 @@ +@@ -30245,6 +30265,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2570,7 +2694,7 @@ index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1e 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32475,6 +32497,7 @@ +@@ -32571,6 +32593,7 @@ BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, @@ -2578,7 +2702,7 @@ index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1e 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -33483,6 +33506,7 @@ +@@ -33580,6 +33603,7 @@ 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, @@ -2586,7 +2710,7 @@ index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1e 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -35621,6 +35645,7 @@ +@@ -35722,6 +35746,7 @@ 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, @@ -2594,7 +2718,7 @@ index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1e 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -36741,6 +36766,7 @@ +@@ -36843,6 +36868,7 @@ 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, @@ -2602,7 +2726,7 @@ index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1e CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, CD1F9B032700323D00617EB6 /* PlatformVideoMatrixCoefficients.h in Headers */, -@@ -38811,6 +38837,7 @@ +@@ -38936,6 +38962,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2610,7 +2734,7 @@ index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1e 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -38887,6 +38914,7 @@ +@@ -39012,6 +39039,7 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, @@ -2618,7 +2742,7 @@ index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1e 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -38935,6 +38963,7 @@ +@@ -39060,6 +39088,7 @@ 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, @@ -2626,7 +2750,7 @@ index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1e DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -39467,6 +39496,7 @@ +@@ -39592,6 +39621,7 @@ 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, @@ -2635,7 +2759,7 @@ index dd8ee7bc210c18b38668d2e6997e442888af508e..ed6c8dcc3e43fee9777e9bb27ecd2d1e 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 895e3db2ded53c24c71c94f03c3acc501736af44..da256c70f6e08dd57087bda1004ce113440b6f43 100644 +index 8081e9adc499d8e314c69a0e31fd04fc4e5bdc7b..1c2e7cfe4d4d6717710cf1312f69f154664f3294 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -61,6 +61,7 @@ @@ -2646,7 +2770,7 @@ index 895e3db2ded53c24c71c94f03c3acc501736af44..da256c70f6e08dd57087bda1004ce113 #include "LocalizedStrings.h" #include "MathMLNames.h" #include "NodeList.h" -@@ -3712,9 +3713,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const +@@ -3708,9 +3709,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const if (roleValue() == AccessibilityRole::ApplicationDialog) return AccessibilityObjectInclusion::IncludeObject; @@ -2664,7 +2788,7 @@ index 895e3db2ded53c24c71c94f03c3acc501736af44..da256c70f6e08dd57087bda1004ce113 { AXComputedObjectAttributeCache* attributeCache = nullptr; diff --git a/Source/WebCore/accessibility/AccessibilityObjectInterface.h b/Source/WebCore/accessibility/AccessibilityObjectInterface.h -index fe3afcba7c61f5f2e61b231b4d8cc58c7d45ec1c..6d7beed7c0113c2e98ac0469f90335748c72c124 100644 +index 9745720d2af33481ae6ed33723d08b06ee0d97f7..35269a4daca7bd541321426b272c223505bfb35f 100644 --- a/Source/WebCore/accessibility/AccessibilityObjectInterface.h +++ b/Source/WebCore/accessibility/AccessibilityObjectInterface.h @@ -57,7 +57,7 @@ typedef const struct __AXTextMarkerRange* AXTextMarkerRangeRef; @@ -2676,7 +2800,7 @@ index fe3afcba7c61f5f2e61b231b4d8cc58c7d45ec1c..6d7beed7c0113c2e98ac0469f9033574 #endif namespace PAL { -@@ -1535,6 +1535,8 @@ private: +@@ -1530,6 +1530,8 @@ private: COMPtr m_wrapper; #elif USE(ATSPI) RefPtr m_wrapper; @@ -2783,10 +2907,10 @@ index 0000000000000000000000000000000000000000..dd2d8452302999e4a89b0bc18e842645 + +#endif // ENABLE(ACCESSIBILITY) && !USE(ATK) && !USE(ATSPI) diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -index 8fcf8f5bb6e9e4dc91af731b86bfeefdb29c3fc8..1d9b0bd63fb7bb1a82967a0076fbf27fb2c9926a 100644 +index c128577029f09d0f6a0ce77b2e0d85c19c2e9fc0..934500913a61c2f7763ac1f58100ac17515bc553 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -@@ -122,6 +122,8 @@ namespace WebCore { +@@ -131,6 +131,8 @@ namespace WebCore { macro(DataTransferItem) \ macro(DataTransferItemList) \ macro(DelayNode) \ @@ -2796,7 +2920,7 @@ index 8fcf8f5bb6e9e4dc91af731b86bfeefdb29c3fc8..1d9b0bd63fb7bb1a82967a0076fbf27f macro(DynamicsCompressorNode) \ macro(ExtendableEvent) \ diff --git a/Source/WebCore/css/MediaQueryEvaluator.cpp b/Source/WebCore/css/MediaQueryEvaluator.cpp -index d99486302318c76f9683ba21c91bbb20a0a34478..55450f40c6212535307c63cb337da67f37a0d12a 100644 +index 6c87e4f8941abc8da9829833a9275975ddc2c96d..0119365699fe02326102de0cf1aea74164b10671 100644 --- a/Source/WebCore/css/MediaQueryEvaluator.cpp +++ b/Source/WebCore/css/MediaQueryEvaluator.cpp @@ -856,7 +856,11 @@ static bool prefersContrastEvaluate(CSSValue* value, const CSSToLengthConversion @@ -2821,7 +2945,7 @@ index d99486302318c76f9683ba21c91bbb20a0a34478..55450f40c6212535307c63cb337da67f if (!value) return userPrefersReducedMotion; diff --git a/Source/WebCore/dom/DataTransfer.cpp b/Source/WebCore/dom/DataTransfer.cpp -index 86ab889bc0ea15a547357fb64dff9f10b862dc54..ec5f9a66c29431a1bbf24c4013e45042d584965c 100644 +index acaf08cbd1585893d268af9ccbeab346c00a9365..31e458d7dc73de7ea1683f6b0cba1cb57c36f956 100644 --- a/Source/WebCore/dom/DataTransfer.cpp +++ b/Source/WebCore/dom/DataTransfer.cpp @@ -494,6 +494,14 @@ Ref DataTransfer::createForDrag(const Document& document) @@ -2914,7 +3038,7 @@ index f27718c1e2b8cd0a8075e556d4cdba7d9ae8fc54..2b61721594e5435845f3151e0de345e9 ] partial interface Element { undefined requestPointerLock(); diff --git a/Source/WebCore/dom/PointerEvent.cpp b/Source/WebCore/dom/PointerEvent.cpp -index f21879fdfbc64e7d2f11ab084d46794a9e601110..151c9b72f0f552c2ff741305c4c0a8c7f51a92e3 100644 +index 94fd003aaa80cff5a7eadaf4fb4b192d82a9ed15..7f884017c978667fb4cdc7f74cfb3fc074cdb9ff 100644 --- a/Source/WebCore/dom/PointerEvent.cpp +++ b/Source/WebCore/dom/PointerEvent.cpp @@ -114,4 +114,61 @@ EventInterface PointerEvent::eventInterface() const @@ -2980,7 +3104,7 @@ index f21879fdfbc64e7d2f11ab084d46794a9e601110..151c9b72f0f552c2ff741305c4c0a8c7 + } // namespace WebCore diff --git a/Source/WebCore/dom/PointerEvent.h b/Source/WebCore/dom/PointerEvent.h -index 9d60b85152f378566118574663701c25b001df3d..9811ce9aa6f066c57acf65f629d2ab8155c090e1 100644 +index 7abc7ba8310be6c7dca3bf787a39bbbf3ae0e140..c6a6c4f31a5109accb4314842bf187b47174d196 100644 --- a/Source/WebCore/dom/PointerEvent.h +++ b/Source/WebCore/dom/PointerEvent.h @@ -33,6 +33,8 @@ @@ -3011,7 +3135,7 @@ index 9d60b85152f378566118574663701c25b001df3d..9811ce9aa6f066c57acf65f629d2ab81 #endif diff --git a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp b/Source/WebCore/editing/libwpe/EditorLibWPE.cpp -index b978e2e8f8e882bbc7d0f91cad76c382508e9a3f..ba014f922a36f0fa6005b4b0bb0d3b4d2bece0c1 100644 +index 491490579e6b911498449ca829fc9158851ab8d9..725996216e7349784c2c81ba0f619ceda7db7123 100644 --- a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp +++ b/Source/WebCore/editing/libwpe/EditorLibWPE.cpp @@ -33,6 +33,7 @@ @@ -3495,7 +3619,7 @@ index 51badf49a6ce08975d655efa01cca9cd877e8f6b..ea4240cf72670cedfbd8b38d4d013676 { return context ? instrumentingAgents(*context) : nullptr; diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp -index 0e186bcea701c6631985df40bc9a9b1e8784f0af..5e4b051b882433075148723e6a1258d18c559b73 100644 +index d389ec07ae87bc95b56809e8db8259088e052a06..bfe286f6638ad8417dfa22310ef70a68093e9782 100644 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp @@ -62,12 +62,16 @@ @@ -3674,10 +3798,10 @@ index 0e186bcea701c6631985df40bc9a9b1e8784f0af..5e4b051b882433075148723e6a1258d1 + bool insideFixed; + LayoutRect absoluteBounds = renderer->absoluteBoundingBoxRect(true, &insideFixed); + if (rect) { -+ std::optional x = rect->getDouble("x"); -+ std::optional y = rect->getDouble("y"); -+ std::optional width = rect->getDouble("width"); -+ std::optional height = rect->getDouble("height"); ++ std::optional x = rect->getDouble("x"_s); ++ std::optional y = rect->getDouble("y"_s); ++ std::optional width = rect->getDouble("width"_s); ++ std::optional height = rect->getDouble("height"_s); + if (!x || !y || !width || !height) + return makeUnexpected("Malformed rect"_s); + @@ -3729,7 +3853,7 @@ index 0e186bcea701c6631985df40bc9a9b1e8784f0af..5e4b051b882433075148723e6a1258d1 if (!object) return makeUnexpected("Missing injected script for given nodeId"_s); -@@ -2947,7 +3080,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::pushNodeByPath +@@ -2952,7 +3085,7 @@ Protocol::ErrorStringOr InspectorDOMAgent::pushNodeByPath return makeUnexpected("Missing node for given path"_s); } @@ -3738,7 +3862,7 @@ index 0e186bcea701c6631985df40bc9a9b1e8784f0af..5e4b051b882433075148723e6a1258d1 { Document* document = &node->document(); if (auto* templateHost = document->templateDocumentHost()) -@@ -2956,12 +3089,18 @@ RefPtr InspectorDOMAgent::resolveNode(Node* nod +@@ -2961,12 +3094,18 @@ RefPtr InspectorDOMAgent::resolveNode(Node* nod if (!frame) return nullptr; @@ -3760,7 +3884,7 @@ index 0e186bcea701c6631985df40bc9a9b1e8784f0af..5e4b051b882433075148723e6a1258d1 } Node* InspectorDOMAgent::scriptValueAsNode(JSC::JSValue value) -@@ -2984,4 +3123,57 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT +@@ -2989,4 +3128,57 @@ Protocol::ErrorStringOr InspectorDOMAgent::setAllowEditingUserAgentShadowT return { }; } @@ -3791,7 +3915,7 @@ index 0e186bcea701c6631985df40bc9a9b1e8784f0af..5e4b051b882433075148723e6a1258d1 + String name; + String type; + String data; -+ if (!obj->getString("name", name) || !obj->getString("type", type) || !obj->getString("data", data)) ++ if (!obj->getString("name"_s, name) || !obj->getString("type"_s, type) || !obj->getString("data"_s, data)) + return makeUnexpected("Invalid file payload format"_s); + + std::optional> buffer = base64Decode(data); @@ -3904,7 +4028,7 @@ index e0cd2af16589ce137c79fa896a55ee461b77a318..4381b9ff1d1d62dd9b0ffddde303e7ea class Page; class SecurityOrigin; diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp -index 6e5a5fc89ccef05b73ceda257d6c59cb0e82861c..8d32d6cbce1827a32f4aad33f4ac1535886bfb52 100644 +index 0b4cb4599a309e0b8c340a67eed871b29e1a371e..3def71c06bc26bc0963b16cb91e673dc9624ccf0 100644 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp @@ -45,6 +45,7 @@ @@ -3923,7 +4047,7 @@ index 6e5a5fc89ccef05b73ceda257d6c59cb0e82861c..8d32d6cbce1827a32f4aad33f4ac1535 #include "Page.h" #include "PlatformStrategies.h" #include "ProgressTracker.h" -@@ -304,8 +306,8 @@ static Ref buildObjectForResourceRequest(const Resou +@@ -306,8 +308,8 @@ static Ref buildObjectForResourceRequest(const Resou .setHeaders(buildObjectForHeaders(request.httpHeaderFields())) .release(); if (request.httpBody() && !request.httpBody()->isEmpty()) { @@ -3934,7 +4058,7 @@ index 6e5a5fc89ccef05b73ceda257d6c59cb0e82861c..8d32d6cbce1827a32f4aad33f4ac1535 } return requestObject; } -@@ -350,6 +352,8 @@ RefPtr InspectorNetworkAgent::buildObjectForResourc +@@ -352,6 +354,8 @@ RefPtr InspectorNetworkAgent::buildObjectForResourc .setSource(responseSource(response.source())) .release(); @@ -3943,7 +4067,7 @@ index 6e5a5fc89ccef05b73ceda257d6c59cb0e82861c..8d32d6cbce1827a32f4aad33f4ac1535 if (resourceLoader) { auto* metrics = response.deprecatedNetworkLoadMetricsOrNull(); responseObject->setTiming(buildObjectForTiming(metrics ? *metrics : NetworkLoadMetrics::emptyMetrics(), *resourceLoader)); -@@ -487,9 +491,15 @@ static InspectorPageAgent::ResourceType resourceTypeForLoadType(InspectorInstrum +@@ -489,9 +493,15 @@ static InspectorPageAgent::ResourceType resourceTypeForLoadType(InspectorInstrum void InspectorNetworkAgent::willSendRequest(ResourceLoaderIdentifier identifier, DocumentLoader* loader, ResourceRequest& request, const ResourceResponse& redirectResponse, const CachedResource* cachedResource) { @@ -3962,7 +4086,7 @@ index 6e5a5fc89ccef05b73ceda257d6c59cb0e82861c..8d32d6cbce1827a32f4aad33f4ac1535 } void InspectorNetworkAgent::willSendRequestOfType(ResourceLoaderIdentifier identifier, DocumentLoader* loader, ResourceRequest& request, InspectorInstrumentation::LoadType loadType) -@@ -1186,6 +1196,9 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptWithRequest(const +@@ -1188,6 +1198,9 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptWithRequest(const return makeUnexpected("Missing pending intercept request for given requestId"_s); auto& loader = *pendingRequest->m_loader; @@ -3972,7 +4096,7 @@ index 6e5a5fc89ccef05b73ceda257d6c59cb0e82861c..8d32d6cbce1827a32f4aad33f4ac1535 ResourceRequest request = loader.request(); if (!!url) request.setURL(URL({ }, url)); -@@ -1285,14 +1298,25 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithRespons +@@ -1287,14 +1300,25 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithRespons response.setHTTPStatusCode(status); response.setHTTPStatusText(statusText); HTTPHeaderMap explicitHeaders; @@ -4000,7 +4124,7 @@ index 6e5a5fc89ccef05b73ceda257d6c59cb0e82861c..8d32d6cbce1827a32f4aad33f4ac1535 if (buffer->size()) loader->didReceiveData(buffer, buffer->size(), DataPayloadWholeResource); loader->didFinishLoading(NetworkLoadMetrics()); -@@ -1333,6 +1357,12 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithError(c +@@ -1335,6 +1359,12 @@ Protocol::ErrorStringOr InspectorNetworkAgent::interceptRequestWithError(c return { }; } @@ -4013,7 +4137,7 @@ index 6e5a5fc89ccef05b73ceda257d6c59cb0e82861c..8d32d6cbce1827a32f4aad33f4ac1535 bool InspectorNetworkAgent::shouldTreatAsText(const String& mimeType) { return startsWithLettersIgnoringASCIICase(mimeType, "text/") -@@ -1374,6 +1404,12 @@ std::optional InspectorNetworkAgent::textContentForCachedResource(Cached +@@ -1376,6 +1406,12 @@ std::optional InspectorNetworkAgent::textContentForCachedResource(Cached return std::nullopt; } @@ -4056,7 +4180,7 @@ index 72f423ff61277eef4bd356328c46d3bd9131ff65..ede5b6605b1e661b9d5d73e02fe6ae4c // InspectorInstrumentation void willRecalculateStyle(); diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp -index d1b269f8fa7d65aa484205fd5028d89457e3af17..5f439b0efe74d692296183eaac4e2b595072d1f2 100644 +index af35e0a95ea8149aa54932b09faddbeab52004fc..366767eb06f6c4a39ed424b5c5037453f0523cac 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp @@ -32,20 +32,28 @@ @@ -4598,311 +4722,311 @@ index d1b269f8fa7d65aa484205fd5028d89457e3af17..5f439b0efe74d692296183eaac4e2b59 + AccessibilityRole role = axObject->roleValue(); + switch(role) { + case AccessibilityRole::Annotation: -+ return "Annotation"; ++ return "Annotation"_s; + case AccessibilityRole::Application: -+ return "Application"; ++ return "Application"_s; + case AccessibilityRole::ApplicationAlert: -+ return "ApplicationAlert"; ++ return "ApplicationAlert"_s; + case AccessibilityRole::ApplicationAlertDialog: -+ return "ApplicationAlertDialog"; ++ return "ApplicationAlertDialog"_s; + case AccessibilityRole::ApplicationDialog: -+ return "ApplicationDialog"; ++ return "ApplicationDialog"_s; + case AccessibilityRole::ApplicationGroup: -+ return "ApplicationGroup"; ++ return "ApplicationGroup"_s; + case AccessibilityRole::ApplicationLog: -+ return "ApplicationLog"; ++ return "ApplicationLog"_s; + case AccessibilityRole::ApplicationMarquee: -+ return "ApplicationMarquee"; ++ return "ApplicationMarquee"_s; + case AccessibilityRole::ApplicationStatus: -+ return "ApplicationStatus"; ++ return "ApplicationStatus"_s; + case AccessibilityRole::ApplicationTextGroup: -+ return "ApplicationTextGroup"; ++ return "ApplicationTextGroup"_s; + case AccessibilityRole::ApplicationTimer: -+ return "ApplicationTimer"; ++ return "ApplicationTimer"_s; + case AccessibilityRole::Audio: -+ return "Audio"; ++ return "Audio"_s; + case AccessibilityRole::Blockquote: -+ return "Blockquote"; ++ return "Blockquote"_s; + case AccessibilityRole::Browser: -+ return "Browser"; ++ return "Browser"_s; + case AccessibilityRole::BusyIndicator: -+ return "BusyIndicator"; ++ return "BusyIndicator"_s; + case AccessibilityRole::Button: -+ return "Button"; ++ return "Button"_s; + case AccessibilityRole::Canvas: -+ return "Canvas"; ++ return "Canvas"_s; + case AccessibilityRole::Caption: -+ return "Caption"; ++ return "Caption"_s; + case AccessibilityRole::Cell: -+ return "Cell"; ++ return "Cell"_s; + case AccessibilityRole::CheckBox: -+ return "CheckBox"; ++ return "CheckBox"_s; + case AccessibilityRole::ColorWell: -+ return "ColorWell"; ++ return "ColorWell"_s; + case AccessibilityRole::Column: -+ return "Column"; ++ return "Column"_s; + case AccessibilityRole::ColumnHeader: -+ return "ColumnHeader"; ++ return "ColumnHeader"_s; + case AccessibilityRole::ComboBox: -+ return "ComboBox"; ++ return "ComboBox"_s; + case AccessibilityRole::Definition: -+ return "Definition"; ++ return "Definition"_s; + case AccessibilityRole::Deletion: -+ return "Deletion"; ++ return "Deletion"_s; + case AccessibilityRole::DescriptionList: -+ return "DescriptionList"; ++ return "DescriptionList"_s; + case AccessibilityRole::DescriptionListTerm: -+ return "DescriptionListTerm"; ++ return "DescriptionListTerm"_s; + case AccessibilityRole::DescriptionListDetail: -+ return "DescriptionListDetail"; ++ return "DescriptionListDetail"_s; + case AccessibilityRole::Details: -+ return "Details"; ++ return "Details"_s; + case AccessibilityRole::Directory: -+ return "Directory"; ++ return "Directory"_s; + case AccessibilityRole::DisclosureTriangle: -+ return "DisclosureTriangle"; ++ return "DisclosureTriangle"_s; + case AccessibilityRole::Div: -+ return "Div"; ++ return "Div"_s; + case AccessibilityRole::Document: -+ return "Document"; ++ return "Document"_s; + case AccessibilityRole::DocumentArticle: -+ return "DocumentArticle"; ++ return "DocumentArticle"_s; + case AccessibilityRole::DocumentMath: -+ return "DocumentMath"; ++ return "DocumentMath"_s; + case AccessibilityRole::DocumentNote: -+ return "DocumentNote"; ++ return "DocumentNote"_s; + case AccessibilityRole::Drawer: -+ return "Drawer"; ++ return "Drawer"_s; + case AccessibilityRole::EditableText: -+ return "EditableText"; ++ return "EditableText"_s; + case AccessibilityRole::Feed: -+ return "Feed"; ++ return "Feed"_s; + case AccessibilityRole::Figure: -+ return "Figure"; ++ return "Figure"_s; + case AccessibilityRole::Footer: -+ return "Footer"; ++ return "Footer"_s; + case AccessibilityRole::Footnote: -+ return "Footnote"; ++ return "Footnote"_s; + case AccessibilityRole::Form: -+ return "Form"; ++ return "Form"_s; + case AccessibilityRole::GraphicsDocument: -+ return "GraphicsDocument"; ++ return "GraphicsDocument"_s; + case AccessibilityRole::GraphicsObject: -+ return "GraphicsObject"; ++ return "GraphicsObject"_s; + case AccessibilityRole::GraphicsSymbol: -+ return "GraphicsSymbol"; ++ return "GraphicsSymbol"_s; + case AccessibilityRole::Grid: -+ return "Grid"; ++ return "Grid"_s; + case AccessibilityRole::GridCell: -+ return "GridCell"; ++ return "GridCell"_s; + case AccessibilityRole::Group: -+ return "Group"; ++ return "Group"_s; + case AccessibilityRole::GrowArea: -+ return "GrowArea"; ++ return "GrowArea"_s; + case AccessibilityRole::Heading: -+ return "Heading"; ++ return "Heading"_s; + case AccessibilityRole::HelpTag: -+ return "HelpTag"; ++ return "HelpTag"_s; + case AccessibilityRole::HorizontalRule: -+ return "HorizontalRule"; ++ return "HorizontalRule"_s; + case AccessibilityRole::Ignored: -+ return "Ignored"; ++ return "Ignored"_s; + case AccessibilityRole::Inline: -+ return "Inline"; ++ return "Inline"_s; + case AccessibilityRole::Image: -+ return "Image"; ++ return "Image"_s; + case AccessibilityRole::ImageMap: -+ return "ImageMap"; ++ return "ImageMap"_s; + case AccessibilityRole::ImageMapLink: -+ return "ImageMapLink"; ++ return "ImageMapLink"_s; + case AccessibilityRole::Incrementor: -+ return "Incrementor"; ++ return "Incrementor"_s; + case AccessibilityRole::Insertion: -+ return "Insertion"; ++ return "Insertion"_s; + case AccessibilityRole::Label: -+ return "Label"; ++ return "Label"_s; + case AccessibilityRole::LandmarkBanner: -+ return "LandmarkBanner"; ++ return "LandmarkBanner"_s; + case AccessibilityRole::LandmarkComplementary: -+ return "LandmarkComplementary"; ++ return "LandmarkComplementary"_s; + case AccessibilityRole::LandmarkContentInfo: -+ return "LandmarkContentInfo"; ++ return "LandmarkContentInfo"_s; + case AccessibilityRole::LandmarkDocRegion: -+ return "LandmarkDocRegion"; ++ return "LandmarkDocRegion"_s; + case AccessibilityRole::LandmarkMain: -+ return "LandmarkMain"; ++ return "LandmarkMain"_s; + case AccessibilityRole::LandmarkNavigation: -+ return "LandmarkNavigation"; ++ return "LandmarkNavigation"_s; + case AccessibilityRole::LandmarkRegion: -+ return "LandmarkRegion"; ++ return "LandmarkRegion"_s; + case AccessibilityRole::LandmarkSearch: -+ return "LandmarkSearch"; ++ return "LandmarkSearch"_s; + case AccessibilityRole::Legend: -+ return "Legend"; ++ return "Legend"_s; + case AccessibilityRole::Link: -+ return "Link"; ++ return "Link"_s; + case AccessibilityRole::List: -+ return "List"; ++ return "List"_s; + case AccessibilityRole::ListBox: -+ return "ListBox"; ++ return "ListBox"_s; + case AccessibilityRole::ListBoxOption: -+ return "ListBoxOption"; ++ return "ListBoxOption"_s; + case AccessibilityRole::ListItem: -+ return "ListItem"; ++ return "ListItem"_s; + case AccessibilityRole::ListMarker: -+ return "ListMarker"; ++ return "ListMarker"_s; + case AccessibilityRole::Mark: -+ return "Mark"; ++ return "Mark"_s; + case AccessibilityRole::MathElement: -+ return "MathElement"; ++ return "MathElement"_s; + case AccessibilityRole::Matte: -+ return "Matte"; ++ return "Matte"_s; + case AccessibilityRole::Menu: -+ return "Menu"; ++ return "Menu"_s; + case AccessibilityRole::MenuBar: -+ return "MenuBar"; ++ return "MenuBar"_s; + case AccessibilityRole::MenuButton: -+ return "MenuButton"; ++ return "MenuButton"_s; + case AccessibilityRole::MenuItem: -+ return "MenuItem"; ++ return "MenuItem"_s; + case AccessibilityRole::MenuItemCheckbox: -+ return "MenuItemCheckbox"; ++ return "MenuItemCheckbox"_s; + case AccessibilityRole::MenuItemRadio: -+ return "MenuItemRadio"; ++ return "MenuItemRadio"_s; + case AccessibilityRole::MenuListPopup: -+ return "MenuListPopup"; ++ return "MenuListPopup"_s; + case AccessibilityRole::MenuListOption: -+ return "MenuListOption"; ++ return "MenuListOption"_s; + case AccessibilityRole::Meter: -+ return "Meter"; ++ return "Meter"_s; + case AccessibilityRole::Model: -+ return "Model"; ++ return "Model"_s; + case AccessibilityRole::Outline: -+ return "Outline"; ++ return "Outline"_s; + case AccessibilityRole::Paragraph: -+ return "Paragraph"; ++ return "Paragraph"_s; + case AccessibilityRole::PopUpButton: -+ return "PopUpButton"; ++ return "PopUpButton"_s; + case AccessibilityRole::Pre: -+ return "Pre"; ++ return "Pre"_s; + case AccessibilityRole::Presentational: -+ return "Presentational"; ++ return "Presentational"_s; + case AccessibilityRole::ProgressIndicator: -+ return "ProgressIndicator"; ++ return "ProgressIndicator"_s; + case AccessibilityRole::RadioButton: -+ return "RadioButton"; ++ return "RadioButton"_s; + case AccessibilityRole::RadioGroup: -+ return "RadioGroup"; ++ return "RadioGroup"_s; + case AccessibilityRole::RowHeader: -+ return "RowHeader"; ++ return "RowHeader"_s; + case AccessibilityRole::Row: -+ return "Row"; ++ return "Row"_s; + case AccessibilityRole::RowGroup: -+ return "RowGroup"; ++ return "RowGroup"_s; + case AccessibilityRole::RubyBase: -+ return "RubyBase"; ++ return "RubyBase"_s; + case AccessibilityRole::RubyBlock: -+ return "RubyBlock"; ++ return "RubyBlock"_s; + case AccessibilityRole::RubyInline: -+ return "RubyInline"; ++ return "RubyInline"_s; + case AccessibilityRole::RubyRun: -+ return "RubyRun"; ++ return "RubyRun"_s; + case AccessibilityRole::RubyText: -+ return "RubyText"; ++ return "RubyText"_s; + case AccessibilityRole::Ruler: -+ return "Ruler"; ++ return "Ruler"_s; + case AccessibilityRole::RulerMarker: -+ return "RulerMarker"; ++ return "RulerMarker"_s; + case AccessibilityRole::ScrollArea: -+ return "ScrollArea"; ++ return "ScrollArea"_s; + case AccessibilityRole::ScrollBar: -+ return "ScrollBar"; ++ return "ScrollBar"_s; + case AccessibilityRole::SearchField: -+ return "SearchField"; ++ return "SearchField"_s; + case AccessibilityRole::Sheet: -+ return "Sheet"; ++ return "Sheet"_s; + case AccessibilityRole::Slider: -+ return "Slider"; ++ return "Slider"_s; + case AccessibilityRole::SliderThumb: -+ return "SliderThumb"; ++ return "SliderThumb"_s; + case AccessibilityRole::SpinButton: -+ return "SpinButton"; ++ return "SpinButton"_s; + case AccessibilityRole::SpinButtonPart: -+ return "SpinButtonPart"; ++ return "SpinButtonPart"_s; + case AccessibilityRole::SplitGroup: -+ return "SplitGroup"; ++ return "SplitGroup"_s; + case AccessibilityRole::Splitter: -+ return "Splitter"; ++ return "Splitter"_s; + case AccessibilityRole::StaticText: -+ return "StaticText"; ++ return "StaticText"_s; + case AccessibilityRole::Subscript: -+ return "Subscript"; ++ return "Subscript"_s; + case AccessibilityRole::Summary: -+ return "Summary"; ++ return "Summary"_s; + case AccessibilityRole::Superscript: -+ return "Superscript"; ++ return "Superscript"_s; + case AccessibilityRole::Switch: -+ return "Switch"; ++ return "Switch"_s; + case AccessibilityRole::SystemWide: -+ return "SystemWide"; ++ return "SystemWide"_s; + case AccessibilityRole::SVGRoot: -+ return "SVGRoot"; ++ return "SVGRoot"_s; + case AccessibilityRole::SVGText: -+ return "SVGText"; ++ return "SVGText"_s; + case AccessibilityRole::SVGTSpan: -+ return "SVGTSpan"; ++ return "SVGTSpan"_s; + case AccessibilityRole::SVGTextPath: -+ return "SVGTextPath"; ++ return "SVGTextPath"_s; + case AccessibilityRole::TabGroup: -+ return "TabGroup"; ++ return "TabGroup"_s; + case AccessibilityRole::TabList: -+ return "TabList"; ++ return "TabList"_s; + case AccessibilityRole::TabPanel: -+ return "TabPanel"; ++ return "TabPanel"_s; + case AccessibilityRole::Tab: -+ return "Tab"; ++ return "Tab"_s; + case AccessibilityRole::Table: -+ return "Table"; ++ return "Table"_s; + case AccessibilityRole::TableHeaderContainer: -+ return "TableHeaderContainer"; ++ return "TableHeaderContainer"_s; + case AccessibilityRole::TextArea: -+ return "TextArea"; ++ return "TextArea"_s; + case AccessibilityRole::TextGroup: -+ return "TextGroup"; ++ return "TextGroup"_s; + case AccessibilityRole::Term: -+ return "Term"; ++ return "Term"_s; + case AccessibilityRole::Time: -+ return "Time"; ++ return "Time"_s; + case AccessibilityRole::Tree: -+ return "Tree"; ++ return "Tree"_s; + case AccessibilityRole::TreeGrid: -+ return "TreeGrid"; ++ return "TreeGrid"_s; + case AccessibilityRole::TreeItem: -+ return "TreeItem"; ++ return "TreeItem"_s; + case AccessibilityRole::TextField: -+ return "TextField"; ++ return "TextField"_s; + case AccessibilityRole::ToggleButton: -+ return "ToggleButton"; ++ return "ToggleButton"_s; + case AccessibilityRole::Toolbar: -+ return "Toolbar"; ++ return "Toolbar"_s; + case AccessibilityRole::Unknown: -+ return "Unknown"; ++ return "Unknown"_s; + case AccessibilityRole::UserInterfaceTooltip: -+ return "UserInterfaceTooltip"; ++ return "UserInterfaceTooltip"_s; + case AccessibilityRole::ValueIndicator: -+ return "ValueIndicator"; ++ return "ValueIndicator"_s; + case AccessibilityRole::Video: -+ return "Video"; ++ return "Video"_s; + case AccessibilityRole::WebApplication: -+ return "WebApplication"; ++ return "WebApplication"_s; + case AccessibilityRole::WebArea: -+ return "WebArea"; ++ return "WebArea"_s; + case AccessibilityRole::WebCoreLink: -+ return "WebCoreLink"; ++ return "WebCoreLink"_s; + case AccessibilityRole::Window: -+ return "Window"; ++ return "Window"_s; + }; -+ return "Unknown"; ++ return "Unknown"_s; +} + +static Ref snapshotForAXObject(RefPtr axObject, Node* nodeToFind) @@ -5114,10 +5238,10 @@ index d1b269f8fa7d65aa484205fd5028d89457e3af17..5f439b0efe74d692296183eaac4e2b59 + +static std::optional parseInsets(RefPtr&& insets) +{ -+ std::optional top = insets->getDouble("top"); -+ std::optional right = insets->getDouble("right"); -+ std::optional bottom = insets->getDouble("bottom"); -+ std::optional left = insets->getDouble("left"); ++ std::optional top = insets->getDouble("top"_s); ++ std::optional right = insets->getDouble("right"_s); ++ std::optional bottom = insets->getDouble("bottom"_s); ++ std::optional left = insets->getDouble("left"_s); + if (top && right && bottom && left) + return FloatBoxExtent(static_cast(*top), static_cast(*right), static_cast(*bottom), static_cast(*left)); + return std::optional(); @@ -5125,10 +5249,10 @@ index d1b269f8fa7d65aa484205fd5028d89457e3af17..5f439b0efe74d692296183eaac4e2b59 + +static std::optional parseRect(RefPtr&& insets) +{ -+ std::optional x = insets->getDouble("x"); -+ std::optional y = insets->getDouble("y"); -+ std::optional width = insets->getDouble("width"); -+ std::optional height = insets->getDouble("height"); ++ std::optional x = insets->getDouble("x"_s); ++ std::optional y = insets->getDouble("y"_s); ++ std::optional width = insets->getDouble("width"_s); ++ std::optional height = insets->getDouble("height"_s); + if (x && y && width && height) + return FloatRect(static_cast(*x), static_cast(*y), static_cast(*width), static_cast(*height)); + return std::optional(); @@ -5143,7 +5267,7 @@ index d1b269f8fa7d65aa484205fd5028d89457e3af17..5f439b0efe74d692296183eaac4e2b59 + if (unobscuredContentRect) { + std::optional ucr = parseRect(WTFMove(unobscuredContentRect)); + if (!ucr) -+ return makeUnexpected("Invalid unobscured content rect"); ++ return makeUnexpected("Invalid unobscured content rect"_s); + + view->setUnobscuredContentSize(FloatSize(ucr->width(), ucr->height())); + } @@ -5151,7 +5275,7 @@ index d1b269f8fa7d65aa484205fd5028d89457e3af17..5f439b0efe74d692296183eaac4e2b59 + if (contentInsets) { + std::optional ci = parseInsets(WTFMove(contentInsets)); + if (!ci) -+ return makeUnexpected("Invalid content insets"); ++ return makeUnexpected("Invalid content insets"_s); + + m_inspectedPage.setContentInsets(*ci); + } @@ -5159,7 +5283,7 @@ index d1b269f8fa7d65aa484205fd5028d89457e3af17..5f439b0efe74d692296183eaac4e2b59 + if (obscuredInsets) { + std::optional oi = parseInsets(WTFMove(obscuredInsets)); + if (!oi) -+ return makeUnexpected("Invalid obscured insets"); ++ return makeUnexpected("Invalid obscured insets"_s); + + m_inspectedPage.setObscuredInsets(*oi); + } @@ -5167,7 +5291,7 @@ index d1b269f8fa7d65aa484205fd5028d89457e3af17..5f439b0efe74d692296183eaac4e2b59 + if (unobscuredInsets) { + std::optional ui = parseInsets(WTFMove(unobscuredInsets)); + if (!ui) -+ return makeUnexpected("Invalid unobscured insets"); ++ return makeUnexpected("Invalid unobscured insets"_s); + + m_inspectedPage.setUnobscuredSafeAreaInsets(*ui); + } @@ -5525,7 +5649,7 @@ index 982691dd2dfe2f65201370a12302b5086703c126..4af72beb3b1405ffac78e89e7fbb2b14 protected: static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No); diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp -index 28de7337434bec898e1651dac42d9773749084ee..f20438e0df13513ff95a6d8f467d2300d5fc7ec5 100644 +index fd9e36c475452f6f963aa25d96fffc6defc1dce2..9e5daf8d8ca46b3716852f02a0b654df962bcf35 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -1488,8 +1488,6 @@ void DocumentLoader::detachFromFrame() @@ -5556,10 +5680,10 @@ index c6450d5072d0efd0430b6d3e5420d2d2b3e943cb..74e9c8ea1366c8785f02d5bbd92e0952 DocumentWriter& writer() const { return m_writer; } diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp -index 96e62ba595d3c132063b5a4a9be166a043d1c119..d0fab0d5f673e6590b948153ddb70d05961dfa52 100644 +index 5c42705a52fe4b6a5b7b9177130c1c3fc9a618c3..0edfa805a6c17758bf46a6cf4bd51c42a3c2567c 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp -@@ -1157,6 +1157,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr stat +@@ -1161,6 +1161,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr stat } m_client->dispatchDidNavigateWithinPage(); @@ -5567,7 +5691,7 @@ index 96e62ba595d3c132063b5a4a9be166a043d1c119..d0fab0d5f673e6590b948153ddb70d05 m_frame.document()->statePopped(stateObject ? stateObject.releaseNonNull() : SerializedScriptValue::nullValue()); m_client->dispatchDidPopStateWithinPage(); -@@ -1593,6 +1594,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t +@@ -1597,6 +1598,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t const String& httpMethod = loader->request().httpMethod(); if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) { @@ -5576,7 +5700,7 @@ index 96e62ba595d3c132063b5a4a9be166a043d1c119..d0fab0d5f673e6590b948153ddb70d05 RefPtr oldDocumentLoader = m_documentLoader; NavigationAction action { *m_frame.document(), loader->request(), InitiatedByMainFrame::Unknown, policyChecker().loadType(), isFormSubmission }; -@@ -1622,7 +1625,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t +@@ -1626,7 +1629,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t } RELEASE_ASSERT(!isBackForwardLoadType(policyChecker().loadType()) || history().provisionalItem()); @@ -5586,7 +5710,7 @@ index 96e62ba595d3c132063b5a4a9be166a043d1c119..d0fab0d5f673e6590b948153ddb70d05 continueLoadAfterNavigationPolicy(request, formState.get(), navigationPolicyDecision, allowNavigationToInvalidURL); completionHandler(); }, PolicyDecisionMode::Asynchronous); -@@ -2790,12 +2795,17 @@ String FrameLoader::userAgent(const URL& url) const +@@ -2794,12 +2799,17 @@ String FrameLoader::userAgent(const URL& url) const String FrameLoader::navigatorPlatform() const { @@ -5606,7 +5730,7 @@ index 96e62ba595d3c132063b5a4a9be166a043d1c119..d0fab0d5f673e6590b948153ddb70d05 } void FrameLoader::dispatchOnloadEvents() -@@ -3202,6 +3212,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) +@@ -3206,6 +3216,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error) checkCompleted(); if (m_frame.page()) checkLoadComplete(); @@ -5615,7 +5739,7 @@ index 96e62ba595d3c132063b5a4a9be166a043d1c119..d0fab0d5f673e6590b948153ddb70d05 } void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, bool shouldContinue) -@@ -3969,9 +3981,6 @@ String FrameLoader::referrer() const +@@ -3973,9 +3985,6 @@ String FrameLoader::referrer() const void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() { @@ -5625,7 +5749,7 @@ index 96e62ba595d3c132063b5a4a9be166a043d1c119..d0fab0d5f673e6590b948153ddb70d05 Vector> worlds; ScriptController::getAllWorlds(worlds); for (auto& world : worlds) -@@ -3980,13 +3989,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() +@@ -3984,13 +3993,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds() void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world) { @@ -5692,10 +5816,10 @@ 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 ad62cbc6fbc026b2c57e9e2dc6a4ebd31d6db010..a7245b12da012cbe1469e496db016c1a1b75c8c9 100644 +index a98d1b590dc79214ca29aef33d49a724f4f9df1f..2a2d362f00998c82419d7878148e0c90ef986870 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h -@@ -318,7 +318,7 @@ public: +@@ -319,7 +319,7 @@ public: #endif #if ENABLE(ORIENTATION_EVENTS) @@ -5705,7 +5829,7 @@ index ad62cbc6fbc026b2c57e9e2dc6a4ebd31d6db010..a7245b12da012cbe1469e496db016c1a #if ENABLE(INPUT_TYPE_COLOR) diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp -index 7d2e5689e4f932dbd13b457e31957d15806dbd0e..15e520c3fb2c0980a5248f8864050239c1ed731a 100644 +index 6aa54912ee2817b2637cbefc1d2875b502fcd7be..fb99bc195cbc0a61915a908ece781cb50315ace6 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -141,6 +141,7 @@ @@ -5803,7 +5927,7 @@ index 7d2e5689e4f932dbd13b457e31957d15806dbd0e..15e520c3fb2c0980a5248f8864050239 return swallowEvent; } -@@ -4141,7 +4141,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr +@@ -4146,7 +4146,14 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr if (!m_frame.document()) return false; @@ -5819,7 +5943,7 @@ index 7d2e5689e4f932dbd13b457e31957d15806dbd0e..15e520c3fb2c0980a5248f8864050239 auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No; if (dragState().shouldDispatchEvents) { -@@ -4530,7 +4537,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4536,7 +4543,8 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) allTouchReleased = false; } @@ -5829,7 +5953,7 @@ index 7d2e5689e4f932dbd13b457e31957d15806dbd0e..15e520c3fb2c0980a5248f8864050239 PlatformTouchPoint::State pointState = point.state(); LayoutPoint pagePoint = documentPointForWindowPoint(m_frame, point.pos()); -@@ -4657,6 +4665,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) +@@ -4663,6 +4671,9 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) changedTouches[pointState].m_touches->append(WTFMove(touch)); changedTouches[pointState].m_targets.add(touchTarget); } @@ -5898,7 +6022,7 @@ index de408bfdd161f86de51d9b528a9d27452a76b82a..d9b2374b0f7abf2789729fcc805c6505 bool m_mouseDownMayStartDrag { false }; bool m_dragMayStartSelectionInstead { false }; diff --git a/Source/WebCore/page/EventSource.cpp b/Source/WebCore/page/EventSource.cpp -index 10cdacd0e6c907df43cc8ce520dad17eea9a8087..e6b54ba8f5177046cf07bc0e2650a2bcc2b7c8a5 100644 +index 8d7d9e66d7bc1d429aa5d7ff4668504008aacd4d..a1345e0a432f6b88095bd00de0f2c067edd464a5 100644 --- a/Source/WebCore/page/EventSource.cpp +++ b/Source/WebCore/page/EventSource.cpp @@ -36,6 +36,7 @@ @@ -5914,9 +6038,9 @@ index 10cdacd0e6c907df43cc8ce520dad17eea9a8087..e6b54ba8f5177046cf07bc0e2650a2bc ResourceRequest request { m_url }; + request.setInitiatorIdentifier(InspectorNetworkAgent::initiatorIdentifierForEventSource()); - request.setHTTPMethod("GET"); - request.setHTTPHeaderField(HTTPHeaderName::Accept, "text/event-stream"); - request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache"); + request.setHTTPMethod("GET"_s); + request.setHTTPHeaderField(HTTPHeaderName::Accept, "text/event-stream"_s); + request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache"_s); diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp index 9faf8adf69b5cc55c2b3afa7aa61ce2bdc0a047f..d28cd6b5b6ad4f1be78a51e218f2627ba57b92bc 100644 --- a/Source/WebCore/page/Frame.cpp @@ -6378,10 +6502,10 @@ index c86fe59e30404cd959e08aeaed640558a8abc56e..a44553efaaac5022cd17dd12092e9b2f ViewportArguments m_viewportArguments; diff --git a/Source/WebCore/page/FrameSnapshotting.cpp b/Source/WebCore/page/FrameSnapshotting.cpp -index 8273a64fcdfb7d34eaa76f98ba7a2117eafbfbe6..8a2f97ac8f935a71fce96913f8b10551a85de563 100644 +index 5d2876a5dfda5d65efc29ad8004da9c0317ff54b..24dc3ff8792d18f0e011674133a3a718b5484307 100644 --- a/Source/WebCore/page/FrameSnapshotting.cpp +++ b/Source/WebCore/page/FrameSnapshotting.cpp -@@ -103,7 +103,7 @@ RefPtr snapshotFrameRectWithClip(Frame& frame, const IntRect& image +@@ -106,7 +106,7 @@ RefPtr snapshotFrameRectWithClip(Frame& frame, const IntRect& image // Other paint behaviors are set by paintContentsForSnapshot. frame.view()->setPaintBehavior(paintBehavior); @@ -6390,7 +6514,7 @@ index 8273a64fcdfb7d34eaa76f98ba7a2117eafbfbe6..8a2f97ac8f935a71fce96913f8b10551 if (frame.page()->delegatesScaling()) scaleFactor *= frame.page()->pageScaleFactor(); -@@ -114,7 +114,12 @@ RefPtr snapshotFrameRectWithClip(Frame& frame, const IntRect& image +@@ -117,7 +117,12 @@ RefPtr snapshotFrameRectWithClip(Frame& frame, const IntRect& image auto buffer = ImageBuffer::create(imageRect.size(), RenderingMode::Unaccelerated, scaleFactor, options.colorSpace, options.pixelFormat); if (!buffer) return nullptr; @@ -6403,7 +6527,7 @@ index 8273a64fcdfb7d34eaa76f98ba7a2117eafbfbe6..8a2f97ac8f935a71fce96913f8b10551 if (!clipRects.isEmpty()) { Path clipPath; -@@ -123,7 +128,10 @@ RefPtr snapshotFrameRectWithClip(Frame& frame, const IntRect& image +@@ -126,7 +131,10 @@ RefPtr snapshotFrameRectWithClip(Frame& frame, const IntRect& image buffer->context().clipPath(clipPath); } @@ -6416,10 +6540,10 @@ index 8273a64fcdfb7d34eaa76f98ba7a2117eafbfbe6..8a2f97ac8f935a71fce96913f8b10551 } diff --git a/Source/WebCore/page/FrameSnapshotting.h b/Source/WebCore/page/FrameSnapshotting.h -index 1b77026f51092001cda86e32480890395b145b2e..6026bc23508016454f331b06c9f071a88f55cccc 100644 +index e4b9d009c7240fb587b497fe03fef22ae3bc8c79..d882626e890392580c452b259cca92108027d68e 100644 --- a/Source/WebCore/page/FrameSnapshotting.h +++ b/Source/WebCore/page/FrameSnapshotting.h -@@ -50,6 +50,7 @@ enum class SnapshotFlags : uint8_t { +@@ -52,6 +52,7 @@ enum class SnapshotFlags : uint8_t { PaintSelectionAndBackgroundsOnly = 1 << 4, PaintEverythingExcludingSelection = 1 << 5, PaintWithIntegralScaleFactor = 1 << 6, @@ -6448,10 +6572,10 @@ index a782c3be51ca113a52482c5a10583c8fa64724ef..1d82dff81be5c5492efb3bfe77d2f259 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 663f984b57d4d0ed3439f0913c14b1cb1e18fc17..0a94cee40f6fe185b6e0b8be193de6a5199606e6 100644 +index e0ee73790f0b64c7b0582cfc8a4b934ffe8005d0..ad880a862daaf50055c8955970997ba4588cb770 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp -@@ -475,6 +475,37 @@ void Page::setOverrideViewportArguments(const std::optional& +@@ -488,6 +488,37 @@ void Page::setOverrideViewportArguments(const std::optional& document->updateViewportArguments(); } @@ -6489,7 +6613,7 @@ index 663f984b57d4d0ed3439f0913c14b1cb1e18fc17..0a94cee40f6fe185b6e0b8be193de6a5 ScrollingCoordinator* Page::scrollingCoordinator() { if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) { -@@ -1326,10 +1357,6 @@ void Page::didCommitLoad() +@@ -1350,10 +1381,6 @@ void Page::didCommitLoad() m_isEditableRegionEnabled = false; #endif @@ -6500,7 +6624,7 @@ index 663f984b57d4d0ed3439f0913c14b1cb1e18fc17..0a94cee40f6fe185b6e0b8be193de6a5 resetSeenPlugins(); resetSeenMediaEngines(); -@@ -3392,6 +3419,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) +@@ -3416,6 +3443,16 @@ void Page::setUseDarkAppearanceOverride(std::optional valueOverride) #endif } @@ -6518,10 +6642,10 @@ index 663f984b57d4d0ed3439f0913c14b1cb1e18fc17..0a94cee40f6fe185b6e0b8be193de6a5 { if (insets == m_fullscreenInsets) diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h -index 76128c2213bfc15419b41a97ca3cd0dda1035c81..da2c1f16fb791d14869f4109d489af849796549b 100644 +index 5633300ad3f11e1bf5d3be1f52f5649cd0122cd1..2d2b4847f69df156385e901f468b04a81f8e08c8 100644 --- a/Source/WebCore/page/Page.h +++ b/Source/WebCore/page/Page.h -@@ -277,6 +277,9 @@ public: +@@ -279,6 +279,9 @@ public: const std::optional& overrideViewportArguments() const { return m_overrideViewportArguments; } WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional&); @@ -6531,7 +6655,7 @@ index 76128c2213bfc15419b41a97ca3cd0dda1035c81..da2c1f16fb791d14869f4109d489af84 static void refreshPlugins(bool reload); WEBCORE_EXPORT PluginData& pluginData(); void clearPluginData(); -@@ -329,6 +332,10 @@ public: +@@ -331,6 +334,10 @@ public: DragCaretController& dragCaretController() const { return *m_dragCaretController; } #if ENABLE(DRAG_SUPPORT) DragController& dragController() const { return *m_dragController; } @@ -6542,7 +6666,7 @@ index 76128c2213bfc15419b41a97ca3cd0dda1035c81..da2c1f16fb791d14869f4109d489af84 #endif FocusController& focusController() const { return *m_focusController; } #if ENABLE(CONTEXT_MENUS) -@@ -496,6 +503,8 @@ public: +@@ -498,6 +505,8 @@ public: WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel); bool defaultUseDarkAppearance() const { return m_useDarkAppearance; } void setUseDarkAppearanceOverride(std::optional); @@ -6551,7 +6675,7 @@ index 76128c2213bfc15419b41a97ca3cd0dda1035c81..da2c1f16fb791d14869f4109d489af84 #if ENABLE(TEXT_AUTOSIZING) float textAutosizingWidth() const { return m_textAutosizingWidth; } -@@ -899,6 +908,11 @@ public: +@@ -901,6 +910,11 @@ public: WEBCORE_EXPORT Vector> editableElementsInRect(const FloatRect&) const; @@ -6563,7 +6687,7 @@ index 76128c2213bfc15419b41a97ca3cd0dda1035c81..da2c1f16fb791d14869f4109d489af84 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); } #endif -@@ -1012,6 +1026,9 @@ private: +@@ -1019,6 +1033,9 @@ private: #if ENABLE(DRAG_SUPPORT) const std::unique_ptr m_dragController; @@ -6573,7 +6697,7 @@ index 76128c2213bfc15419b41a97ca3cd0dda1035c81..da2c1f16fb791d14869f4109d489af84 #endif const std::unique_ptr m_focusController; #if ENABLE(CONTEXT_MENUS) -@@ -1091,6 +1108,7 @@ private: +@@ -1098,6 +1115,7 @@ private: bool m_useElevatedUserInterfaceLevel { false }; bool m_useDarkAppearance { false }; std::optional m_useDarkAppearanceOverride; @@ -6581,7 +6705,7 @@ index 76128c2213bfc15419b41a97ca3cd0dda1035c81..da2c1f16fb791d14869f4109d489af84 #if ENABLE(TEXT_AUTOSIZING) float m_textAutosizingWidth { 0 }; -@@ -1269,6 +1287,11 @@ private: +@@ -1276,6 +1294,11 @@ private: #endif std::optional m_overrideViewportArguments; @@ -6594,10 +6718,10 @@ index 76128c2213bfc15419b41a97ca3cd0dda1035c81..da2c1f16fb791d14869f4109d489af84 #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY) RefPtr m_deviceOrientationUpdateProvider; diff --git a/Source/WebCore/page/PointerCaptureController.cpp b/Source/WebCore/page/PointerCaptureController.cpp -index 62904802dda2b68fcde3bd0f05b3ea1cf7e31284..ac37a8a0abd2fee236a743fd7a976484bbb46fe1 100644 +index b11f1691cb4cc2bbdd98b1c68cd14bd6b0986d9a..4ae1845ca79fe3f2fe34edce2a53606b7bfb3425 100644 --- a/Source/WebCore/page/PointerCaptureController.cpp +++ b/Source/WebCore/page/PointerCaptureController.cpp -@@ -196,7 +196,7 @@ bool PointerCaptureController::preventsCompatibilityMouseEventsForIdentifier(Poi +@@ -195,7 +195,7 @@ bool PointerCaptureController::preventsCompatibilityMouseEventsForIdentifier(Poi return capturingData && capturingData->preventsCompatibilityMouseEvents; } @@ -6606,7 +6730,7 @@ index 62904802dda2b68fcde3bd0f05b3ea1cf7e31284..ac37a8a0abd2fee236a743fd7a976484 static bool hierarchyHasCapturingEventListeners(Element* target, const AtomString& eventName) { for (RefPtr currentNode = target; currentNode; currentNode = currentNode->parentInComposedTree()) { -@@ -477,7 +477,7 @@ void PointerCaptureController::cancelPointer(PointerID pointerId, const IntPoint +@@ -476,7 +476,7 @@ void PointerCaptureController::cancelPointer(PointerID pointerId, const IntPoint capturingData->pendingTargetOverride = nullptr; capturingData->state = CapturingData::State::Cancelled; @@ -6616,7 +6740,7 @@ index 62904802dda2b68fcde3bd0f05b3ea1cf7e31284..ac37a8a0abd2fee236a743fd7a976484 #endif diff --git a/Source/WebCore/page/PointerCaptureController.h b/Source/WebCore/page/PointerCaptureController.h -index 45435f77e4bc790aa60bdebc27ea69b9ba889c30..65ae0b7b220d7736a42981ff18798a2ec83dbdbe 100644 +index 8c911ca663507b61640a4e29245dabe79573c420..08cdd2bfea9f5ac19c8cc39dc80032e140828ca4 100644 --- a/Source/WebCore/page/PointerCaptureController.h +++ b/Source/WebCore/page/PointerCaptureController.h @@ -57,7 +57,7 @@ public: @@ -6707,10 +6831,10 @@ index 7ac11c8289347e3a2f3e7316cf9e32932b9544ed..764b2d4fe36ac2e5588bd22595424ac1 } diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -index 16274e94af10c8d38540e9c8351921c70b8f8d7f..47cd540248b84b1f4890fa6999e4614cfc1f42d4 100644 +index 0d8a9c765246d5702758ce9f1e6e79a2ff964b1f..a8d6b7ecab8b137718504ce32dad390a678ef023 100644 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp -@@ -300,6 +300,8 @@ bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const +@@ -298,6 +298,8 @@ bool ContentSecurityPolicy::allowContentSecurityPolicySourceStarToMatchAnyProtoc template typename std::enable_if::value, bool>::type ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, Predicate&& predicate, Args&&... args) const { @@ -6719,7 +6843,7 @@ index 16274e94af10c8d38540e9c8351921c70b8f8d7f..47cd540248b84b1f4890fa6999e4614c bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly; for (auto& policy : m_policies) { if (policy->isReportOnly() != isReportOnly) -@@ -313,6 +315,8 @@ typename std::enable_if bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const { @@ -6728,7 +6852,7 @@ index 16274e94af10c8d38540e9c8351921c70b8f8d7f..47cd540248b84b1f4890fa6999e4614c bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly; bool isAllowed = true; for (auto& policy : m_policies) { -@@ -329,6 +333,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit +@@ -327,6 +331,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit template bool ContentSecurityPolicy::allPoliciesAllow(ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const { @@ -6861,7 +6985,7 @@ index 9e97dd5f689e6a1a90c9069445dc3f4b8c45e840..cc3ddc3e6d656a91c5ed58e050483d37 IntSize dragImageSize(DragImageRef) { diff --git a/Source/WebCore/platform/Pasteboard.h b/Source/WebCore/platform/Pasteboard.h -index aeba0a3b44d8666ecdb221b33570d4ccda566429..44d1c0644fcdfac4095e5a991a44cfb0a23a2343 100644 +index 1cf4108f08e630658f9a3e31fe4bce963e3e4cca..5afa652b8ea8aed985be9f4e38d8480d18347823 100644 --- a/Source/WebCore/platform/Pasteboard.h +++ b/Source/WebCore/platform/Pasteboard.h @@ -44,7 +44,7 @@ OBJC_CLASS NSString; @@ -7136,86 +7260,6 @@ index 09f41d601d60cb10fb996540149a1bc652fce835..d69f7dc19d76d2b9174cedb11692b4c0 return true; #else return false; -diff --git a/Source/WebCore/platform/graphics/GraphicsTypes.h b/Source/WebCore/platform/graphics/GraphicsTypes.h -index 37297831a2bf3468caec8f5200f047807666cbaf..90d5c54638cbae1f6241827e76cc9a83e64d3d9d 100644 ---- a/Source/WebCore/platform/graphics/GraphicsTypes.h -+++ b/Source/WebCore/platform/graphics/GraphicsTypes.h -@@ -80,15 +80,20 @@ struct CompositeMode { - CompositeOperator operation; - BlendMode blendMode; - -- bool operator==(const CompositeMode& other) -- { -- return operation == other.operation && blendMode == other.blendMode; -- } -- - template void encode(Encoder&) const; - template static std::optional decode(Decoder&); - }; - -+inline bool operator==(const CompositeMode& a, const CompositeMode& b) -+{ -+ return a.operation == b.operation && a.blendMode == b.blendMode; -+} -+ -+inline bool operator!=(const CompositeMode& a, const CompositeMode& b) -+{ -+ return !(a == b); -+} -+ - template - void CompositeMode::encode(Encoder& encoder) const - { -@@ -175,6 +180,11 @@ inline bool operator==(const DropShadow& a, const DropShadow& b) - return a.offset == b.offset && a.blurRadius == b.blurRadius && a.color == b.color && a.radiusMode == b.radiusMode; - } - -+inline bool operator!=(const DropShadow& a, const DropShadow& b) -+{ -+ return !(a == b); -+} -+ - template - void DropShadow::encode(Encoder& encoder) const - { -diff --git a/Source/WebCore/platform/graphics/SourceBrush.h b/Source/WebCore/platform/graphics/SourceBrush.h -index 4bd8a3b5091d128f4c23b93bd3ea1c6f2381cd03..4e96a7698fe16042cf2b6283b253cf4ae4b44f79 100644 ---- a/Source/WebCore/platform/graphics/SourceBrush.h -+++ b/Source/WebCore/platform/graphics/SourceBrush.h -@@ -79,6 +79,11 @@ inline bool operator==(const SourceBrush::Brush::LogicalGradient& a, const Sourc - return a.gradient.ptr() == b.gradient.ptr() && a.spaceTransform == b.spaceTransform; - } - -+inline bool operator!=(const SourceBrush::Brush::LogicalGradient& a, const SourceBrush::Brush::LogicalGradient& b) -+{ -+ return !(a == b); -+} -+ - inline bool operator==(const SourceBrush::Brush& a, const SourceBrush::Brush& b) - { - return WTF::switchOn(a.brush, -@@ -95,11 +100,21 @@ inline bool operator==(const SourceBrush::Brush& a, const SourceBrush::Brush& b) - ); - } - -+inline bool operator!=(const SourceBrush::Brush& a, const SourceBrush::Brush& b) -+{ -+ return !(a == b); -+} -+ - inline bool operator==(const SourceBrush& a, const SourceBrush& b) - { - return a.color() == b.color() && a.brush() == b.brush(); - } - -+inline bool operator!=(const SourceBrush& a, const SourceBrush& b) -+{ -+ return !(a == b); -+} -+ - template - void SourceBrush::Brush::LogicalGradient::encode(Encoder& encoder) const - { 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 @@ -7340,69 +7384,8 @@ index b60f9a64bacc8282860da6de299b75aeb295b9b5..55bd017c03c6478ca334bd5ef164160f namespace WebCore { -diff --git a/Source/WebCore/platform/graphics/gbm/GBMDevice.cpp b/Source/WebCore/platform/graphics/gbm/GBMDevice.cpp -index 6f18826e06382c4d915607dbe5d6d16666a6c8e4..f1ab10953b92713da029f19de76ea2338336312a 100644 ---- a/Source/WebCore/platform/graphics/gbm/GBMDevice.cpp -+++ b/Source/WebCore/platform/graphics/gbm/GBMDevice.cpp -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - -diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp -index d6942ce22541d8ec4eda1edf50c4735eaa6af644..e8aa707257aaf8bfe00fc8fd0ed9e31994b0b42d 100644 ---- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp -+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp -@@ -85,6 +85,24 @@ GstPad* webkitGstGhostPadFromStaticTemplate(GstStaticPadTemplate* staticPadTempl - return pad; - } - -+#if !GST_CHECK_VERSION(1, 18, 0) -+void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo* info, guint plane, gint components[GST_VIDEO_MAX_COMPONENTS]) -+{ -+ guint c, i = 0; -+ -+ /* Reverse mapping of info->plane */ -+ for (c = 0; c < GST_VIDEO_FORMAT_INFO_N_COMPONENTS(info); c++) { -+ if (GST_VIDEO_FORMAT_INFO_PLANE(info, c) == plane) { -+ components[i] = c; -+ i++; -+ } -+ } -+ -+ for (c = i; c < GST_VIDEO_MAX_COMPONENTS; c++) -+ components[c] = -1; -+} -+#endif -+ - #if ENABLE(VIDEO) - bool getVideoSizeAndFormatFromCaps(const GstCaps* caps, WebCore::IntSize& size, GstVideoFormat& format, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride) - { -diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h -index 5748c514f1cd3e457e885449420e9f584753d774..fab879454217eaba38e76f78515e958e2ff72b62 100644 ---- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h -+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h -@@ -55,6 +55,15 @@ inline bool webkitGstCheckVersion(guint major, guint minor, guint micro) - return true; - } - -+// gst_video_format_info_component() is GStreamer 1.18 API, so for older versions we use a local -+// vendored copy of the function. -+#if !GST_CHECK_VERSION(1, 18, 0) -+#define GST_VIDEO_MAX_COMPONENTS 4 -+void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo*, guint, gint components[GST_VIDEO_MAX_COMPONENTS]); -+ -+#define gst_video_format_info_component webkitGstVideoFormatInfoComponent -+#endif -+ - #define GST_VIDEO_CAPS_TYPE_PREFIX "video/" - #define GST_AUDIO_CAPS_TYPE_PREFIX "audio/" - #define GST_TEXT_CAPS_TYPE_PREFIX "text/" diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp -index c35b2f0f15d9cd09b9b28be0bf44778874305738..5bc1b35e603afe5ae979ece6d3813bcb1e8492ad 100644 +index 7b54a01f3e963c18791734ec4a3c4ea8c8f38a9e..dd7ce59e0cef49f1214a71f35bda597708081496 100644 --- a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp +++ b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp @@ -27,7 +27,7 @@ @@ -7462,7 +7445,7 @@ index 6d6820fc22f9a7102bbdad6c4b5e3e7e9645f66c..f44797b8c197bf1b3daaa9b59dad2a8e // Determine the string for this item. const UChar* str = cp + items[i].iCharPos; diff --git a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp -index 44dfdecb31b071536225167675a5def53f721af8..5a20442e398b6970877f5c8702a7181509138a5c 100644 +index c017f21fbd84f2b842e01f248cc440723cb1aab8..8eb4204454a3d48a2ba7c5cc10ee1fb234c01a2a 100644 --- a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp +++ b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp @@ -37,8 +37,10 @@ @@ -7746,7 +7729,7 @@ index 80958ba565a877224d0ed37e4e4057b4be0dde24..eca42bf5181bc4a95efca9c9c3f5ce0f auto* display = gdk_display_get_default(); if (!display) diff --git a/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp b/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp -index 1887d8c6f2471444eed3cf06f345a3893c9e6e73..a6ea2832ec1faf627cc3a77537c479ede2785f4a 100644 +index ae439e30f1fb239d18e1164e8896dfb272c75673..93bbf2bdfc99df151c9b82df07eb5a07fae0b2c4 100644 --- a/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp +++ b/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp @@ -32,6 +32,10 @@ @@ -7797,12 +7780,12 @@ index 1887d8c6f2471444eed3cf06f345a3893c9e6e73..a6ea2832ec1faf627cc3a77537c479ed void Pasteboard::write(const PasteboardURL& url) { -- platformStrategies()->pasteboardStrategy()->writeToPasteboard("text/plain;charset=utf-8", url.url.string()); +- platformStrategies()->pasteboardStrategy()->writeToPasteboard("text/plain;charset=utf-8"_s, url.url.string()); + if (m_selectionData) { + m_selectionData->clearAll(); + m_selectionData->setURL(url.url, url.title); + } else { -+ platformStrategies()->pasteboardStrategy()->writeToPasteboard("text/plain;charset=utf-8", url.url.string()); ++ platformStrategies()->pasteboardStrategy()->writeToPasteboard("text/plain;charset=utf-8"_s, url.url.string()); + } } @@ -7878,7 +7861,7 @@ index 1887d8c6f2471444eed3cf06f345a3893c9e6e73..a6ea2832ec1faf627cc3a77537c479ed #endif // USE(LIBWPE) diff --git a/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp b/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp -index a34dc220bbb9a92b40dfb463e8724e81ac745b2c..8ecedd5dae88469366a619b96960598c1232a32d 100644 +index 843231d3b58a02fd9d93d3a37b86997be56d0f30..01a2775d31801cdf6a404bfb9f321bb7a64b0464 100644 --- a/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp +++ b/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp @@ -30,8 +30,10 @@ @@ -8140,7 +8123,7 @@ index a34dc220bbb9a92b40dfb463e8724e81ac745b2c..8ecedd5dae88469366a619b96960598c { switch (val) { diff --git a/Source/WebCore/platform/network/HTTPHeaderMap.cpp b/Source/WebCore/platform/network/HTTPHeaderMap.cpp -index bd516cf6c65f2db40518f0cd1d7e97e8f74e3850..01b23390efd116cfb66190d6df773af6418c65b6 100644 +index bd516cf6c65f2db40518f0cd1d7e97e8f74e3850..8ef0703e518cac2b7c45b534115038b883ed48a3 100644 --- a/Source/WebCore/platform/network/HTTPHeaderMap.cpp +++ b/Source/WebCore/platform/network/HTTPHeaderMap.cpp @@ -214,8 +214,11 @@ void HTTPHeaderMap::add(HTTPHeaderName name, const String& value) @@ -8149,7 +8132,7 @@ index bd516cf6c65f2db40518f0cd1d7e97e8f74e3850..01b23390efd116cfb66190d6df773af6 }); + // Align with Chromium and Firefox, but just for SetCookies where it is critical: + // https://bit.ly/2HCa0iq -+ String separator = name == HTTPHeaderName::SetCookie ? "\n " : ", "; ++ String separator = name == HTTPHeaderName::SetCookie ? "\n "_s : ", "_s; if (index != notFound) - m_commonHeaders[index].value = makeString(m_commonHeaders[index].value, ", ", value); + m_commonHeaders[index].value = makeString(m_commonHeaders[index].value, separator, value); @@ -8324,7 +8307,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 e7b8ebce073536c148eafaca9d751ec8fb244232..2212618a8980afdd9237669f946a1a8cdc9c92c4 100644 +index 4f89d973ec911a5d909ddd7e2eba97a5d4fbcb0f..7f8dc398efe49c57f82d36582f780e9d710e218c 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 @@ -8385,7 +8368,7 @@ index a8f57a72d0eacca7755be84fcaa1c9bf10958c0b..a5d67b8016a86b9184ded0904e317048 SocketStreamHandleImpl::~SocketStreamHandleImpl() diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp -index fab574233fe00f4b0bf22e0baec09db116a4d3ce..79e4ba64115d88aec771175833e9d3ed71591692 100644 +index a8d2370648d2468812ce5b6f9539aab0962e86bc..8a95ec2369e20777f2db828406a2d193c2516fc5 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) @@ -8468,7 +8451,7 @@ index 207572d157ba2173c045e01da8f9b83b034c047e..6590bd36b23bdcbc947b191d2c011414 } diff --git a/Source/WebCore/platform/win/KeyEventWin.cpp b/Source/WebCore/platform/win/KeyEventWin.cpp -index aae6c99dd052985a43718846b68536454050c234..7e2e5d0c1de90f1454f7fdb71a40ab71228dcbe9 100644 +index 05a0d1256a136982507b732c7852bbece201b513..f2c00eca40fbf3a88780610228f60ba6f8c1f441 100644 --- a/Source/WebCore/platform/win/KeyEventWin.cpp +++ b/Source/WebCore/platform/win/KeyEventWin.cpp @@ -239,10 +239,16 @@ PlatformKeyboardEvent::PlatformKeyboardEvent(HWND, WPARAM code, LPARAM keyData, @@ -8492,7 +8475,7 @@ index aae6c99dd052985a43718846b68536454050c234..7e2e5d0c1de90f1454f7fdb71a40ab71 bool PlatformKeyboardEvent::currentCapsLockState() diff --git a/Source/WebCore/platform/win/PasteboardWin.cpp b/Source/WebCore/platform/win/PasteboardWin.cpp -index 0b25ff6c38c8634f37eea2afd024a8d42a4f42c5..d5b66f6d55ff9efe60c6466a95ea44141b9a5b96 100644 +index 6685ed9936469fd0a43fbe2412bbc38bcff8d56d..59af3a6654e569eb5e8ab7592c64292a25ba8262 100644 --- a/Source/WebCore/platform/win/PasteboardWin.cpp +++ b/Source/WebCore/platform/win/PasteboardWin.cpp @@ -1130,7 +1130,21 @@ void Pasteboard::writeCustomData(const Vector& data) @@ -8996,7 +8979,7 @@ index 8a1daa67c777db06b9abe95c5ba01f15c69fbdf7..2f579e5744ea0a12e65a1c4e652d1763 { auto innerText = innerTextElement(); diff --git a/Source/WebCore/rendering/RenderTextControl.h b/Source/WebCore/rendering/RenderTextControl.h -index 2e90534ffd8da83b7dc54d46fa7def16319bbb43..2493c00d58957751c65c37eb409fa8d675efd5ca 100644 +index fac9402820702989bf72ed2425678bfb82bd6523..40b5a6441d22714fd370ce1a7c2f534e6e7510f5 100644 --- a/Source/WebCore/rendering/RenderTextControl.h +++ b/Source/WebCore/rendering/RenderTextControl.h @@ -36,9 +36,9 @@ public: @@ -9011,7 +8994,7 @@ index 2e90534ffd8da83b7dc54d46fa7def16319bbb43..2493c00d58957751c65c37eb409fa8d6 int innerLineHeight() const override; #endif diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp -index 6b932dbad440b551558427d40d6d22add0d33c07..1500e22919b854db199d2dcce4ae9107e9b6ce17 100644 +index e4ea03c11b6bb3ffe3f80d2f3b78fb9a398c56a0..4007429dcd3cabf4c69b8f38f35863d0384d4b08 100644 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -83,6 +83,11 @@ @@ -9079,7 +9062,7 @@ index a2629e4edb214b3d26aca78da845c65d0e5aa341..d034f3a57badda1f34729afd712db7cd 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 834d19a5b63d0e53a8bf2372a9531c4a1cef68f2..e4bf20fa329d67c3433fc2b4f06086b264ed1c44 100644 +index 29c75f80478b5f9158da8cf8aa333e86edf47c5a..601cc36264d368f9b99d8119e335ae0bf19ac055 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -26,7 +26,6 @@ @@ -9090,7 +9073,7 @@ index 834d19a5b63d0e53a8bf2372a9531c4a1cef68f2..e4bf20fa329d67c3433fc2b4f06086b2 #include "ArgumentCoders.h" #include "Attachment.h" #include "AuthenticationManager.h" -@@ -517,6 +516,41 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) +@@ -529,6 +528,41 @@ void NetworkProcess::destroySession(PAL::SessionID sessionID) m_sessionsControlledByAutomation.remove(sessionID); } @@ -9133,7 +9116,7 @@ index 834d19a5b63d0e53a8bf2372a9531c4a1cef68f2..e4bf20fa329d67c3433fc2b4f06086b2 void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler&& completionHandler) { diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h -index d935f46ccc99ca86784f5f14e80dd70b50383b29..5215bc1baeaf9f106057071d3ead52e68d597de8 100644 +index 8e92fc2c135714a16dfbc635c753931a64baa9ef..b75b3dbc7a16e4e55246421d22abe4779c937abc 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.h +++ b/Source/WebKit/NetworkProcess/NetworkProcess.h @@ -37,6 +37,7 @@ @@ -9144,7 +9127,7 @@ index d935f46ccc99ca86784f5f14e80dd70b50383b29..5215bc1baeaf9f106057071d3ead52e6 #include "WebPageProxyIdentifier.h" #include "WebResourceLoadStatisticsStore.h" #include "WebsiteData.h" -@@ -81,6 +82,7 @@ class SessionID; +@@ -83,6 +84,7 @@ class SessionID; namespace WebCore { class CertificateInfo; @@ -9152,7 +9135,7 @@ index d935f46ccc99ca86784f5f14e80dd70b50383b29..5215bc1baeaf9f106057071d3ead52e6 class CurlProxySettings; class ProtectionSpace; class NetworkStorageSession; -@@ -199,6 +201,11 @@ public: +@@ -202,6 +204,11 @@ public: void addWebsiteDataStore(WebsiteDataStoreParameters&&); @@ -9165,10 +9148,10 @@ index d935f46ccc99ca86784f5f14e80dd70b50383b29..5215bc1baeaf9f106057071d3ead52e6 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 6788d65cc6a8ccd3f11f90b2d6779e21abd1cdc6..3b47b4710f055e7494cf62b869c482990d92e5d5 100644 +index 45e7559e6cfab2bc14d0c5918040ce4483448872..71470c682d422cee2ce12a4e56dfc938e4008d4f 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in +++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in -@@ -79,6 +79,11 @@ messages -> NetworkProcess LegacyReceiver { +@@ -80,6 +80,11 @@ messages -> NetworkProcess LegacyReceiver { PreconnectTo(PAL::SessionID sessionID, WebKit::WebPageProxyIdentifier webPageProxyID, WebCore::PageIdentifier webPageID, URL url, String userAgent, enum:uint8_t WebCore::StoredCredentialsPolicy storedCredentialsPolicy, enum:bool std::optional isNavigatingToAppBoundDomain, enum:bool WebKit::LastNavigationWasAppInitiated lastNavigationWasAppInitiated); @@ -9284,7 +9267,7 @@ index f57a72b6bdc3382469d69adb1b1201c7a9f07a84..c501211b094312ca44f0bf92de5d6ebc void clear(); diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm -index 3ab4a7051a5afe368f9dd50a89f8ad4d117fc355..80f290cce292c5a401465192efd799940bc2a464 100644 +index 33816a8d3bd885f98d12c4934bea6af69d85a125..182fb89472e7fe85e3040fc243782a1431e5b02b 100644 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm @@ -720,7 +720,7 @@ void NetworkSessionCocoa::setClientAuditToken(const WebCore::AuthenticationChall @@ -9296,7 +9279,7 @@ index 3ab4a7051a5afe368f9dd50a89f8ad4d117fc355..80f290cce292c5a401465192efd79994 return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]); NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject; -@@ -958,6 +958,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END +@@ -962,6 +962,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics())); @@ -9311,7 +9294,7 @@ index 3ab4a7051a5afe368f9dd50a89f8ad4d117fc355..80f290cce292c5a401465192efd79994 #if !LOG_DISABLED LOG(NetworkSession, "%llu didReceiveResponse completionHandler (%d)", taskIdentifier, policyAction); diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp -index 06ccec621a05a7c309b89e210424de7daf307136..6a433ccd3ad4dbd5d8e42c693bb80655b887d55a 100644 +index 09dbe9966144841e2ffb3a8ac915ddf1a71c1575..779f1248d9f218b0ecd2586ef7e06f51a844f7df 100644 --- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp +++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp @@ -26,9 +26,13 @@ @@ -9486,7 +9469,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 66e4895549a3aec8d1df994d25fdcda4ed2d7e66..b69f2b4fc68f483b4272704be56ef958fef2785e 100644 +index e67f7ed29bc52eac926fea756e7a58af5cc61a57..a240fafe24d726385dcb5cbe92e36978eb787683 100644 --- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp +++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp @@ -494,6 +494,8 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr&& inputStream) @@ -9603,7 +9586,7 @@ index bc06eb37854c1ec72b30568e95dba6ef60c132a4..7b8fd54b740c828be204d4fedba0286f } return makeUnique(channel, request, soupSession(), soupMessage.get(), protocol); diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake -index 333bfe0755dae63954db1aa8d2a94147e0234c6f..47c81e31d5ae98c625a1230c307880b4f9679157 100644 +index 5e0683eab256821c17ac8a338de83fdcc21d4e56..3e3e3d214b3a867e0a8dfe0fdfc058ba124e7eef 100644 --- a/Source/WebKit/PlatformGTK.cmake +++ b/Source/WebKit/PlatformGTK.cmake @@ -476,6 +476,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES @@ -9640,7 +9623,7 @@ index 333bfe0755dae63954db1aa8d2a94147e0234c6f..47c81e31d5ae98c625a1230c307880b4 set(WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2GTK_INSTALLED_HEADERS}) list(REMOVE_ITEM WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h) diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake -index c5ade3f53c47d32ebf3deb0cc4ba07dda6cc89bd..986f38b3e131a98941002071bb35553bf62aa9de 100644 +index 993c21ea9de13862f3f3657d6b5284a21c3fe06e..db498d0def2648088e2e846704155f6eee06fb0e 100644 --- a/Source/WebKit/PlatformWPE.cmake +++ b/Source/WebKit/PlatformWPE.cmake @@ -185,6 +185,7 @@ set(WPE_API_INSTALLED_HEADERS @@ -9678,10 +9661,10 @@ index c5ade3f53c47d32ebf3deb0cc4ba07dda6cc89bd..986f38b3e131a98941002071bb35553b Cairo::Cairo Freetype::Freetype diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake -index 659345edec10f5cc7b508e4592c44a8f978a1350..59fdb40612afb15588ae55a12bd524c94284098a 100644 +index 93b9f5f8dbdec3555944d13685486937a3f71eb6..f829a7c9b71c66f1dcf76b954dd8346c32e3e466 100644 --- a/Source/WebKit/PlatformWin.cmake +++ b/Source/WebKit/PlatformWin.cmake -@@ -67,8 +67,12 @@ list(APPEND WebKit_SOURCES +@@ -66,8 +66,12 @@ list(APPEND WebKit_SOURCES UIProcess/wc/DrawingAreaProxyWC.cpp @@ -9694,7 +9677,7 @@ index 659345edec10f5cc7b508e4592c44a8f978a1350..59fdb40612afb15588ae55a12bd524c9 UIProcess/win/WebPageProxyWin.cpp UIProcess/win/WebPopupMenuProxyWin.cpp UIProcess/win/WebProcessPoolWin.cpp -@@ -86,6 +90,7 @@ list(APPEND WebKit_SOURCES +@@ -85,6 +89,7 @@ list(APPEND WebKit_SOURCES WebProcess/MediaCache/WebMediaKeyStorageManager.cpp WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp @@ -9702,7 +9685,7 @@ index 659345edec10f5cc7b508e4592c44a8f978a1350..59fdb40612afb15588ae55a12bd524c9 WebProcess/WebPage/AcceleratedSurface.cpp -@@ -139,6 +144,72 @@ list(APPEND WebKit_MESSAGES_IN_FILES +@@ -138,6 +143,72 @@ list(APPEND WebKit_MESSAGES_IN_FILES GPUProcess/graphics/wc/RemoteWCLayerTreeHost ) @@ -9775,7 +9758,7 @@ index 659345edec10f5cc7b508e4592c44a8f978a1350..59fdb40612afb15588ae55a12bd524c9 set(WebKitCommonIncludeDirectories ${WebKit_INCLUDE_DIRECTORIES}) set(WebKitCommonSystemIncludeDirectories ${WebKit_SYSTEM_INCLUDE_DIRECTORIES}) -@@ -198,6 +269,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) +@@ -197,6 +268,7 @@ if (${WTF_PLATFORM_WIN_CAIRO}) OpenSSL::SSL mfuuid.lib strmiids.lib @@ -9874,10 +9857,10 @@ 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 deb08e43122cc6f76dac0f441e568c46655d2d41..ebce83c78b812df709d9c7ab780854e7c90069cb 100644 +index 409e98105e7e12593aa3402d5d97fb813d10ce72..c5e69f9c2e695cf80ff4ff8587d3b6e263b18a13 100644 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp -@@ -121,6 +121,10 @@ +@@ -122,6 +122,10 @@ #include #endif @@ -9888,7 +9871,7 @@ index deb08e43122cc6f76dac0f441e568c46655d2d41..ebce83c78b812df709d9c7ab780854e7 // FIXME: Seems like we could use std::tuple to cut down the code below a lot! namespace IPC { -@@ -1406,6 +1410,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature +@@ -1407,6 +1411,9 @@ void ArgumentCoder::encode(Encoder& encoder, const WindowFeature encoder << windowFeatures.resizable; encoder << windowFeatures.fullscreen; encoder << windowFeatures.dialog; @@ -9898,7 +9881,7 @@ index deb08e43122cc6f76dac0f441e568c46655d2d41..ebce83c78b812df709d9c7ab780854e7 } bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& windowFeatures) -@@ -1434,6 +1441,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win +@@ -1435,6 +1442,12 @@ bool ArgumentCoder::decode(Decoder& decoder, WindowFeatures& win return false; if (!decoder.decode(windowFeatures.dialog)) return false; @@ -9911,7 +9894,7 @@ index deb08e43122cc6f76dac0f441e568c46655d2d41..ebce83c78b812df709d9c7ab780854e7 return true; } -@@ -1447,6 +1460,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) +@@ -1448,6 +1461,11 @@ void ArgumentCoder::encode(Encoder& encoder, const DragData& dragData) #if PLATFORM(COCOA) encoder << dragData.pasteboardName(); encoder << dragData.fileNames(); @@ -9923,7 +9906,7 @@ index deb08e43122cc6f76dac0f441e568c46655d2d41..ebce83c78b812df709d9c7ab780854e7 #endif encoder << dragData.dragDestinationActionMask(); encoder << dragData.pageID(); -@@ -1470,9 +1488,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1471,9 +1489,16 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(applicationFlags)) return false; @@ -9941,7 +9924,7 @@ index deb08e43122cc6f76dac0f441e568c46655d2d41..ebce83c78b812df709d9c7ab780854e7 if (!decoder.decode(pasteboardName)) return false; -@@ -1488,8 +1513,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) +@@ -1489,8 +1514,14 @@ bool ArgumentCoder::decode(Decoder& decoder, DragData& dragData) if (!decoder.decode(pageID)) return false; @@ -10094,10 +10077,10 @@ 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 ec439d06714e6de5b94e21fb9ce8ee239c9622fa..7bfaa40d9b05973ffd820f545db5e6f425da77c8 100644 +index fd5ab81a3cb8af1575572453e2cfc53af4c0b2cf..0eb53ca0f2f49d52f94a271c194574ddece4af9d 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.cpp +++ b/Source/WebKit/Shared/WebPageCreationParameters.cpp -@@ -154,6 +154,8 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const +@@ -155,6 +155,8 @@ void WebPageCreationParameters::encode(IPC::Encoder& encoder) const encoder << crossOriginAccessControlCheckEnabled; encoder << processDisplayName; @@ -10106,7 +10089,7 @@ index ec439d06714e6de5b94e21fb9ce8ee239c9622fa..7bfaa40d9b05973ffd820f545db5e6f4 encoder << shouldCaptureAudioInUIProcess; encoder << shouldCaptureAudioInGPUProcess; encoder << shouldCaptureVideoInUIProcess; -@@ -524,7 +526,10 @@ std::optional WebPageCreationParameters::decode(IPC:: +@@ -529,7 +531,10 @@ std::optional WebPageCreationParameters::decode(IPC:: if (!processDisplayName) return std::nullopt; parameters.processDisplayName = WTFMove(*processDisplayName); @@ -10119,10 +10102,10 @@ index ec439d06714e6de5b94e21fb9ce8ee239c9622fa..7bfaa40d9b05973ffd820f545db5e6f4 return std::nullopt; diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h -index cb741693db30a7502b489c8397cef6c739feda91..276471905c38eba40c841240789dbf77b1792174 100644 +index 84fc46c6f9a64cd7fa3bc85901af0bbb0a6855d9..5930ad9d8f9b7fe044a73c03b2c5d16b65d7545f 100644 --- a/Source/WebKit/Shared/WebPageCreationParameters.h +++ b/Source/WebKit/Shared/WebPageCreationParameters.h -@@ -251,6 +251,8 @@ struct WebPageCreationParameters { +@@ -254,6 +254,8 @@ struct WebPageCreationParameters { bool httpsUpgradeEnabled { true }; @@ -10131,33 +10114,6 @@ index cb741693db30a7502b489c8397cef6c739feda91..276471905c38eba40c841240789dbf77 #if PLATFORM(IOS) bool allowsDeprecatedSynchronousXMLHttpRequestDuringUnload { false }; #endif -diff --git a/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp b/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp -index 1a68d7b463d7eab44136f874d9e7579fd59d60dd..0ae6d3a802ab010f7c9ae8a4bee7cc1164ca385e 100644 ---- a/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp -+++ b/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp -@@ -161,7 +161,9 @@ bool defaultOfflineWebApplicationCacheEnabled() - - bool defaultUseGPUProcessForCanvasRenderingEnabled() - { --#if ENABLE(GPU_PROCESS_BY_DEFAULT) || PLATFORM(WIN) -+#if PLATFORM(WIN) -+ bool defaultValue = false; // Playwright: force-disable on Windows -+#elif ENABLE(GPU_PROCESS_BY_DEFAULT) - bool defaultValue = true; - #else - bool defaultValue = false; -@@ -195,9 +197,10 @@ bool defaultUseGPUProcessForWebGLEnabled() - #if HAVE(UIKIT_WEBKIT_INTERNALS) - return false; - #else --#if (ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY)) || PLATFORM(WIN) -+#if (ENABLE(GPU_PROCESS_BY_DEFAULT) && PLATFORM(IOS_FAMILY)) - bool defaultValue = true; - #else -+ // Playwright: force disable on Windows and other platforms. - bool defaultValue = false; - #endif - return isFeatureFlagEnabled("gpu_process_webgl", defaultValue); diff --git a/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp b/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp index c204637774ee803eac42a34cde79aa556f143b82..345f5b08179e3dd239725bed06e48b46bc718336 100644 --- a/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp @@ -10449,7 +10405,7 @@ index 0000000000000000000000000000000000000000..789a0d7cf69704c8f665a9ed79348fbc + +} // namespace IPC diff --git a/Source/WebKit/Shared/win/WebEventFactory.cpp b/Source/WebKit/Shared/win/WebEventFactory.cpp -index 85d6f74114f4e7f82d9502d1b99d69098d6a49b6..6896c9756edb233dda46c7031e1af69923da8c23 100644 +index 0fb307c6647ff86eb1c068bc06c6b1a0b32c5770..c8f0be7050fffcf32abd6b5db2cd84afecd0304c 100644 --- a/Source/WebKit/Shared/win/WebEventFactory.cpp +++ b/Source/WebKit/Shared/win/WebEventFactory.cpp @@ -473,7 +473,7 @@ WebKeyboardEvent WebEventFactory::createWebKeyboardEvent(HWND hwnd, UINT message @@ -10510,7 +10466,7 @@ index bec1a3f134e2dd3923612752a89d881579e20f84..70b02cf6e97779d1f0ca261edc59b275 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index b08d1fddac0a593cad545a8ca536129fa22a9def..5fcd862dbcfa516f23957c8252c87b7cdd908793 100644 +index b34c50dde74bbe490492976023a87d787900dc2d..73983f561fb1289ef0a42abf895fdae0b2bbdb0a 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt @@ -276,6 +276,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm @@ -10530,7 +10486,7 @@ index b08d1fddac0a593cad545a8ca536129fa22a9def..5fcd862dbcfa516f23957c8252c87b7c UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm UIProcess/Inspector/mac/WKInspectorViewController.mm diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt -index 66f9ed0b9bf775c1ec07cd19cd4b0e5476619d3c..a839e50453071074872d5b66b11d06785b6961ad 100644 +index 98b74854336b34e8487e0adb36cf4a413c6fe63c..11c423a3b7b1629bda15619783ed0a075ade0d8c 100644 --- a/Source/WebKit/SourcesGTK.txt +++ b/Source/WebKit/SourcesGTK.txt @@ -126,6 +126,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify @@ -10567,7 +10523,7 @@ index 66f9ed0b9bf775c1ec07cd19cd4b0e5476619d3c..a839e50453071074872d5b66b11d0678 UIProcess/gtk/WebPasteboardProxyGtk.cpp UIProcess/gtk/WebPopupMenuProxyGtk.cpp diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt -index 5a9adbfd1189ad99b655621f58b10f2d4573cfea..e70b3c7aaec57795ee23bfc7b8cc0b0e9fadcd2f 100644 +index a01e5b20f1fb05a1c057c07f827310a37cf73e3f..4191b10f7a1e5fad2d070659547ece7ae1879393 100644 --- a/Source/WebKit/SourcesWPE.txt +++ b/Source/WebKit/SourcesWPE.txt @@ -85,6 +85,7 @@ Shared/glib/ProcessExecutablePathGLib.cpp @@ -10672,10 +10628,10 @@ index cc642c51ba663e843df54d14cfccb6d4ef81726c..229ae1a7df1e418f9b09bf9c3c3bb1ed bool m_shouldTakeUIBackgroundAssertion { true }; bool m_shouldCaptureDisplayInUIProcess { DEFAULT_CAPTURE_DISPLAY_IN_UI_PROCESS }; diff --git a/Source/WebKit/UIProcess/API/APIUIClient.h b/Source/WebKit/UIProcess/API/APIUIClient.h -index fbce945e4586f2df7e750fa9807664487de28445..de9410c85eb5786d3a5697451adf69178d02a94a 100644 +index 4e48757e4d41547798c74f0b16734d6aa71992e5..2188b93b42c2364347c04ab2be3d3e7b279e1710 100644 --- a/Source/WebKit/UIProcess/API/APIUIClient.h +++ b/Source/WebKit/UIProcess/API/APIUIClient.h -@@ -105,6 +105,7 @@ public: +@@ -106,6 +106,7 @@ public: virtual void runJavaScriptAlert(WebKit::WebPageProxy&, const WTF::String&, WebKit::WebFrameProxy*, WebKit::FrameInfoData&&, Function&& completionHandler) { completionHandler(); } virtual void runJavaScriptConfirm(WebKit::WebPageProxy&, const WTF::String&, WebKit::WebFrameProxy*, WebKit::FrameInfoData&&, Function&& completionHandler) { completionHandler(false); } virtual void runJavaScriptPrompt(WebKit::WebPageProxy&, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, WebKit::FrameInfoData&&, Function&& completionHandler) { completionHandler(WTF::String()); } @@ -10727,7 +10683,7 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0 } #endif diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp -index e254926dc51a49aeba498d7949aafc807a4b7229..5aafdda58937d0ca9913ba6eacbdffd49df2ddf3 100644 +index 5ebc5b8a749bfecb4cb527c5d42c8c958f673f88..3a5174565b28ea03a327c59f828f624cf8975cb0 100644 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp @@ -1762,6 +1762,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient @@ -10844,7 +10800,7 @@ index afa925f36c29db9c23921298dead9cce737500d6..42d396342acdb6d39830f611df0ee40e NS_ASSUME_NONNULL_END diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm -index b7cf065babca1c491aa3ea3841d2468631aaedac..fe7a51512480ad6e119d621c9821738ce5847296 100644 +index 56a0e0d839928dae812f06cb2828c22365b67ce9..d440e2315481c5a1ec2c73c541c4c9db9ca0b976 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm @@ -46,6 +46,7 @@ @@ -10854,8 +10810,8 @@ index b7cf065babca1c491aa3ea3841d2468631aaedac..fe7a51512480ad6e119d621c9821738c +#import #import #import - #import -@@ -207,6 +208,11 @@ static WallTime toSystemClockTime(NSDate *date) + #import +@@ -233,6 +234,11 @@ static WallTime toSystemClockTime(NSDate *date) }); } @@ -11067,7 +11023,7 @@ index 92b509ad482f4d3b5a69a00b0fd23c4d0aab16ae..33c77395b21577e8c6911a60fb1c674a { _processPoolConfiguration->setIsAutomaticProcessWarmingEnabled(prewarms); diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm -index 00b250e5d3ee4dbd4537e23fcb1f6e44a454607c..e1701062ef7df02ed7b83ff19c84df0fe43e4661 100644 +index 37fc2ad398dfb9a821b381308e901d194dfea05a..17bd960aa28eec80ed78878a76f32a45d238ab04 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm @@ -24,6 +24,7 @@ @@ -11104,7 +11060,7 @@ index 1e827013c603ae8bd43d798170deb98fc3153852..2075bc78069bde530ec237c0b761773c @implementation _WKUserStyleSheet diff --git a/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspector.cpp b/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspector.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..54529a23f53cebe6f8a96873ca6c2f31f0481ae0 +index 0000000000000000000000000000000000000000..575245fc1f279a75f7e74c26652cf772a2fc95b7 --- /dev/null +++ b/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspector.cpp @@ -0,0 +1,158 @@ @@ -11264,7 +11220,7 @@ index 0000000000000000000000000000000000000000..54529a23f53cebe6f8a96873ca6c2f31 + */ +void webkit_browser_inspector_initialize_pipe(const char* defaultProxyURI, const char* const* ignoreHosts) +{ -+ WebKit::initializeBrowserInspectorPipe(makeUnique(defaultProxyURI, ignoreHosts)); ++ WebKit::initializeBrowserInspectorPipe(makeUnique(String::fromUTF8(defaultProxyURI), ignoreHosts)); +} diff --git a/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspectorPrivate.h b/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspectorPrivate.h new file mode 100644 @@ -11320,10 +11276,10 @@ index 64c90f9f25fc44911e819ab94fa973bf0b82a0e4..8d8c739fb903b71f7881801cb41901f2 bool canRunBeforeUnloadConfirmPanel() const final { return true; } diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -index ab4368bf976bd0dedc0457907de3c86bd9da1af7..01725af1ca0ccfe38663c4f180939e70877b5ffd 100644 +index 9b6b541df45c925d220f7288446c37fcf4d708ba..b88ce4ed494267b63147623baceecefdd1c6485a 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -@@ -121,8 +121,8 @@ enum { +@@ -120,8 +120,8 @@ enum { PROP_LOCAL_STORAGE_DIRECTORY, #endif PROP_WEBSITE_DATA_MANAGER, @@ -11333,7 +11289,7 @@ index ab4368bf976bd0dedc0457907de3c86bd9da1af7..01725af1ca0ccfe38663c4f180939e70 #if !USE(GTK4) PROP_USE_SYSTEM_APPEARANCE_FOR_SCROLLBARS, #endif -@@ -210,8 +210,8 @@ struct _WebKitWebContextPrivate { +@@ -209,8 +209,8 @@ struct _WebKitWebContextPrivate { RefPtr processPool; bool clientsDetached; @@ -11343,7 +11299,7 @@ index ab4368bf976bd0dedc0457907de3c86bd9da1af7..01725af1ca0ccfe38663c4f180939e70 #if !USE(GTK4) bool useSystemAppearanceForScrollbars; #endif -@@ -312,11 +312,9 @@ WEBKIT_DEFINE_TYPE(WebKitWebContext, webkit_web_context, G_TYPE_OBJECT) +@@ -311,11 +311,9 @@ WEBKIT_DEFINE_TYPE(WebKitWebContext, webkit_web_context, G_TYPE_OBJECT) static const char* injectedBundleDirectory() { @@ -11355,7 +11311,7 @@ index ab4368bf976bd0dedc0457907de3c86bd9da1af7..01725af1ca0ccfe38663c4f180939e70 #if PLATFORM(GTK) static const char* injectedBundlePath = LIBDIR G_DIR_SEPARATOR_S "webkit2gtk-" WEBKITGTK_API_VERSION_STRING -@@ -341,10 +339,10 @@ static void webkitWebContextGetProperty(GObject* object, guint propID, GValue* v +@@ -340,10 +338,10 @@ static void webkitWebContextGetProperty(GObject* object, guint propID, GValue* v case PROP_WEBSITE_DATA_MANAGER: g_value_set_object(value, webkit_web_context_get_website_data_manager(context)); break; @@ -11367,7 +11323,7 @@ index ab4368bf976bd0dedc0457907de3c86bd9da1af7..01725af1ca0ccfe38663c4f180939e70 #if !USE(GTK4) case PROP_USE_SYSTEM_APPEARANCE_FOR_SCROLLBARS: g_value_set_boolean(value, webkit_web_context_get_use_system_appearance_for_scrollbars(context)); -@@ -371,10 +369,10 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa +@@ -370,10 +368,10 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa context->priv->websiteDataManager = manager ? WEBKIT_WEBSITE_DATA_MANAGER(manager) : nullptr; break; } @@ -11379,7 +11335,7 @@ index ab4368bf976bd0dedc0457907de3c86bd9da1af7..01725af1ca0ccfe38663c4f180939e70 #if !USE(GTK4) case PROP_USE_SYSTEM_APPEARANCE_FOR_SCROLLBARS: webkit_web_context_set_use_system_appearance_for_scrollbars(context, g_value_get_boolean(value)); -@@ -391,10 +389,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa +@@ -390,10 +388,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa } } @@ -11399,7 +11355,7 @@ index ab4368bf976bd0dedc0457907de3c86bd9da1af7..01725af1ca0ccfe38663c4f180939e70 GUniquePtr bundleFilename(g_build_filename(injectedBundleDirectory(), INJECTED_BUNDLE_FILENAME, nullptr)); WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object); -@@ -403,8 +410,8 @@ static void webkitWebContextConstructed(GObject* object) +@@ -402,8 +409,8 @@ static void webkitWebContextConstructed(GObject* object) API::ProcessPoolConfiguration configuration; configuration.setInjectedBundlePath(FileSystem::stringFromFileSystemRepresentation(bundleFilename.get())); configuration.setUsesWebProcessCache(true); @@ -11409,7 +11365,7 @@ index ab4368bf976bd0dedc0457907de3c86bd9da1af7..01725af1ca0ccfe38663c4f180939e70 #if !USE(GTK4) configuration.setUseSystemAppearanceForScrollbars(priv->useSystemAppearanceForScrollbars); #endif -@@ -446,6 +453,8 @@ static void webkitWebContextConstructed(GObject* object) +@@ -445,6 +452,8 @@ static void webkitWebContextConstructed(GObject* object) static void webkitWebContextDispose(GObject* object) { @@ -11418,7 +11374,7 @@ index ab4368bf976bd0dedc0457907de3c86bd9da1af7..01725af1ca0ccfe38663c4f180939e70 WebKitWebContextPrivate* priv = WEBKIT_WEB_CONTEXT(object)->priv; if (!priv->clientsDetached) { priv->clientsDetached = true; -@@ -514,7 +523,6 @@ static void webkit_web_context_class_init(WebKitWebContextClass* webContextClass +@@ -513,7 +522,6 @@ static void webkit_web_context_class_init(WebKitWebContextClass* webContextClass WEBKIT_TYPE_WEBSITE_DATA_MANAGER, static_cast(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); @@ -11426,7 +11382,7 @@ index ab4368bf976bd0dedc0457907de3c86bd9da1af7..01725af1ca0ccfe38663c4f180939e70 /** * WebKitWebContext:process-swap-on-cross-site-navigation-enabled: * -@@ -536,6 +544,7 @@ static void webkit_web_context_class_init(WebKitWebContextClass* webContextClass +@@ -535,6 +543,7 @@ static void webkit_web_context_class_init(WebKitWebContextClass* webContextClass FALSE, static_cast(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); @@ -11444,7 +11400,7 @@ index 78d1578f94793e9e59a3d4d2b33e79ea8530fa04..493cdadac3873508b3efa3048638e73a #endif +int webkitWebContextExistingCount(); diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp -index ba4b5455d460dcca64ab4a1b7d41eff6bf62431e..1ce0bf34f94889537e04d261b4942d19ea5a8ced 100644 +index ed9a960f5a8de6bbcdf30fe89e1a1f0c411a913f..13d685dc5e4f01a1e99b89c9b6b5d2d04c9ab1a0 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp @@ -32,6 +32,7 @@ @@ -11659,10 +11615,10 @@ index 0000000000000000000000000000000000000000..9f1a0173a5641d6f158d815b8f7b9ea6 + +#endif diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -index 3ffcbd7c123ddb4e60f5cbce432f87b956987074..ab2a2e4d2a89c43263daa29f93cedc29523b6100 100644 +index 54293e7e4c923eafb2459c243cc9a3913e970e3f..f7a16a553798b0608371cb9a4aade2c0ccb00114 100644 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp -@@ -2548,6 +2548,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) +@@ -2558,6 +2558,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase) #endif } @@ -12058,7 +12014,7 @@ index 0000000000000000000000000000000000000000..a47e7eeb15094655c87d41ad0de79733 + +#endif diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp -index e0fc205b39095cf8aae201a1dcca520461c60de4..872186ad99a7b82f0c61705ff6c5ae4453e5e1d4 100644 +index 763bda5b29304f7ed7133c0a8158e6c8b94c5ea1..ff5d01438e44ce6785a2aa70fc5423ba74e7101c 100644 --- a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp +++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp @@ -54,6 +54,7 @@ struct _WebKitWebViewBackend { @@ -12125,18 +12081,1724 @@ index e4b92ace1531090ae38a7aec3d3d4febf19aee84..43690f9ef4969a39084501613bfc00a7 + +cairo_surface_t* webkitWebViewBackendTakeScreenshot(WebKitWebViewBackend*); diff --git a/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt b/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt -index c0e1359abff7d0f6bf08853baba831e64312e49a..c06c34d0c0056aad1c1c886343fe14bfb11c6325 100644 ---- a/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt +new file mode 100644 +index 0000000000000000000000000000000000000000..c06c34d0c0056aad1c1c886343fe14bfb11c6325 +--- /dev/null +++ b/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt -@@ -327,6 +327,8 @@ WEBKIT_TYPE_WEB_VIEW_BACKEND - WebKitWebViewBackend - webkit_web_view_backend_get_wpe_backend - webkit_web_view_backend_new +@@ -0,0 +1,1713 @@ ++
++WebKitWebContext ++WebKitWebContext ++WebKitWebContext ++WebKitCacheModel ++WebKitProcessModel ++webkit_web_context_get_default ++webkit_web_context_new ++webkit_web_context_new_ephemeral ++webkit_web_context_new_with_website_data_manager ++webkit_web_context_is_ephemeral ++webkit_web_context_is_automation_allowed ++webkit_web_context_set_automation_allowed ++webkit_web_context_get_website_data_manager ++webkit_web_context_get_cache_model ++webkit_web_context_set_cache_model ++webkit_web_context_get_web_process_count_limit ++webkit_web_context_set_web_process_count_limit ++webkit_web_context_clear_cache ++webkit_web_context_set_network_proxy_settings ++webkit_web_context_download_uri ++webkit_web_context_get_cookie_manager ++webkit_web_context_get_geolocation_manager ++webkit_web_context_get_favicon_database ++webkit_web_context_set_favicon_database_directory ++webkit_web_context_get_favicon_database_directory ++webkit_web_context_get_security_manager ++webkit_web_context_set_additional_plugins_directory ++webkit_web_context_get_plugins ++webkit_web_context_get_plugins_finish ++webkit_web_context_get_sandbox_enabled ++webkit_web_context_set_sandbox_enabled ++webkit_web_context_add_path_to_sandbox ++webkit_web_context_get_spell_checking_enabled ++webkit_web_context_set_spell_checking_enabled ++webkit_web_context_get_spell_checking_languages ++webkit_web_context_set_spell_checking_languages ++webkit_web_context_set_preferred_languages ++webkit_web_context_set_tls_errors_policy ++webkit_web_context_get_tls_errors_policy ++webkit_web_context_set_web_extensions_directory ++webkit_web_context_set_web_extensions_initialization_user_data ++webkit_web_context_prefetch_dns ++webkit_web_context_allow_tls_certificate_for_host ++webkit_web_context_get_process_model ++webkit_web_context_set_process_model ++webkit_web_context_initialize_notification_permissions ++webkit_web_context_send_message_to_all_extensions ++ ++ ++WebKitURISchemeRequestCallback ++webkit_web_context_register_uri_scheme ++ ++ ++WebKitWebContextClass ++WEBKIT_WEB_CONTEXT ++WEBKIT_IS_WEB_CONTEXT ++WEBKIT_TYPE_WEB_CONTEXT ++WEBKIT_WEB_CONTEXT_CLASS ++WEBKIT_IS_WEB_CONTEXT_CLASS ++WEBKIT_WEB_CONTEXT_GET_CLASS ++ ++ ++WebKitWebContextPrivate ++webkit_web_context_get_type ++
++ ++
++WebKitUserContent ++WebKitUserContent ++WebKitUserStyleSheet ++WebKitUserScript ++WebKitUserContentInjectedFrames ++WebKitUserStyleLevel ++WebKitUserScriptInjectionTime ++WebKitUserContentFilter ++webkit_user_style_sheet_ref ++webkit_user_style_sheet_unref ++webkit_user_style_sheet_new ++webkit_user_style_sheet_new_for_world ++webkit_user_script_ref ++webkit_user_script_unref ++webkit_user_script_new ++webkit_user_script_new_for_world ++webkit_user_content_filter_ref ++webkit_user_content_filter_unref ++webkit_user_content_filter_get_identifier ++ ++ ++WEBKIT_TYPE_USER_STYLE_SHEET ++WEBKIT_TYPE_USER_SCRIPT ++WEBKIT_TYPE_USER_CONTENT_FILTER ++ ++ ++webkit_user_style_sheet_get_type ++webkit_user_script_get_type ++webkit_user_content_filter_get_type ++
++ ++
++WebKitUserContentManager ++WebKitUserContentManager ++WebKitUserContentManager ++webkit_user_content_manager_new ++webkit_user_content_manager_add_style_sheet ++webkit_user_content_manager_remove_style_sheet ++webkit_user_content_manager_remove_all_style_sheets ++webkit_user_content_manager_add_script ++webkit_user_content_manager_remove_script ++webkit_user_content_manager_remove_all_scripts ++webkit_user_content_manager_register_script_message_handler ++webkit_user_content_manager_unregister_script_message_handler ++webkit_user_content_manager_register_script_message_handler_in_world ++webkit_user_content_manager_unregister_script_message_handler_in_world ++webkit_user_content_manager_add_filter ++webkit_user_content_manager_remove_filter ++webkit_user_content_manager_remove_filter_by_id ++webkit_user_content_manager_remove_all_filters ++ ++ ++WEBKIT_IS_USER_CONTENT_MANAGER ++WEBKIT_IS_USER_CONTENT_MANAGER_CLASS ++WEBKIT_TYPE_USER_CONTENT_MANAGER ++WEBKIT_USER_CONTENT_MANAGER ++WEBKIT_USER_CONTENT_MANAGER_CLASS ++WEBKIT_USER_CONTENT_MANAGER_GET_CLASS ++WebKitUserContentManagerClass ++ ++ ++WebKitUserContentManagerPrivate ++webkit_user_content_manager_get_type ++
++ ++
++WebKitUserContentFilterStore ++WebKitUserContentFilterStore ++WebKitUserContentFilterStore ++webkit_user_content_filter_store_new ++webkit_user_content_filter_store_get_path ++webkit_user_content_filter_store_save ++webkit_user_content_filter_store_save_finish ++webkit_user_content_filter_store_save_from_file ++webkit_user_content_filter_store_save_from_file_finish ++webkit_user_content_filter_store_load ++webkit_user_content_filter_store_load_finish ++webkit_user_content_filter_store_remove ++webkit_user_content_filter_store_remove_finish ++webkit_user_content_filter_store_fetch_identifiers ++webkit_user_content_filter_store_fetch_identifiers_finish ++ ++ ++WEBKIT_IS_USER_CONTENT_FILTER_STORE ++WEBKIT_IS_USER_CONTENT_FILTER_STORE_CLASS ++WEBKIT_TYPE_USER_CONTENT_FILTER_STORE ++WEBKIT_USER_CONTENT_FILTER_STORE ++WEBKIT_USER_CONTENT_FILTER_STORE_CLASS ++WEBKIT_USER_CONTENT_FILTER_STORE_GET_CLASS ++WebKitUserContentFilterStoreClass ++ ++ ++WebKitUserContentFilterStorePrivate ++webkit_user_content_filter_store_get_type ++
++ ++
++WebKitWebView ++WebKitWebView ++WebKitWebView ++WebKitLoadEvent ++WebKitPolicyDecisionType ++WebKitSaveMode ++WebKitInsecureContentEvent ++WebKitWebProcessTerminationReason ++WebKitFrameDisplayedCallback ++WebKitAutoplayPolicy ++WebKitMediaCaptureState ++ ++ ++WEBKIT_EDITING_COMMAND_CUT ++WEBKIT_EDITING_COMMAND_COPY ++WEBKIT_EDITING_COMMAND_PASTE ++WEBKIT_EDITING_COMMAND_PASTE_AS_PLAIN_TEXT ++WEBKIT_EDITING_COMMAND_SELECT_ALL ++WEBKIT_EDITING_COMMAND_UNDO ++WEBKIT_EDITING_COMMAND_REDO ++WEBKIT_EDITING_COMMAND_INSERT_IMAGE ++WEBKIT_EDITING_COMMAND_CREATE_LINK ++ ++ ++webkit_web_view_new ++webkit_web_view_new_with_context ++webkit_web_view_new_with_related_view ++webkit_web_view_new_with_settings ++webkit_web_view_new_with_user_content_manager ++webkit_web_view_get_backend ++webkit_web_view_is_ephemeral ++webkit_web_view_is_controlled_by_automation ++webkit_web_view_get_automation_presentation_type ++webkit_web_view_get_context ++webkit_web_view_get_user_content_manager ++webkit_web_view_get_website_data_manager ++webkit_web_view_try_close ++webkit_web_view_load_uri ++webkit_web_view_load_html ++webkit_web_view_load_alternate_html ++webkit_web_view_load_plain_text ++webkit_web_view_load_bytes ++webkit_web_view_load_request ++webkit_web_view_can_go_back ++webkit_web_view_go_back ++webkit_web_view_can_go_forward ++webkit_web_view_go_forward ++webkit_web_view_get_title ++webkit_web_view_get_page_id ++webkit_web_view_reload ++webkit_web_view_reload_bypass_cache ++webkit_web_view_stop_loading ++webkit_web_view_is_loading ++webkit_web_view_is_playing_audio ++webkit_web_view_set_is_muted ++webkit_web_view_get_is_muted ++webkit_web_view_get_estimated_load_progress ++webkit_web_view_get_custom_charset ++webkit_web_view_set_custom_charset ++webkit_web_view_get_back_forward_list ++webkit_web_view_go_to_back_forward_list_item ++webkit_web_view_get_uri ++webkit_web_view_set_settings ++webkit_web_view_get_settings ++webkit_web_view_get_window_properties ++webkit_web_view_set_zoom_level ++webkit_web_view_get_zoom_level ++webkit_web_view_can_execute_editing_command ++webkit_web_view_can_execute_editing_command_finish ++webkit_web_view_execute_editing_command ++webkit_web_view_execute_editing_command_with_argument ++webkit_web_view_get_find_controller ++webkit_web_view_run_javascript ++webkit_web_view_run_javascript_finish ++webkit_web_view_run_javascript_in_world ++webkit_web_view_run_javascript_in_world_finish ++webkit_web_view_run_javascript_from_gresource ++webkit_web_view_run_javascript_from_gresource_finish ++webkit_web_view_can_show_mime_type ++webkit_web_view_save ++webkit_web_view_save_finish ++webkit_web_view_save_to_file ++webkit_web_view_save_to_file_finish ++webkit_web_view_download_uri ++webkit_web_view_get_tls_info ++webkit_web_view_set_editable ++webkit_web_view_is_editable ++webkit_web_view_get_editor_state ++webkit_web_view_get_session_state ++webkit_web_view_restore_session_state ++webkit_web_view_get_main_resource ++webkit_web_view_add_frame_displayed_callback ++webkit_web_view_remove_frame_displayed_callback ++webkit_web_view_get_background_color ++webkit_web_view_set_background_color ++webkit_web_view_send_message_to_page ++webkit_web_view_send_message_to_page_finish ++webkit_web_view_set_input_method_context ++webkit_web_view_get_input_method_context ++webkit_web_view_get_website_policies ++webkit_web_view_get_is_web_process_responsive ++webkit_web_view_terminate_web_process ++webkit_web_view_set_cors_allowlist ++webkit_web_view_get_camera_capture_state ++webkit_web_view_get_microphone_capture_state ++webkit_web_view_set_camera_capture_state ++webkit_web_view_set_microphone_capture_state ++webkit_web_view_get_display_capture_state ++webkit_web_view_set_display_capture_state ++ ++ ++WebKitJavascriptResult ++webkit_javascript_result_ref ++webkit_javascript_result_unref ++webkit_javascript_result_get_js_value ++ ++ ++WebKitScriptDialog ++WebKitScriptDialogType ++webkit_script_dialog_ref ++webkit_script_dialog_unref ++webkit_script_dialog_get_dialog_type ++webkit_script_dialog_get_message ++webkit_script_dialog_confirm_set_confirmed ++webkit_script_dialog_prompt_get_default_text ++webkit_script_dialog_prompt_set_text ++webkit_script_dialog_close ++ ++ ++WebKitWebViewSessionState ++webkit_web_view_session_state_new ++webkit_web_view_session_state_ref ++webkit_web_view_session_state_unref ++webkit_web_view_session_state_serialize ++ ++ ++WebKitWebViewClass ++WEBKIT_WEB_VIEW ++WEBKIT_IS_WEB_VIEW ++WEBKIT_TYPE_WEB_VIEW ++WEBKIT_WEB_VIEW_CLASS ++WEBKIT_IS_WEB_VIEW_CLASS ++WEBKIT_WEB_VIEW_GET_CLASS ++WEBKIT_TYPE_JAVASCRIPT_RESULT ++WEBKIT_TYPE_SCRIPT_DIALOG ++WEBKIT_TYPE_WEB_VIEW_SESSION_STATE ++ ++ ++webkit_web_view_get_type ++webkit_javascript_result_get_type ++webkit_script_dialog_get_type ++webkit_web_view_session_state_get_type ++WebKitWebViewPrivate ++WEBKIT_API ++WEBKIT_DEPRECATED ++WEBKIT_DEPRECATED_FOR ++
++ ++
++WebKitWebViewBackend ++WEBKIT_TYPE_WEB_VIEW_BACKEND ++WebKitWebViewBackend ++webkit_web_view_backend_get_wpe_backend ++webkit_web_view_backend_new +take_screenshot_callback +webkit_web_view_backend_set_screenshot_callback - - - webkit_web_view_backend_get_type ++ ++ ++webkit_web_view_backend_get_type ++
++ ++
++WebKitColor ++WEBKIT_TYPE_COLOR ++WebKitColor ++webkit_color_parse ++ ++ ++webkit_color_get_type ++
++ ++
++WebKitRectangle ++WEBKIT_TYPE_RECTANGLE ++WebKitRectangle ++ ++ ++webkit_rectangle_get_type ++
++ ++
++WebKitAuthenticationRequest ++WebKitAuthenticationRequest ++WebKitAuthenticationScheme ++webkit_authentication_request_authenticate ++webkit_authentication_request_cancel ++webkit_authentication_request_can_save_credentials ++webkit_authentication_request_set_can_save_credentials ++webkit_authentication_request_get_host ++webkit_authentication_request_get_port ++webkit_authentication_request_get_security_origin ++webkit_authentication_request_is_retry ++webkit_authentication_request_get_proposed_credential ++webkit_authentication_request_set_proposed_credential ++webkit_authentication_request_get_realm ++webkit_authentication_request_get_scheme ++webkit_authentication_request_get_certificate_pin_flags ++webkit_authentication_request_is_for_proxy ++ ++ ++WebKitAuthenticationRequestClass ++WEBKIT_TYPE_AUTHENTICATION_REQUEST ++WEBKIT_AUTHENTICATION_REQUEST ++WEBKIT_AUTHENTICATION_REQUEST_CLASS ++WEBKIT_AUTHENTICATION_REQUEST_GET_CLASS ++WEBKIT_IS_AUTHENTICATION_REQUEST ++WEBKIT_IS_AUTHENTICATION_REQUEST_CLASS ++WEBKIT_TYPE_CREDENTIAL ++ ++ ++WebKitAuthenticationRequestPrivate ++webkit_authentication_request_get_type ++webkit_credential_get_type ++ ++ ++WebKitCredential ++WebKitCredentialPersistence ++webkit_credential_new ++webkit_credential_new_for_certificate_pin ++webkit_credential_new_for_certificate ++webkit_credential_copy ++webkit_credential_free ++webkit_credential_get_password ++webkit_credential_get_persistence ++webkit_credential_get_username ++webkit_credential_has_password ++webkit_credential_get_certificate ++
++ ++
++WebKitBackForwardList ++WebKitBackForwardList ++webkit_back_forward_list_get_length ++webkit_back_forward_list_get_current_item ++webkit_back_forward_list_get_back_item ++webkit_back_forward_list_get_forward_item ++webkit_back_forward_list_get_nth_item ++webkit_back_forward_list_get_back_list ++webkit_back_forward_list_get_back_list_with_limit ++webkit_back_forward_list_get_forward_list ++webkit_back_forward_list_get_forward_list_with_limit ++ ++ ++WebKitBackForwardListClass ++WEBKIT_TYPE_BACK_FORWARD_LIST ++WEBKIT_BACK_FORWARD_LIST ++WEBKIT_IS_BACK_FORWARD_LIST ++WEBKIT_BACK_FORWARD_LIST_CLASS ++WEBKIT_IS_BACK_FORWARD_LIST_CLASS ++WEBKIT_BACK_FORWARD_LIST_GET_CLASS ++ ++ ++WebKitBackForwardListPrivate ++webkit_back_forward_list_get_type ++
++ ++
++WebKitBackForwardListItem ++WebKitBackForwardListItem ++webkit_back_forward_list_item_get_title ++webkit_back_forward_list_item_get_uri ++webkit_back_forward_list_item_get_original_uri ++ ++ ++WebKitBackForwardListItemClass ++WEBKIT_TYPE_BACK_FORWARD_LIST_ITEM ++WEBKIT_BACK_FORWARD_LIST_ITEM ++WEBKIT_IS_BACK_FORWARD_LIST_ITEM ++WEBKIT_BACK_FORWARD_LIST_ITEM_CLASS ++WEBKIT_IS_BACK_FORWARD_LIST_ITEM_CLASS ++WEBKIT_BACK_FORWARD_LIST_ITEM_GET_CLASS ++ ++ ++WebKitBackForwardListItemPrivate ++webkit_back_forward_list_item_get_type ++
++ ++
++WebKitSettings ++WebKitSettings ++webkit_settings_new ++webkit_settings_new_with_settings ++webkit_settings_get_auto_load_images ++webkit_settings_set_auto_load_images ++webkit_settings_get_enable_frame_flattening ++webkit_settings_set_enable_frame_flattening ++webkit_settings_get_enable_html5_database ++webkit_settings_set_enable_html5_database ++webkit_settings_get_enable_html5_local_storage ++webkit_settings_set_enable_html5_local_storage ++webkit_settings_get_enable_hyperlink_auditing ++webkit_settings_set_enable_hyperlink_auditing ++webkit_settings_get_enable_java ++webkit_settings_set_enable_java ++webkit_settings_get_enable_javascript ++webkit_settings_set_enable_javascript ++webkit_settings_get_enable_javascript_markup ++webkit_settings_set_enable_javascript_markup ++webkit_settings_get_enable_offline_web_application_cache ++webkit_settings_set_enable_offline_web_application_cache ++webkit_settings_get_enable_plugins ++webkit_settings_set_enable_plugins ++webkit_settings_get_enable_xss_auditor ++webkit_settings_set_enable_xss_auditor ++webkit_settings_get_javascript_can_open_windows_automatically ++webkit_settings_set_javascript_can_open_windows_automatically ++webkit_settings_get_load_icons_ignoring_image_load_setting ++webkit_settings_set_load_icons_ignoring_image_load_setting ++webkit_settings_get_default_font_family ++webkit_settings_set_default_font_family ++webkit_settings_get_monospace_font_family ++webkit_settings_set_monospace_font_family ++webkit_settings_get_serif_font_family ++webkit_settings_set_serif_font_family ++webkit_settings_get_sans_serif_font_family ++webkit_settings_set_sans_serif_font_family ++webkit_settings_get_cursive_font_family ++webkit_settings_set_cursive_font_family ++webkit_settings_get_fantasy_font_family ++webkit_settings_set_fantasy_font_family ++webkit_settings_get_pictograph_font_family ++webkit_settings_set_pictograph_font_family ++webkit_settings_get_default_font_size ++webkit_settings_set_default_font_size ++webkit_settings_get_default_monospace_font_size ++webkit_settings_set_default_monospace_font_size ++webkit_settings_get_minimum_font_size ++webkit_settings_set_minimum_font_size ++webkit_settings_get_default_charset ++webkit_settings_set_default_charset ++webkit_settings_get_enable_developer_extras ++webkit_settings_set_enable_developer_extras ++webkit_settings_get_enable_resizable_text_areas ++webkit_settings_set_enable_resizable_text_areas ++webkit_settings_get_enable_tabs_to_links ++webkit_settings_set_enable_tabs_to_links ++webkit_settings_get_enable_dns_prefetching ++webkit_settings_set_enable_dns_prefetching ++webkit_settings_get_enable_caret_browsing ++webkit_settings_set_enable_caret_browsing ++webkit_settings_get_enable_fullscreen ++webkit_settings_set_enable_fullscreen ++webkit_settings_get_print_backgrounds ++webkit_settings_set_print_backgrounds ++webkit_settings_get_enable_webaudio ++webkit_settings_set_enable_webaudio ++webkit_settings_get_enable_webgl ++webkit_settings_set_enable_webgl ++webkit_settings_set_allow_modal_dialogs ++webkit_settings_get_allow_modal_dialogs ++webkit_settings_get_zoom_text_only ++webkit_settings_set_zoom_text_only ++webkit_settings_get_javascript_can_access_clipboard ++webkit_settings_set_javascript_can_access_clipboard ++webkit_settings_get_media_playback_requires_user_gesture ++webkit_settings_set_media_playback_requires_user_gesture ++webkit_settings_get_media_playback_allows_inline ++webkit_settings_set_media_playback_allows_inline ++webkit_settings_get_draw_compositing_indicators ++webkit_settings_set_draw_compositing_indicators ++webkit_settings_get_enable_site_specific_quirks ++webkit_settings_set_enable_site_specific_quirks ++webkit_settings_get_enable_page_cache ++webkit_settings_set_enable_page_cache ++webkit_settings_get_user_agent ++webkit_settings_set_user_agent ++webkit_settings_set_user_agent_with_application_details ++webkit_settings_get_enable_smooth_scrolling ++webkit_settings_set_enable_smooth_scrolling ++webkit_settings_get_enable_accelerated_2d_canvas ++webkit_settings_set_enable_accelerated_2d_canvas ++webkit_settings_get_enable_write_console_messages_to_stdout ++webkit_settings_set_enable_write_console_messages_to_stdout ++webkit_settings_get_enable_media_stream ++webkit_settings_set_enable_media_stream ++webkit_settings_get_enable_mock_capture_devices ++webkit_settings_set_enable_mock_capture_devices ++webkit_settings_get_enable_spatial_navigation ++webkit_settings_set_enable_spatial_navigation ++webkit_settings_get_enable_mediasource ++webkit_settings_set_enable_mediasource ++webkit_settings_get_enable_encrypted_media ++webkit_settings_set_enable_encrypted_media ++webkit_settings_get_enable_media_capabilities ++webkit_settings_set_enable_media_capabilities ++webkit_settings_get_allow_file_access_from_file_urls ++webkit_settings_set_allow_file_access_from_file_urls ++webkit_settings_get_allow_universal_access_from_file_urls ++webkit_settings_set_allow_universal_access_from_file_urls ++webkit_settings_get_allow_top_navigation_to_data_urls ++webkit_settings_set_allow_top_navigation_to_data_urls ++webkit_settings_get_enable_media ++webkit_settings_set_enable_media ++webkit_settings_get_media_content_types_requiring_hardware_support ++webkit_settings_set_media_content_types_requiring_hardware_support ++ ++ ++WebKitSettingsClass ++WEBKIT_TYPE_SETTINGS ++WEBKIT_SETTINGS ++WEBKIT_IS_SETTINGS ++WEBKIT_SETTINGS_CLASS ++WEBKIT_IS_SETTINGS_CLASS ++WEBKIT_SETTINGS_GET_CLASS ++ ++ ++WebKitSettingsPrivate ++webkit_settings_get_type ++
++ ++
++WebKitURIRequest ++WebKitURIRequest ++webkit_uri_request_new ++webkit_uri_request_get_uri ++webkit_uri_request_set_uri ++webkit_uri_request_get_http_method ++webkit_uri_request_get_http_headers ++ ++ ++WebKitURIRequestClass ++WEBKIT_TYPE_URI_REQUEST ++WEBKIT_URI_REQUEST ++WEBKIT_IS_URI_REQUEST ++WEBKIT_URI_REQUEST_CLASS ++WEBKIT_IS_URI_REQUEST_CLASS ++WEBKIT_URI_REQUEST_GET_CLASS ++ ++ ++WebKitURIRequestPrivate ++webkit_uri_request_get_type ++
++ ++
++WebKitURIResponse ++WebKitURIResponse ++webkit_uri_response_get_uri ++webkit_uri_response_get_status_code ++webkit_uri_response_get_content_length ++webkit_uri_response_get_mime_type ++webkit_uri_response_get_suggested_filename ++webkit_uri_response_get_http_headers ++ ++ ++WebKitURIResponseClass ++WEBKIT_TYPE_URI_RESPONSE ++WEBKIT_URI_RESPONSE ++WEBKIT_IS_URI_RESPONSE ++WEBKIT_URI_RESPONSE_CLASS ++WEBKIT_IS_URI_RESPONSE_CLASS ++WEBKIT_URI_RESPONSE_GET_CLASS ++ ++ ++WebKitURIResponsePrivate ++webkit_uri_response_get_type ++
++ ++
++WebKitUserMessage ++WebKitUserMessage ++webkit_user_message_new ++webkit_user_message_new_with_fd_list ++webkit_user_message_get_name ++webkit_user_message_get_parameters ++webkit_user_message_get_fd_list ++webkit_user_message_send_reply ++ ++ ++WEBKIT_USER_MESSAGE_ERROR ++WebKitUserMessageError ++webkit_user_message_error_quark ++ ++ ++WebKitUserMessageClass ++WEBKIT_TYPE_USER_MESSAGE ++WEBKIT_USER_MESSAGE ++WEBKIT_IS_USER_MESSAGE ++WEBKIT_USER_MESSAGE_CLASS ++WEBKIT_IS_USER_MESSAGE_CLASS ++WEBKIT_USER_MESSAGE_GET_CLASS ++ ++ ++WebKitUserMessagePrivate ++webkit_user_message_get_type ++
++ ++
++WebKitWindowProperties ++WebKitWindowProperties ++webkit_window_properties_get_toolbar_visible ++webkit_window_properties_get_statusbar_visible ++webkit_window_properties_get_scrollbars_visible ++webkit_window_properties_get_menubar_visible ++webkit_window_properties_get_locationbar_visible ++webkit_window_properties_get_resizable ++webkit_window_properties_get_fullscreen ++ ++ ++WebKitWindowPropertiesClass ++WEBKIT_TYPE_WINDOW_PROPERTIES ++WEBKIT_WINDOW_PROPERTIES ++WEBKIT_IS_WINDOW_PROPERTIES ++WEBKIT_WINDOW_PROPERTIES_CLASS ++WEBKIT_IS_WINDOW_PROPERTIES_CLASS ++WEBKIT_WINDOW_PROPERTIES_GET_CLASS ++ ++ ++WebKitWindowPropertiesPrivate ++webkit_window_properties_get_type ++
++ ++
++WebKitDownload ++WebKitDownload ++webkit_download_get_request ++webkit_download_get_destination ++webkit_download_set_destination ++webkit_download_get_response ++webkit_download_cancel ++webkit_download_get_estimated_progress ++webkit_download_get_elapsed_time ++webkit_download_get_received_data_length ++webkit_download_get_web_view ++webkit_download_get_allow_overwrite ++webkit_download_set_allow_overwrite ++ ++ ++WebKitDownloadClass ++WEBKIT_TYPE_DOWNLOAD ++WEBKIT_DOWNLOAD ++WEBKIT_IS_DOWNLOAD ++WEBKIT_DOWNLOAD_CLASS ++WEBKIT_IS_DOWNLOAD_CLASS ++WEBKIT_DOWNLOAD_GET_CLASS ++ ++ ++WebKitDownloadPrivate ++webkit_download_get_type ++
++ ++
++WebKitPermissionRequest ++WebKitPermissionRequest ++webkit_permission_request_allow ++webkit_permission_request_deny ++ ++ ++WebKitPermissionRequestIface ++WEBKIT_TYPE_PERMISSION_REQUEST ++WEBKIT_PERMISSION_REQUEST ++WEBKIT_IS_PERMISSION_REQUEST ++WEBKIT_PERMISSION_REQUEST_GET_IFACE ++ ++ ++webkit_permission_request_get_type ++
++ ++
++WebKitGeolocationPermissionRequest ++WebKitGeolocationPermissionRequest ++ ++ ++WebKitGeolocationPermissionRequestClass ++WEBKIT_TYPE_GEOLOCATION_PERMISSION_REQUEST ++WEBKIT_GEOLOCATION_PERMISSION_REQUEST ++WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST ++WEBKIT_GEOLOCATION_PERMISSION_REQUEST_CLASS ++WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST_CLASS ++WEBKIT_GEOLOCATION_PERMISSION_REQUEST_GET_CLASS ++ ++ ++WebKitGeolocationPermissionRequestPrivate ++webkit_geolocation_permission_request_get_type ++
++ ++
++WebKitInstallMissingMediaPluginsPermissionRequest ++WebKitInstallMissingMediaPluginsPermissionRequest ++webkit_install_missing_media_plugins_permission_request_get_description ++ ++ ++WebKitInstallMissingMediaPluginsPermissionRequestClass ++WEBKIT_TYPE_INSTALL_MISSING_MEDIA_PLUGINS_PERMISSION_REQUEST ++WEBKIT_INSTALL_MISSING_MEDIA_PLUGINS_PERMISSION_REQUEST ++WEBKIT_IS_INSTALL_MISSING_MEDIA_PLUGINS_PERMISSION_REQUEST ++WEBKIT_INSTALL_MISSING_MEDIA_PLUGINS_PERMISSION_REQUEST_CLASS ++WEBKIT_IS_INSTALL_MISSING_MEDIA_PLUGINS_PERMISSION_REQUEST_CLASS ++WEBKIT_INSTALL_MISSING_MEDIA_PLUGINS_PERMISSION_REQUEST_GET_CLASS ++ ++ ++WebKitInstallMissingMediaPluginsPermissionRequestPrivate ++webkit_install_missing_media_plugins_permission_request_get_type ++
++ ++
++WebKitDeviceInfoPermissionRequest ++WebKitDeviceInfoPermissionRequest ++ ++ ++WebKitDeviceInfoPermissionRequestClass ++WEBKIT_TYPE_DEVICE_INFO_PERMISSION_REQUEST ++WEBKIT_DEVICE_INFO_PERMISSION_REQUEST ++WEBKIT_IS_DEVICE_INFO_PERMISSION_REQUEST ++WEBKIT_DEVICE_INFO_PERMISSION_REQUEST_CLASS ++WEBKIT_IS_DEVICE_INFO_PERMISSION_REQUEST_CLASS ++WEBKIT_DEVICE_INFO_PERMISSION_REQUEST_GET_CLASS ++ ++ ++WebKitDeviceInfoPermissionRequestPrivate ++webkit_device_info_permission_request_get_type ++
++ ++
++WebKitNavigationAction ++WebKitNavigationAction ++webkit_navigation_action_copy ++webkit_navigation_action_free ++webkit_navigation_action_get_navigation_type ++webkit_navigation_action_get_mouse_button ++webkit_navigation_action_get_modifiers ++webkit_navigation_action_get_request ++webkit_navigation_action_is_user_gesture ++webkit_navigation_action_is_redirect ++ ++ ++WEBKIT_TYPE_NAVIGATION_ACTION ++ ++ ++webkit_navigation_action_get_type ++
++ ++
++WebKitUserMediaPermissionRequest ++WebKitUserMediaPermissionRequest ++webkit_user_media_permission_is_for_audio_device ++webkit_user_media_permission_is_for_video_device ++webkit_user_media_permission_is_for_display_device ++ ++ ++WebKitUserMediaPermissionRequestClass ++WEBKIT_TYPE_USER_MEDIA_PERMISSION_REQUEST ++WEBKIT_USER_MEDIA_PERMISSION_REQUEST ++WEBKIT_IS_USER_MEDIA_PERMISSION_REQUEST ++WEBKIT_USER_MEDIA_PERMISSION_REQUEST_CLASS ++WEBKIT_IS_USER_MEDIA_PERMISSION_REQUEST_CLASS ++WEBKIT_USER_MEDIA_PERMISSION_REQUEST_GET_CLASS ++ ++ ++WebKitUserMediaPermissionRequestPrivate ++webkit_user_media_permission_request_get_type ++
++ ++
++WebKitMediaKeySystemPermissionRequest ++WebKitMediaKeySystemPermissionRequest ++webkit_media_key_system_permission_get_name ++ ++ ++WebKitMediaKeySystemPermissionRequestClass ++WEBKIT_TYPE_MEDIA_KEY_SYSTEM_PERMISSION_REQUEST ++WEBKIT_MEDIA_KEY_SYSTEM_PERMISSION_REQUEST ++WEBKIT_IS_MEDIA_KEY_SYSTEM_PERMISSION_REQUEST ++WEBKIT_MEDIA_KEY_SYSTEM_PERMISSION_REQUEST_CLASS ++WEBKIT_IS_MEDIA_KEY_SYSTEM_PERMISSION_REQUEST_CLASS ++WEBKIT_MEDIA_KEY_SYSTEM_PERMISSION_REQUEST_GET_CLASS ++ ++ ++WebKitMediaKeySystemPermissionRequestPrivate ++webkit_media_key_system_permission_request_get_type ++
++ ++
++WebKitNotification ++WebKitNotification ++webkit_notification_get_id ++webkit_notification_get_title ++webkit_notification_get_body ++webkit_notification_get_tag ++webkit_notification_close ++webkit_notification_clicked ++ ++ ++WebKitNotificationClass ++WEBKIT_TYPE_NOTIFICATION ++WEBKIT_IS_NOTIFICATION ++WEBKIT_NOTIFICATION ++WEBKIT_NOTIFICATION_CLASS ++WEBKIT_IS_NOTIFICATION_CLASS ++WEBKIT_NOTIFICATION_GET_CLASS ++ ++ ++WebKitNotificationPrivate ++webkit_notification_get_type ++
++ ++
++WebKitNotificationPermissionRequest ++WebKitNotificationPermissionRequest ++ ++ ++WebKitNotificationPermissionRequestClass ++WEBKIT_TYPE_NOTIFICATION_PERMISSION_REQUEST ++WEBKIT_NOTIFICATION_PERMISSION_REQUEST ++WEBKIT_IS_NOTIFICATION_PERMISSION_REQUEST ++WEBKIT_NOTIFICATION_PERMISSION_REQUEST_CLASS ++WEBKIT_IS_NOTIFICATION_PERMISSION_REQUEST_CLASS ++WEBKIT_NOTIFICATION_PERMISSION_REQUEST_GET_CLASS ++ ++ ++WebKitNotificationPermissionRequestPrivate ++webkit_notification_permission_request_get_type ++
++ ++
++WebKitWebsiteDataAccessPermissionRequest ++WebKitWebsiteDataAccessPermissionRequest ++webkit_website_data_access_permission_request_get_requesting_domain ++webkit_website_data_access_permission_request_get_current_domain ++ ++ ++WebKitWebsiteDataAccessPermissionRequestClass ++WEBKIT_TYPE_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST ++WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST ++WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST ++WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_CLASS ++WEBKIT_IS_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_CLASS ++WEBKIT_WEBSITE_DATA_ACCESS_PERMISSION_REQUEST_GET_CLASS ++ ++ ++WebKitWebsiteDataAccessPermissionRequestPrivate ++webkit_website_data_access_permission_request_get_type ++
++ ++
++WebKitPolicyDecision ++WebKitPolicyDecision ++webkit_policy_decision_download ++webkit_policy_decision_ignore ++webkit_policy_decision_use ++webkit_policy_decision_use_with_policies ++ ++ ++WebKitPolicyDecisionClass ++WEBKIT_TYPE_POLICY_DECISION ++WEBKIT_POLICY_DECISION ++WEBKIT_IS_POLICY_DECISION ++WEBKIT_POLICY_DECISION_CLASS ++WEBKIT_IS_POLICY_DECISION_CLASS ++WEBKIT_POLICY_DECISION_GET_CLASS ++ ++ ++WebKitPolicyDecisionPrivate ++webkit_policy_decision_get_type ++
++ ++
++WebKitNavigationPolicyDecision ++WebKitNavigationPolicyDecision ++WebKitNavigationType ++webkit_navigation_policy_decision_get_navigation_action ++webkit_navigation_policy_decision_get_frame_name ++ ++ ++WebKitNavigationPolicyDecisionClass ++WEBKIT_TYPE_NAVIGATION_POLICY_DECISION ++WEBKIT_NAVIGATION_POLICY_DECISION ++WEBKIT_IS_NAVIGATION_POLICY_DECISION ++WEBKIT_NAVIGATION_POLICY_DECISION_CLASS ++WEBKIT_IS_NAVIGATION_POLICY_DECISION_CLASS ++WEBKIT_NAVIGATION_POLICY_DECISION_GET_CLASS ++ ++ ++WebKitNavigationPolicyDecisionPrivate ++webkit_navigation_policy_decision_get_type ++
++ ++
++WebKitResponsePolicyDecision ++WebKitResponsePolicyDecision ++webkit_response_policy_decision_get_request ++webkit_response_policy_decision_get_response ++webkit_response_policy_decision_is_mime_type_supported ++ ++ ++WebKitResponsePolicyDecisionClass ++WEBKIT_TYPE_RESPONSE_POLICY_DECISION ++WEBKIT_RESPONSE_POLICY_DECISION ++WEBKIT_IS_RESPONSE_POLICY_DECISION ++WEBKIT_RESPONSE_POLICY_DECISION_CLASS ++WEBKIT_IS_RESPONSE_POLICY_DECISION_CLASS ++WEBKIT_RESPONSE_POLICY_DECISION_GET_CLASS ++ ++ ++WebKitResponsePolicyDecisionPrivate ++webkit_response_policy_decision_get_type ++
++ ++
++WebKitHitTestResult ++WebKitHitTestResult ++WebKitHitTestResultContext ++webkit_hit_test_result_get_context ++webkit_hit_test_result_context_is_link ++webkit_hit_test_result_context_is_image ++webkit_hit_test_result_context_is_media ++webkit_hit_test_result_context_is_editable ++webkit_hit_test_result_context_is_selection ++webkit_hit_test_result_context_is_scrollbar ++webkit_hit_test_result_get_link_uri ++webkit_hit_test_result_get_link_title ++webkit_hit_test_result_get_link_label ++webkit_hit_test_result_get_image_uri ++webkit_hit_test_result_get_media_uri ++ ++ ++WebKitHitTestResultClass ++WEBKIT_TYPE_HIT_TEST_RESULT ++WEBKIT_HIT_TEST_RESULT ++WEBKIT_IS_HIT_TEST_RESULT ++WEBKIT_HIT_TEST_RESULT_CLASS ++WEBKIT_IS_HIT_TEST_RESULT_CLASS ++WEBKIT_HIT_TEST_RESULT_GET_CLASS ++ ++ ++WebKitHitTestResultPrivate ++webkit_hit_test_result_get_type ++
++ ++
++WebKitEditorState ++WebKitEditorState ++WebKitEditorTypingAttributes ++webkit_editor_state_get_typing_attributes ++webkit_editor_state_is_cut_available ++webkit_editor_state_is_copy_available ++webkit_editor_state_is_paste_available ++webkit_editor_state_is_undo_available ++webkit_editor_state_is_redo_available ++ ++ ++WebKitEditorStateClass ++WEBKIT_TYPE_EDITOR_STATE ++WEBKIT_EDITOR_STATE ++WEBKIT_IS_EDITOR_STATE ++WEBKIT_EDITOR_STATE_CLASS ++WEBKIT_IS_EDITOR_STATE_CLASS ++WEBKIT_EDITOR_STATE_GET_CLASS ++ ++ ++WebKitEditorStatePrivate ++webkit_editor_state_get_type ++
++ ++
++WebKitWebResource ++WebKitWebResource ++webkit_web_resource_get_uri ++webkit_web_resource_get_response ++webkit_web_resource_get_data ++webkit_web_resource_get_data_finish ++ ++ ++WebKitWebResourceClass ++WEBKIT_TYPE_WEB_RESOURCE ++WEBKIT_WEB_RESOURCE ++WEBKIT_IS_WEB_RESOURCE ++WEBKIT_WEB_RESOURCE_CLASS ++WEBKIT_IS_WEB_RESOURCE_CLASS ++WEBKIT_WEB_RESOURCE_GET_CLASS ++ ++ ++WebKitWebResourcePrivate ++webkit_web_resource_get_type ++
++ ++
++WebKitError ++WEBKIT_NETWORK_ERROR ++WEBKIT_PLUGIN_ERROR ++WEBKIT_POLICY_ERROR ++WEBKIT_DOWNLOAD_ERROR ++WEBKIT_JAVASCRIPT_ERROR ++WEBKIT_SNAPSHOT_ERROR ++WEBKIT_USER_CONTENT_FILTER_ERROR ++WebKitNetworkError ++WebKitPluginError ++WebKitPolicyError ++WebKitDownloadError ++WebKitJavascriptError ++WebKitSnapshotError ++WebKitUserContentFilterError ++webkit_network_error_quark ++webkit_plugin_error_quark ++webkit_policy_error_quark ++webkit_download_error_quark ++webkit_javascript_error_quark ++webkit_snapshot_error_quark ++webkit_user_content_filter_error_quark ++
++ ++
++WebKitFaviconDatabase ++WebKitFaviconDatabase ++WEBKIT_FAVICON_DATABASE_ERROR ++WebKitFaviconDatabaseError ++webkit_favicon_database_get_favicon_uri ++webkit_favicon_database_clear ++ ++ ++WebKitFaviconDatabaseClass ++WEBKIT_TYPE_FAVICON_DATABASE ++WEBKIT_FAVICON_DATABASE ++WEBKIT_IS_FAVICON_DATABASE ++WEBKIT_FAVICON_DATABASE_CLASS ++WEBKIT_IS_FAVICON_DATABASE_CLASS ++WEBKIT_FAVICON_DATABASE_GET_CLASS ++ ++ ++WebKitFaviconDatabasePrivate ++webkit_favicon_database_get_type ++webkit_favicon_database_error_quark ++
++ ++
++WebKitFileChooserRequest ++WebKitFileChooserRequest ++webkit_file_chooser_request_get_mime_types ++webkit_file_chooser_request_get_select_multiple ++webkit_file_chooser_request_select_files ++webkit_file_chooser_request_get_selected_files ++webkit_file_chooser_request_cancel ++ ++ ++WebKitFileChooserRequestClass ++WEBKIT_TYPE_FILE_CHOOSER_REQUEST ++WEBKIT_FILE_CHOOSER_REQUEST ++WEBKIT_IS_FILE_CHOOSER_REQUEST ++WEBKIT_FILE_CHOOSER_REQUEST_CLASS ++WEBKIT_IS_FILE_CHOOSER_REQUEST_CLASS ++WEBKIT_FILE_CHOOSER_REQUEST_GET_CLASS ++ ++ ++WebKitFileChooserRequestPrivate ++webkit_file_chooser_request_get_type ++
++ ++
++WebKitFindController ++WebKitFindController ++WebKitFindOptions ++webkit_find_controller_search ++webkit_find_controller_search_finish ++webkit_find_controller_search_next ++webkit_find_controller_search_previous ++webkit_find_controller_get_search_text ++webkit_find_controller_count_matches ++webkit_find_controller_get_options ++webkit_find_controller_get_max_match_count ++webkit_find_controller_get_web_view ++ ++ ++WebKitFindControllerClass ++WEBKIT_TYPE_FIND_CONTROLLER ++WEBKIT_FIND_CONTROLLER ++WEBKIT_IS_FIND_CONTROLLER ++WEBKIT_FIND_CONTROLLER_CLASS ++WEBKIT_IS_FIND_CONTROLLER_CLASS ++WEBKIT_FIND_CONTROLLER_GET_CLASS ++ ++ ++WebKitFindControllerPrivate ++webkit_find_controller_get_type ++
++ ++
++WebKitCookieManager ++WebKitCookieManager ++WebKitCookiePersistentStorage ++WebKitCookieAcceptPolicy ++webkit_cookie_manager_set_persistent_storage ++webkit_cookie_manager_set_accept_policy ++webkit_cookie_manager_get_accept_policy ++webkit_cookie_manager_get_accept_policy_finish ++webkit_cookie_manager_add_cookie ++webkit_cookie_manager_add_cookie_finish ++webkit_cookie_manager_get_cookies ++webkit_cookie_manager_get_cookies_finish ++webkit_cookie_manager_delete_cookie ++webkit_cookie_manager_delete_cookie_finish ++ ++ ++WebKitCookieManagerClass ++WEBKIT_TYPE_COOKIE_MANAGER ++WEBKIT_COOKIE_MANAGER ++WEBKIT_IS_COOKIE_MANAGER ++WEBKIT_COOKIE_MANAGER_CLASS ++WEBKIT_IS_COOKIE_MANAGER_CLASS ++WEBKIT_COOKIE_MANAGER_GET_CLASS ++ ++ ++WebKitCookieManagerPrivate ++webkit_cookie_manager_get_type ++
++ ++
++WebKitPlugin ++WebKitPlugin ++webkit_plugin_get_name ++webkit_plugin_get_description ++webkit_plugin_get_path ++webkit_plugin_get_mime_info_list ++ ++ ++WebKitMimeInfo ++webkit_mime_info_ref ++webkit_mime_info_unref ++webkit_mime_info_get_mime_type ++webkit_mime_info_get_description ++webkit_mime_info_get_extensions ++ ++ ++WebKitPluginClass ++WEBKIT_TYPE_PLUGIN ++WEBKIT_PLUGIN ++WEBKIT_IS_PLUGIN ++WEBKIT_PLUGIN_CLASS ++WEBKIT_IS_PLUGIN_CLASS ++WEBKIT_PLUGIN_GET_CLASS ++WEBKIT_TYPE_MIME_INFO ++ ++ ++webkit_plugin_get_type ++webkit_mime_info_get_type ++WebKitPluginPrivate ++
++ ++
++WebKitURISchemeRequest ++WebKitURISchemeRequest ++webkit_uri_scheme_request_get_scheme ++webkit_uri_scheme_request_get_uri ++webkit_uri_scheme_request_get_path ++webkit_uri_scheme_request_get_web_view ++webkit_uri_scheme_request_get_http_method ++webkit_uri_scheme_request_get_http_headers ++webkit_uri_scheme_request_finish ++webkit_uri_scheme_request_finish_with_response ++webkit_uri_scheme_request_finish_error ++ ++ ++WebKitURISchemeRequestClass ++WEBKIT_TYPE_URI_SCHEME_REQUEST ++WEBKIT_URI_SCHEME_REQUEST ++WEBKIT_IS_URI_SCHEME_REQUEST ++WEBKIT_URI_SCHEME_REQUEST_CLASS ++WEBKIT_IS_URI_SCHEME_REQUEST_CLASS ++WEBKIT_URI_SCHEME_REQUEST_GET_CLASS ++ ++ ++WebKitURISchemeRequestPrivate ++webkit_uri_scheme_request_get_type ++
++ ++
++WebKitURISchemeResponse ++WebKitURISchemeResponse ++webkit_uri_scheme_response_new ++webkit_uri_scheme_response_set_content_type ++webkit_uri_scheme_response_set_status ++webkit_uri_scheme_response_set_http_headers ++ ++ ++WebKitURISchemeResponseClass ++WEBKIT_TYPE_URI_SCHEME_RESPONSE ++WEBKIT_URI_SCHEME_RESPONSE ++WEBKIT_IS_URI_SCHEME_RESPONSE ++WEBKIT_URI_SCHEME_RESPONSE_CLASS ++WEBKIT_IS_URI_SCHEME_RESPONSE_CLASS ++WEBKIT_URI_SCHEME_RESPONSE_GET_CLASS ++ ++ ++WebKitURISchemeResponsePrivate ++webkit_uri_scheme_response_get_type ++
++ ++
++WebKitVersion ++webkit_get_major_version ++webkit_get_minor_version ++webkit_get_micro_version ++ ++ ++WEBKIT_MAJOR_VERSION ++WEBKIT_MINOR_VERSION ++WEBKIT_MICRO_VERSION ++WEBKIT_CHECK_VERSION ++
++ ++
++WebKitContextMenu ++WebKitContextMenu ++webkit_context_menu_new ++webkit_context_menu_new_with_items ++webkit_context_menu_prepend ++webkit_context_menu_append ++webkit_context_menu_insert ++webkit_context_menu_move_item ++webkit_context_menu_get_items ++webkit_context_menu_get_n_items ++webkit_context_menu_first ++webkit_context_menu_last ++webkit_context_menu_get_item_at_position ++webkit_context_menu_remove ++webkit_context_menu_remove_all ++webkit_context_menu_set_user_data ++webkit_context_menu_get_user_data ++ ++ ++WebKitContextMenuClass ++WEBKIT_TYPE_CONTEXT_MENU ++WEBKIT_CONTEXT_MENU ++WEBKIT_IS_CONTEXT_MENU ++WEBKIT_CONTEXT_MENU_CLASS ++WEBKIT_IS_CONTEXT_MENU_CLASS ++WEBKIT_CONTEXT_MENU_GET_CLASS ++ ++ ++WebKitContextMenuPrivate ++webkit_context_menu_get_type ++
++ ++
++WebKitContextMenuItem ++WebKitContextMenuItem ++WebKitContextMenuAction ++webkit_context_menu_item_new_from_gaction ++webkit_context_menu_item_new_from_stock_action ++webkit_context_menu_item_new_from_stock_action_with_label ++webkit_context_menu_item_new_with_submenu ++webkit_context_menu_item_new_separator ++webkit_context_menu_item_get_gaction ++webkit_context_menu_item_get_stock_action ++webkit_context_menu_item_is_separator ++webkit_context_menu_item_set_submenu ++webkit_context_menu_item_get_submenu ++ ++ ++WebKitContextMenuItemClass ++WEBKIT_TYPE_CONTEXT_MENU_ITEM ++WEBKIT_CONTEXT_MENU_ITEM ++WEBKIT_IS_CONTEXT_MENU_ITEM ++WEBKIT_CONTEXT_MENU_ITEM_CLASS ++WEBKIT_IS_CONTEXT_MENU_ITEM_CLASS ++WEBKIT_CONTEXT_MENU_ITEM_GET_CLASS ++ ++ ++WebKitContextMenuItemPrivate ++webkit_context_menu_item_get_type ++
++ ++
++WebKitOptionMenu ++WebKitOptionMenu ++webkit_option_menu_get_n_items ++webkit_option_menu_get_item ++webkit_option_menu_select_item ++webkit_option_menu_activate_item ++webkit_option_menu_close ++ ++ ++WebKitOptionMenuClass ++WEBKIT_TYPE_OPTION_MENU ++WEBKIT_OPTION_MENU ++WEBKIT_IS_OPTION_MENU ++WEBKIT_OPTION_MENU_CLASS ++WEBKIT_IS_OPTION_MENU_CLASS ++WEBKIT_OPTION_MENU_GET_CLASS ++ ++ ++WebKitOptionMenuPrivate ++webkit_option_menu_get_type ++
++ ++
++WebKitOptionMenuItem ++WebKitOptionMenuItem ++webkit_option_menu_item_copy ++webkit_option_menu_item_free ++webkit_option_menu_item_get_label ++webkit_option_menu_item_get_tooltip ++webkit_option_menu_item_is_group_label ++webkit_option_menu_item_is_group_child ++webkit_option_menu_item_is_enabled ++webkit_option_menu_item_is_selected ++ ++ ++WEBKIT_TYPE_OPTION_MENU_ITEM ++ ++ ++webkit_option_menu_item_get_type ++
++ ++
++WebKitFormSubmissionRequest ++WebKitFormSubmissionRequest ++webkit_form_submission_request_list_text_fields ++webkit_form_submission_request_submit ++ ++ ++WebKitFormSubmissionRequestClass ++WEBKIT_TYPE_FORM_SUBMISSION_REQUEST ++WEBKIT_FORM_SUBMISSION_REQUEST ++WEBKIT_IS_FORM_SUBMISSION_REQUEST ++WEBKIT_FORM_SUBMISSION_REQUEST_CLASS ++WEBKIT_IS_FORM_SUBMISSION_REQUEST_CLASS ++WEBKIT_FORM_SUBMISSION_REQUEST_GET_CLASS ++ ++ ++WebKitFormSubmissionRequestPrivate ++webkit_form_submission_request_get_type ++
++ ++
++WebKitSecurityManager ++WebKitSecurityManager ++webkit_security_manager_register_uri_scheme_as_local ++webkit_security_manager_uri_scheme_is_local ++webkit_security_manager_register_uri_scheme_as_no_access ++webkit_security_manager_uri_scheme_is_no_access ++webkit_security_manager_register_uri_scheme_as_display_isolated ++webkit_security_manager_uri_scheme_is_display_isolated ++webkit_security_manager_register_uri_scheme_as_secure ++webkit_security_manager_uri_scheme_is_secure ++webkit_security_manager_register_uri_scheme_as_cors_enabled ++webkit_security_manager_uri_scheme_is_cors_enabled ++webkit_security_manager_register_uri_scheme_as_empty_document ++webkit_security_manager_uri_scheme_is_empty_document ++ ++ ++WebKitSecurityManagerClass ++WEBKIT_TYPE_SECURITY_MANAGER ++WEBKIT_SECURITY_MANAGER ++WEBKIT_IS_SECURITY_MANAGER ++WEBKIT_SECURITY_MANAGER_CLASS ++WEBKIT_IS_SECURITY_MANAGER_CLASS ++WEBKIT_SECURITY_MANAGER_GET_CLASS ++ ++ ++WebKitSecurityManagerPrivate ++webkit_security_manager_get_type ++
++ ++
++WebKitSecurityOrigin ++WebKitSecurityOrigin ++webkit_security_origin_new ++webkit_security_origin_new_for_uri ++webkit_security_origin_ref ++webkit_security_origin_unref ++webkit_security_origin_get_protocol ++webkit_security_origin_get_host ++webkit_security_origin_get_port ++webkit_security_origin_is_opaque ++webkit_security_origin_to_string ++ ++ ++WEBKIT_TYPE_SECURITY_ORIGIN ++ ++ ++webkit_security_origin_get_type ++
++ ++
++WebKitWebsiteDataManager ++WebKitWebsiteDataManager ++WebKitTLSErrorsPolicy ++webkit_website_data_manager_new ++webkit_website_data_manager_new_ephemeral ++webkit_website_data_manager_is_ephemeral ++webkit_website_data_manager_get_base_data_directory ++webkit_website_data_manager_get_base_cache_directory ++webkit_website_data_manager_get_local_storage_directory ++webkit_website_data_manager_get_disk_cache_directory ++webkit_website_data_manager_get_offline_application_cache_directory ++webkit_website_data_manager_get_indexeddb_directory ++webkit_website_data_manager_get_websql_directory ++webkit_website_data_manager_get_hsts_cache_directory ++webkit_website_data_manager_get_itp_directory ++webkit_website_data_manager_get_service_worker_registrations_directory ++webkit_website_data_manager_get_dom_cache_directory ++webkit_website_data_manager_get_cookie_manager ++webkit_website_data_manager_set_itp_enabled ++webkit_website_data_manager_get_itp_enabled ++webkit_website_data_manager_set_persistent_credential_storage_enabled ++webkit_website_data_manager_get_persistent_credential_storage_enabled ++webkit_website_data_manager_set_tls_errors_policy ++webkit_website_data_manager_get_tls_errors_policy ++webkit_website_data_manager_set_network_proxy_settings ++webkit_website_data_manager_fetch ++webkit_website_data_manager_fetch_finish ++webkit_website_data_manager_remove ++webkit_website_data_manager_remove_finish ++webkit_website_data_manager_clear ++webkit_website_data_manager_clear_finish ++webkit_website_data_manager_set_memory_pressure_settings ++ ++ ++WebKitITPFirstParty ++webkit_itp_first_party_ref ++webkit_itp_first_party_unref ++webkit_itp_first_party_get_domain ++webkit_itp_first_party_get_website_data_access_allowed ++webkit_itp_first_party_get_last_update_time ++ ++WebKitITPThirdParty ++webkit_itp_third_party_ref ++webkit_itp_third_party_unref ++webkit_itp_third_party_get_domain ++webkit_itp_third_party_get_first_parties ++ ++webkit_website_data_manager_get_itp_summary ++webkit_website_data_manager_get_itp_summary_finish ++ ++ ++WebKitWebsiteDataManagerClass ++WEBKIT_TYPE_WEBSITE_DATA_MANAGER ++WEBKIT_WEBSITE_DATA_MANAGER ++WEBKIT_IS_WEBSITE_DATA_MANAGER ++WEBKIT_WEBSITE_DATA_MANAGER_CLASS ++WEBKIT_IS_WEBSITE_DATA_MANAGER_CLASS ++WEBKIT_WEBSITE_DATA_MANAGER_GET_CLASS ++WEBKIT_TYPE_ITP_FIRST_PARTY ++WEBKIT_TYPE_ITP_THIRD_PARTY ++ ++ ++WebKitWebsiteDataManagerPrivate ++webkit_website_data_manager_get_type ++webkit_itp_first_party_get_type ++webkit_itp_third_party_get_type ++
++ ++
++WebKitWebsiteData ++WebKitWebsiteData ++WebKitWebsiteDataTypes ++webkit_website_data_ref ++webkit_website_data_unref ++webkit_website_data_get_name ++webkit_website_data_get_types ++webkit_website_data_get_size ++ ++ ++WEBKIT_TYPE_WEBSITE_DATA ++ ++ ++webkit_website_data_get_type ++
++ ++
++WebKitNetworkProxySettings ++WebKitNetworkProxySettings ++WebKitNetworkProxyMode ++webkit_network_proxy_settings_new ++webkit_network_proxy_settings_copy ++webkit_network_proxy_settings_free ++webkit_network_proxy_settings_add_proxy_for_scheme ++ ++ ++webkit_network_proxy_settings_get_type ++ ++ ++WEBKIT_TYPE_NETWORK_NETWORK_PROXY_SETTINGS ++
++ ++
++WebKitAutomationSession ++WebKitAutomationSession ++WebKitAutomationBrowsingContextPresentation ++webkit_automation_session_get_id ++webkit_automation_session_set_application_info ++webkit_automation_session_get_application_info ++ ++ ++WebKitAutomationSessionPrivate ++webkit_automation_session_get_type ++ ++ ++WebKitAutomationSessionClass ++WEBKIT_TYPE_AUTOMATION_SESSION ++WEBKIT_AUTOMATION_SESSION ++WEBKIT_IS_AUTOMATION_SESSION ++WEBKIT_AUTOMATION_SESSION_CLASS ++WEBKIT_IS_AUTOMATION_SESSION_CLASS ++WEBKIT_AUTOMATION_SESSION_GET_CLASS ++
++ ++
++WebKitApplicationInfo ++WebKitApplicationInfo ++webkit_application_info_new ++webkit_application_info_ref ++webkit_application_info_unref ++webkit_application_info_set_name ++webkit_application_info_get_name ++webkit_application_info_set_version ++webkit_application_info_get_version ++ ++ ++webkit_application_info_get_type ++ ++ ++WEBKIT_TYPE_APPLICATION_INFO ++
++ ++
++WebKitGeolocationManager ++WebKitGeolocationManager ++webkit_geolocation_manager_update_position ++webkit_geolocation_manager_failed ++webkit_geolocation_manager_get_enable_high_accuracy ++ ++ ++WebKitGeolocationPosition ++webkit_geolocation_position_new ++webkit_geolocation_position_copy ++webkit_geolocation_position_free ++webkit_geolocation_position_set_timestamp ++webkit_geolocation_position_set_altitude ++webkit_geolocation_position_set_altitude_accuracy ++webkit_geolocation_position_set_heading ++webkit_geolocation_position_set_speed ++ ++ ++WebKitGeolocationManagerPrivate ++webkit_geolocation_manager_get_type ++webkit_geolocation_position_get_type ++ ++ ++WebKitGeolocationManagerClass ++WEBKIT_TYPE_GEOLOCATION_MANAGER ++WEBKIT_GEOLOCATION_MANAGER ++WEBKIT_IS_GEOLOCATION_MANAGER ++WEBKIT_GEOLOCATION_MANAGER_CLASS ++WEBKIT_IS_GEOLOCATION_MANAGER_CLASS ++WEBKIT_GEOLOCATION_MANAGER_GET_CLASS ++WEBKIT_TYPE_GEOLOCATION_POSITION ++
++ ++
++WebKitInputMethodContext ++WebKitInputMethodContext ++WebKitInputPurpose ++WebKitInputHints ++webkit_input_method_context_set_enable_preedit ++webkit_input_method_context_get_preedit ++webkit_input_method_context_filter_key_event ++webkit_input_method_context_notify_focus_in ++webkit_input_method_context_notify_focus_out ++webkit_input_method_context_notify_cursor_area ++webkit_input_method_context_notify_surrounding ++webkit_input_method_context_reset ++webkit_input_method_context_get_input_purpose ++webkit_input_method_context_set_input_purpose ++webkit_input_method_context_get_input_hints ++webkit_input_method_context_set_input_hints ++ ++ ++WebKitInputMethodUnderline ++webkit_input_method_underline_new ++webkit_input_method_underline_copy ++webkit_input_method_underline_free ++webkit_input_method_underline_set_color ++ ++ ++WebKitInputMethodContextPrivate ++webkit_input_method_context_get_type ++webkit_input_method_underline_get_type ++ ++ ++WebKitInputMethodContextClass ++WEBKIT_TYPE_INPUT_METHOD_CONTEXT ++WEBKIT_INPUT_METHOD_CONTEXT ++WEBKIT_INPUT_METHOD_CONTEXT_CLASS ++WEBKIT_IS_INPUT_METHOD_CONTEXT ++WEBKIT_IS_INPUT_METHOD_CONTEXT_CLASS ++WEBKIT_INPUT_METHOD_CONTEXT_GET_CLASS ++WEBKIT_TYPE_INPUT_METHOD_UNDERLINE ++
++ ++
++WebKitURIUtilities ++webkit_uri_for_display ++
++ ++
++WebKitWebsitePolicies ++WebKitWebsitePolicies ++webkit_website_policies_new ++webkit_website_policies_new_with_policies ++webkit_website_policies_get_autoplay_policy ++ ++ ++WebKitWebsitePoliciesClass ++WEBKIT_IS_WEBSITE_POLICIES ++WEBKIT_IS_WEBSITE_POLICIES_CLASS ++WEBKIT_TYPE_WEBSITE_POLICIES ++WEBKIT_WEBSITE_POLICIES ++WEBKIT_WEBSITE_POLICIES_CLASS ++WEBKIT_WEBSITE_POLICIES_GET_CLASS ++ ++ ++WebKitWebsitePoliciesPrivate ++webkit_website_policies_get_type ++
++ ++
++WebKitMemoryPressureSettings ++WebKitMemoryPressureSettings ++webkit_memory_pressure_settings_new ++webkit_memory_pressure_settings_copy ++webkit_memory_pressure_settings_free ++webkit_memory_pressure_settings_set_memory_limit ++webkit_memory_pressure_settings_get_memory_limit ++webkit_memory_pressure_settings_set_conservative_threshold ++webkit_memory_pressure_settings_get_conservative_threshold ++webkit_memory_pressure_settings_set_strict_threshold ++webkit_memory_pressure_settings_get_strict_threshold ++webkit_memory_pressure_settings_set_kill_threshold ++webkit_memory_pressure_settings_get_kill_threshold ++webkit_memory_pressure_settings_set_poll_interval ++webkit_memory_pressure_settings_get_poll_interval ++ ++ ++webkit_memory_pressure_settings_get_type ++ ++ ++WEBKIT_TYPE_MEMORY_PRESSURE_SETTINGS ++
diff --git a/Source/WebKit/UIProcess/API/wpe/webkit.h b/Source/WebKit/UIProcess/API/wpe/webkit.h index c2221efc00618c2ec4d20a88c59840767bd52ff5..71f1cd7e07c705a7c830ff5c4f7d7f981bb363f2 100644 --- a/Source/WebKit/UIProcess/API/wpe/webkit.h @@ -12319,7 +13981,7 @@ index 8a95a3f8036bb0c664954c23ba3ecf72058ae711..dd10e28e2499cd84be2d072dc7567050 namespace WebKit { diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h -index c02db482965c5e8d3fc40d90869c9e8f80ad301e..ce046a3949e2b3fe6a106af133b3dbc25a81a276 100644 +index 20b08ac2df75f589bbbe29e2f924c92f33cf2242..2aaa37a18eb31ade4ff8d7fb8b85fee612bb47f1 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h @@ -95,6 +95,7 @@ private: @@ -12330,7 +13992,7 @@ index c02db482965c5e8d3fc40d90869c9e8f80ad301e..ce046a3949e2b3fe6a106af133b3dbc2 void presentStorageAccessConfirmDialog(const WTF::String& requestingDomain, const WTF::String& currentDomain, CompletionHandler&&); void requestStorageAccessConfirm(WebPageProxy&, WebFrameProxy*, const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, CompletionHandler&&) final; void decidePolicyForGeolocationPermissionRequest(WebPageProxy&, WebFrameProxy&, const FrameInfoData&, Function&) final; -@@ -196,6 +197,7 @@ private: +@@ -198,6 +199,7 @@ private: bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler : 1; @@ -12339,7 +14001,7 @@ index c02db482965c5e8d3fc40d90869c9e8f80ad301e..ce046a3949e2b3fe6a106af133b3dbc2 bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm -index 7659b1c9ff0d2f9bc50aee7ed437a759bf6e9200..2c75e4b0fae4584136cf4d649945864f077ec4cd 100644 +index f39e16cb046646a6fe37ed3e66de682ae1bac2ad..e9c9c0f5d9fa7e35d7c6ff5341ea0e6dfe7ff78f 100644 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm @@ -111,6 +111,7 @@ void UIDelegate::setDelegate(id delegate) @@ -12350,7 +14012,7 @@ index 7659b1c9ff0d2f9bc50aee7ed437a759bf6e9200..2c75e4b0fae4584136cf4d649945864f m_delegateMethods.webViewRequestStorageAccessPanelUnderFirstPartyCompletionHandler = [delegate respondsToSelector:@selector(_webView:requestStorageAccessPanelForDomain:underCurrentDomain:completionHandler:)]; m_delegateMethods.webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(_webView:runBeforeUnloadConfirmPanelWithMessage:initiatedByFrame:completionHandler:)]; m_delegateMethods.webViewRequestGeolocationPermissionForOriginDecisionHandler = [delegate respondsToSelector:@selector(_webView:requestGeolocationPermissionForOrigin:initiatedByFrame:decisionHandler:)]; -@@ -410,6 +411,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St +@@ -411,6 +412,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St }).get()]; } @@ -12367,7 +14029,7 @@ index 7659b1c9ff0d2f9bc50aee7ed437a759bf6e9200..2c75e4b0fae4584136cf4d649945864f { if (!m_uiDelegate) diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm -index f1eca4a61151f47c867659a07e35881305c9d1f8..c724d993648b9ea4a0809626fea4b4a746482a4b 100644 +index 8c9baa508554d465b2f4d5e29b3a5da021f9c462..4639ffc9e65003eb1329a65aa33feef3111f9b9c 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm @@ -37,6 +37,7 @@ @@ -12424,7 +14086,7 @@ index f1eca4a61151f47c867659a07e35881305c9d1f8..c724d993648b9ea4a0809626fea4b4a7 + if (!m_overrideDragPasteboardName.isEmpty()) { + NSPasteboard *pasteboard = [NSPasteboard pasteboardWithUniqueName]; + [pasteboard releaseGlobally]; -+ m_overrideDragPasteboardName = ""; ++ m_overrideDragPasteboardName = ""_s; + } +} + @@ -12438,7 +14100,7 @@ index f1eca4a61151f47c867659a07e35881305c9d1f8..c724d993648b9ea4a0809626fea4b4a7 + } + send(Messages::WebPage::SetDragPasteboardName(m_overrideDragPasteboardName)); + } else { -+ send(Messages::WebPage::SetDragPasteboardName("")); ++ send(Messages::WebPage::SetDragPasteboardName(""_s)); + } +} + @@ -12446,10 +14108,10 @@ index f1eca4a61151f47c867659a07e35881305c9d1f8..c724d993648b9ea4a0809626fea4b4a7 #if PLATFORM(IOS_FAMILY) diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -index e1dd9f512ff33ae735a9ca4f5e99ce8aa2306a60..37a680d738e7d9948dee34e6ecb10fb1adf50a78 100644 +index f0c556d1e59feefc963f1405c634bb1204efbfa3..937773e18277a203e46e8b5c73866765da07683f 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm -@@ -398,7 +398,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process +@@ -376,7 +376,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process auto screenProperties = WebCore::collectScreenProperties(); parameters.screenProperties = WTFMove(screenProperties); #if PLATFORM(MAC) @@ -12458,7 +14120,7 @@ index e1dd9f512ff33ae735a9ca4f5e99ce8aa2306a60..37a680d738e7d9948dee34e6ecb10fb1 #endif #if PLATFORM(IOS) -@@ -699,8 +699,8 @@ void WebProcessPool::registerNotificationObservers() +@@ -677,8 +677,8 @@ void WebProcessPool::registerNotificationObservers() }]; m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) { @@ -12470,10 +14132,10 @@ index e1dd9f512ff33ae735a9ca4f5e99ce8aa2306a60..37a680d738e7d9948dee34e6ecb10fb1 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 2cb199cdbef3c32403811e5f5f7f8d461bfca1ba..8fe14fd79c3d70b1448965bfd4439b026797c87f 100644 +index 9faca6d95cdb198961558ffedf2e2ad8e805e08d..9eedff0802bbc01bc14be458df16ae5257c50a49 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h -@@ -504,6 +504,9 @@ public: +@@ -508,6 +508,9 @@ public: void provideDataForPasteboard(NSPasteboard *, NSString *type); NSArray *namesOfPromisedFilesDroppedAtDestination(NSURL *dropDestination); @@ -12484,10 +14146,10 @@ index 2cb199cdbef3c32403811e5f5f7f8d461bfca1ba..8fe14fd79c3d70b1448965bfd4439b02 void saveBackForwardSnapshotForCurrentItem(); void saveBackForwardSnapshotForItem(WebBackForwardListItem&); diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -index 47e9dca500b106401edcbdfcbea820b35be96542..5b9381d38a94b43135aca3ef943050d85471df59 100644 +index 066b8b05573bac600d4df41004e622f00fff932c..ce7611ac99b94843107d0e4c424a0ec18b1c1648 100644 --- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm +++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm -@@ -2682,6 +2682,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() +@@ -2776,6 +2776,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace() if (!m_colorSpace) m_colorSpace = [NSColorSpace sRGBColorSpace]; } @@ -12499,7 +14161,7 @@ index 47e9dca500b106401edcbdfcbea820b35be96542..5b9381d38a94b43135aca3ef943050d8 ASSERT(m_colorSpace); return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] }; -@@ -4683,6 +4688,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu +@@ -4777,6 +4782,18 @@ static RetainPtr takeWindowSnapshot(CGSWindowID windowID, bool captu return adoptCF(CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions)); } @@ -13499,7 +15161,7 @@ index 0000000000000000000000000000000000000000..d28dde452275f18739e3b1c8d709185c +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..a3eebdc92962a46a4861e75cd9a7f931722748ff +index 0000000000000000000000000000000000000000..489fb9a4a98de71526a6c3d6746e8b7192bac9b8 --- /dev/null +++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp @@ -0,0 +1,379 @@ @@ -13771,7 +15433,7 @@ index 0000000000000000000000000000000000000000..a3eebdc92962a46a4861e75cd9a7f931 +{ + vpx_codec_iface_t* codec_interface = vpx_codec_vp8_cx(); + if (!codec_interface) { -+ errorString = "Codec not found."; ++ errorString = "Codec not found."_s; + return nullptr; + } + @@ -14918,7 +16580,7 @@ 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..3979cd916a8a2821fa5ee5fe018a7ffc9d8cb2e1 +index 0000000000000000000000000000000000000000..21e45c0dc3ea7b42879f5771bec577d0d9811274 --- /dev/null +++ b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp @@ -0,0 +1,974 @@ @@ -15114,25 +16776,25 @@ index 0000000000000000000000000000000000000000..3979cd916a8a2821fa5ee5fe018a7ffc + if (features.height) + result->addItem("height=" + String::number(*features.height)); + if (features.menuBarVisible) -+ result->addItem("menubar"); ++ result->addItem("menubar"_s); + if (features.toolBarVisible) -+ result->addItem("toolbar"); ++ result->addItem("toolbar"_s); + if (features.statusBarVisible) -+ result->addItem("status"); ++ result->addItem("status"_s); + if (features.locationBarVisible) -+ result->addItem("location"); ++ result->addItem("location"_s); + if (features.scrollbarsVisible) -+ result->addItem("scrollbars"); ++ result->addItem("scrollbars"_s); + if (features.resizable) -+ result->addItem("resizable"); ++ result->addItem("resizable"_s); + if (features.fullscreen) -+ result->addItem("fullscreen"); ++ result->addItem("fullscreen"_s); + if (features.dialog) -+ result->addItem("dialog"); ++ result->addItem("dialog"_s); + if (features.noopener) -+ result->addItem("noopener"); ++ result->addItem("noopener"_s); + if (features.noreferrer) -+ result->addItem("noreferrer"); ++ result->addItem("noreferrer"_s); + for (const auto& additionalFeature : features.additionalFeatures) + result->addItem(additionalFeature); + return result; @@ -15476,7 +17138,7 @@ index 0000000000000000000000000000000000000000..3979cd916a8a2821fa5ee5fe018a7ffc + + m_defaultContext->dataStore->syncLocalStorage([this, callback = WTFMove(callback)] () { + if (m_client == nullptr) { -+ callback("no platform delegate to close browser"); ++ callback("no platform delegate to close browser"_s); + } else { + m_client->closeBrowser(); + callback(String()); @@ -15545,7 +17207,7 @@ index 0000000000000000000000000000000000000000..3979cd916a8a2821fa5ee5fe018a7ffc + +WebFrameProxy* InspectorPlaywrightAgent::frameForID(const String& frameID, String& error) +{ -+ size_t dotPos = frameID.find("."); ++ size_t dotPos = frameID.find("."_s); + if (dotPos == notFound) { + error = "Invalid frame id"_s; + return nullptr; @@ -15700,26 +17362,26 @@ index 0000000000000000000000000000000000000000..3979cd916a8a2821fa5ee5fe018a7ffc + } + + WebCore::Cookie cookie; -+ cookie.name = obj->getString("name"); -+ cookie.value = obj->getString("value"); -+ cookie.domain = obj->getString("domain"); -+ cookie.path = obj->getString("path"); ++ cookie.name = obj->getString("name"_s); ++ cookie.value = obj->getString("value"_s); ++ cookie.domain = obj->getString("domain"_s); ++ cookie.path = obj->getString("path"_s); + if (!cookie.name || !cookie.value || !cookie.domain || !cookie.path) { + callback->sendFailure("Invalid file payload format"_s); + return; + } + -+ std::optional expires = obj->getDouble("expires"); ++ std::optional expires = obj->getDouble("expires"_s); + if (expires && *expires != -1) + cookie.expires = *expires; -+ if (std::optional value = obj->getBoolean("httpOnly")) ++ if (std::optional value = obj->getBoolean("httpOnly"_s)) + cookie.httpOnly = *value; -+ if (std::optional value = obj->getBoolean("secure")) ++ if (std::optional value = obj->getBoolean("secure"_s)) + cookie.secure = *value; -+ if (std::optional value = obj->getBoolean("session")) ++ if (std::optional value = obj->getBoolean("session"_s)) + cookie.session = *value; + String sameSite; -+ if (obj->getString("sameSite", sameSite)) { ++ if (obj->getString("sameSite"_s, sameSite)) { + if (sameSite == "None") + cookie.sameSite = WebCore::Cookie::SameSitePolicy::None; + if (sameSite == "Lax") @@ -15812,10 +17474,10 @@ index 0000000000000000000000000000000000000000..3979cd916a8a2821fa5ee5fe018a7ffc + return makeUnexpected("Internal error: geolocation manager is not available."_s); + + if (geolocation) { -+ std::optional timestamp = geolocation->getDouble("timestamp"); -+ std::optional latitude = geolocation->getDouble("latitude"); -+ std::optional longitude = geolocation->getDouble("longitude"); -+ std::optional accuracy = geolocation->getDouble("accuracy"); ++ std::optional timestamp = geolocation->getDouble("timestamp"_s); ++ std::optional latitude = geolocation->getDouble("latitude"_s); ++ std::optional longitude = geolocation->getDouble("longitude"_s); ++ std::optional accuracy = geolocation->getDouble("accuracy"_s); + if (!timestamp || !latitude || !longitude || !accuracy) + return makeUnexpected("Invalid geolocation format"_s); + @@ -16121,7 +17783,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 88e28fdf08e288e3ba2fd749f389d357006a5d03..d5b0dd2d971b4ee800cc41e6c5716861cbcdaa62 100644 +index d9c0f8b85de7452f8e6ea0a82c07a59562e12812..76e21a3090d98170e9e4ab77d5ba196c1942a2b8 100644 --- a/Source/WebKit/UIProcess/PageClient.h +++ b/Source/WebKit/UIProcess/PageClient.h @@ -325,6 +325,11 @@ public: @@ -16728,7 +18390,7 @@ index 0000000000000000000000000000000000000000..b3bb4880a866ee6132b8b26acf8dad81 +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..a4dd654b36b2765acd18cf3bc3b1805bc65272c6 +index 0000000000000000000000000000000000000000..45863acc2a61155bdc6db48110a7b196920b73db --- /dev/null +++ b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp @@ -0,0 +1,329 @@ @@ -16783,7 +18445,7 @@ index 0000000000000000000000000000000000000000..a4dd654b36b2765acd18cf3bc3b1805b + ~CallbackList() + { + for (const auto& callback : m_callbacks) -+ callback->sendFailure("Page closed"); ++ callback->sendFailure("Page closed"_s); + } + + void append(Ref&& callback) @@ -16857,23 +18519,23 @@ index 0000000000000000000000000000000000000000..a4dd654b36b2765acd18cf3bc3b1805b + if (key.length() == 1) + return makeString("U+", hex(toASCIIUpper(key.characterAt(0)), 4)); + if (key == "Delete") -+ return "U+007F"; ++ return "U+007F"_s; + if (key == "Backspace") -+ return "U+0008"; ++ return "U+0008"_s; + if (key == "ArrowUp") -+ return "Up"; ++ return "Up"_s; + if (key == "ArrowDown") -+ return "Down"; ++ return "Down"_s; + if (key == "ArrowLeft") -+ return "Left"; ++ return "Left"_s; + if (key == "ArrowRight") -+ return "Right"; ++ return "Right"_s; + if (key == "Tab") -+ return "U+0009"; ++ return "U+0009"_s; + if (key == "Pause") -+ return "Pause"; ++ return "Pause"_s; + if (key == "ScrollLock") -+ return "Scroll"; ++ return "Scroll"_s; + return key; +} + @@ -16885,7 +18547,7 @@ index 0000000000000000000000000000000000000000..a4dd654b36b2765acd18cf3bc3b1805b + } else if (type == "keyUp") { + eventType = WebKit::WebEvent::KeyUp; + } else { -+ callback->sendFailure("Unsupported event type."); ++ callback->sendFailure("Unsupported event type."_s); + return; + } + OptionSet eventModifiers; @@ -16902,7 +18564,7 @@ index 0000000000000000000000000000000000000000..a4dd654b36b2765acd18cf3bc3b1805b + for (const auto& value : *commands) { + String command; + if (!value->asString(command)) { -+ callback->sendFailure("Command must be string"); ++ callback->sendFailure("Command must be string"_s); + return; + } + eventCommands.append(command); @@ -16956,7 +18618,7 @@ index 0000000000000000000000000000000000000000..a4dd654b36b2765acd18cf3bc3b1805b + else if (type == "move") + eventType = WebEvent::MouseMove; + else { -+ callback->sendFailure("Unsupported event type"); ++ callback->sendFailure("Unsupported event type"_s); + return; + } + @@ -16975,7 +18637,7 @@ index 0000000000000000000000000000000000000000..a4dd654b36b2765acd18cf3bc3b1805b + else if (button == "none") + eventButton = WebMouseEvent::NoButton; + else { -+ callback->sendFailure("Unsupported eventButton"); ++ callback->sendFailure("Unsupported eventButton"_s); + return; + } + } @@ -17154,7 +18816,7 @@ index 0000000000000000000000000000000000000000..48c9ccc420c1b4ae3259e1d5ba17fd8f + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp -index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1ad682bddb 100644 +index 9073696a25dc9e915b325d7d6c39df3291e3f9e3..39e01e0bad1fa5a3d572ab68fed6cb0af94bd42f 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -248,6 +248,9 @@ @@ -17178,7 +18840,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a } void WebPageProxy::addAllMessageReceivers() -@@ -1027,6 +1034,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) +@@ -1040,6 +1047,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason) m_pageLoadState.didSwapWebProcesses(); if (reason != ProcessLaunchReason::InitialProcess) m_drawingArea->waitForBackingStoreUpdateOnNextPaint(); @@ -17186,7 +18848,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a } void WebPageProxy::didAttachToRunningProcess() -@@ -1380,6 +1388,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() +@@ -1393,6 +1401,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess() return m_process; } @@ -17208,7 +18870,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a RefPtr WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData) { if (m_isClosed) -@@ -1931,6 +1954,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) +@@ -1944,6 +1967,31 @@ void WebPageProxy::setControlledByAutomation(bool controlled) websiteDataStore().networkProcess().send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0); } @@ -17240,7 +18902,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type) { MESSAGE_CHECK(m_process, !targetId.isEmpty()); -@@ -2121,6 +2169,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd +@@ -2134,6 +2182,25 @@ void WebPageProxy::updateActivityState(OptionSet flagsToUpd { bool wasVisible = isViewVisible(); m_activityState.remove(flagsToUpdate); @@ -17266,7 +18928,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a if (flagsToUpdate & ActivityState::IsFocused && pageClient().isViewFocused()) m_activityState.add(ActivityState::IsFocused); if (flagsToUpdate & ActivityState::WindowIsActive && pageClient().isViewWindowActive()) -@@ -2704,6 +2771,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2717,6 +2784,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag { if (!hasRunningProcess()) return; @@ -17275,7 +18937,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a #if PLATFORM(GTK) UNUSED_PARAM(dragStorageName); UNUSED_PARAM(sandboxExtensionHandle); -@@ -2714,6 +2783,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag +@@ -2727,6 +2796,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag m_process->assumeReadAccessToBaseURL(*this, url); ASSERT(dragData.platformData()); @@ -17284,7 +18946,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a send(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags())); #else send(Messages::WebPage::PerformDragControllerAction(action, dragData, sandboxExtensionHandle, sandboxExtensionsForUpload)); -@@ -2729,18 +2800,41 @@ void WebPageProxy::didPerformDragControllerAction(std::optional dragOperationMask) { if (!hasRunningProcess()) -@@ -2749,6 +2843,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo +@@ -2762,6 +2856,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo setDragCaretRect({ }); } @@ -17354,7 +19016,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a void WebPageProxy::didPerformDragOperation(bool handled) { pageClient().didPerformDragOperation(handled); -@@ -2761,8 +2873,18 @@ void WebPageProxy::didStartDrag() +@@ -2774,8 +2886,18 @@ void WebPageProxy::didStartDrag() discardQueuedMouseEvents(); send(Messages::WebPage::DidStartDrag()); @@ -17374,7 +19036,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a void WebPageProxy::dragCancelled() { if (hasRunningProcess()) -@@ -2867,16 +2989,38 @@ void WebPageProxy::processNextQueuedMouseEvent() +@@ -2880,16 +3002,38 @@ void WebPageProxy::processNextQueuedMouseEvent() m_process->startResponsivenessTimer(); } @@ -17410,7 +19072,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a + SandboxExtension::Handle sandboxExtensionHandle; + Vector sandboxExtensionsForUpload; + -+ performDragOperation(dragData, "", WTFMove(sandboxExtensionHandle), WTFMove(sandboxExtensionsForUpload)); ++ performDragOperation(dragData, ""_s, WTFMove(sandboxExtensionHandle), WTFMove(sandboxExtensionsForUpload)); + } + m_dragSelectionData = std::nullopt; + dragEnded(event.position(), event.globalPosition(), m_dragSourceOperationMask); @@ -17420,7 +19082,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a } void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function&& action) -@@ -3040,7 +3184,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) +@@ -3053,7 +3197,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b) void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent) { @@ -17429,7 +19091,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a const EventNames& names = eventNames(); for (auto& touchPoint : touchStartEvent.touchPoints()) { IntPoint location = touchPoint.location(); -@@ -3073,7 +3217,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent +@@ -3086,7 +3230,7 @@ void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent m_touchAndPointerEventTracking.touchStartTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchMoveTracking = TrackingType::Synchronous; m_touchAndPointerEventTracking.touchEndTracking = TrackingType::Synchronous; @@ -17438,7 +19100,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a } TrackingType WebPageProxy::touchEventTrackingType(const WebTouchEvent& touchStartEvent) const -@@ -3462,6 +3606,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3475,6 +3619,8 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A policyAction = PolicyAction::Download; if (policyAction != PolicyAction::Use || !frame.isMainFrame() || !navigation) { @@ -17447,7 +19109,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a receivedPolicyDecision(policyAction, navigation, navigation->websitePolicies(), WTFMove(navigationAction), WTFMove(sender)); return; } -@@ -3532,6 +3678,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A +@@ -3545,6 +3691,7 @@ void WebPageProxy::receivedNavigationPolicyDecision(PolicyAction policyAction, A void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr&& websitePolicies, std::variant, Ref>&& navigationActionOrResponse, Ref&& sender, WillContinueLoadInNewProcess willContinueLoadInNewProcess, std::optional sandboxExtensionHandle) { @@ -17455,7 +19117,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a if (!hasRunningProcess()) { sender->send(PolicyDecision { sender->identifier(), isNavigatingToAppBoundDomain(), PolicyAction::Ignore, 0, std::nullopt, std::nullopt }); return; -@@ -4267,6 +4414,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) +@@ -4319,6 +4466,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor) m_pageScaleFactor = scaleFactor; } @@ -17467,7 +19129,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor) { m_pluginScaleFactor = pluginScaleFactor; -@@ -4651,6 +4803,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) +@@ -4708,6 +4860,7 @@ void WebPageProxy::didDestroyNavigation(uint64_t navigationID) return; m_navigationState->didDestroyNavigation(navigationID); @@ -17475,7 +19137,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a } void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData) -@@ -4876,6 +5029,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p +@@ -4933,6 +5086,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref&& p m_failingProvisionalLoadURL = { }; @@ -17484,7 +19146,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a // 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; -@@ -5349,7 +5504,14 @@ void WebPageProxy::decidePolicyForNavigationActionAsync(FrameIdentifier frameID, +@@ -5411,7 +5566,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) { @@ -17500,7 +19162,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a } void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref&& process, PageIdentifier webPageID, FrameIdentifier frameID, FrameInfoData&& frameInfo, -@@ -5936,6 +6098,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -5998,6 +6160,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa if (originatingPage) openerAppInitiatedState = originatingPage->lastNavigationWasAppInitiated(); @@ -17508,7 +19170,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a 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); -@@ -5982,6 +6145,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa +@@ -6044,6 +6207,7 @@ void WebPageProxy::createNewPage(FrameInfoData&& originatingFrameInfoData, WebPa void WebPageProxy::showPage() { m_uiClient->showPage(this); @@ -17516,7 +19178,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a } void WebPageProxy::exitFullscreenImmediately() -@@ -6039,6 +6203,10 @@ void WebPageProxy::closePage() +@@ -6101,6 +6265,10 @@ void WebPageProxy::closePage() if (isClosed()) return; @@ -17527,7 +19189,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:"); pageClient().clearAllEditCommands(); m_uiClient->close(this); -@@ -6075,6 +6243,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f +@@ -6137,6 +6305,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 { @@ -17536,7 +19198,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable { reply(); completion(); -@@ -6096,6 +6266,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& +@@ -6158,6 +6328,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17545,7 +19207,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a 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 { -@@ -6119,6 +6291,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& +@@ -6181,6 +6353,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& if (auto* automationSession = process().processPool().automationSession()) automationSession->willShowJavaScriptDialog(*this); } @@ -17554,7 +19216,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a 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 { -@@ -6246,6 +6420,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf +@@ -6308,6 +6482,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf return; } } @@ -17563,7 +19225,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer. m_process->stopResponsivenessTimer(); -@@ -7497,6 +7673,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7578,6 +7754,8 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (auto* automationSession = process().processPool().automationSession()) automationSession->mouseEventsFlushedForPage(*this); didFinishProcessingAllPendingMouseEvents(); @@ -17572,7 +19234,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a } break; } -@@ -7511,10 +7689,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7592,10 +7770,13 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) pageClient().wheelEventWasNotHandledByWebCore(oldestProcessedEvent); } @@ -17589,7 +19251,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a break; } -@@ -7523,7 +7704,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7604,7 +7785,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()); @@ -17597,7 +19259,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a MESSAGE_CHECK(m_process, !m_keyEventQueue.isEmpty()); auto event = m_keyEventQueue.takeFirst(); MESSAGE_CHECK(m_process, type == event.type()); -@@ -7542,7 +7722,6 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7623,7 +7803,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); @@ -17605,7 +19267,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a pageClient().doneWithKeyEvent(event, handled); if (!handled) m_uiClient->didNotHandleKeyEvent(this, event); -@@ -7551,6 +7730,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) +@@ -7632,6 +7811,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled) if (!canProcessMoreKeyEvents) { if (auto* automationSession = process().processPool().automationSession()) automationSession->keyboardEventsFlushedForPage(*this); @@ -17613,7 +19275,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a } break; } -@@ -7905,7 +8085,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) +@@ -7986,7 +8166,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason) { WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%{public}s", processTerminationReasonToString(reason)); @@ -17625,7 +19287,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a if (m_loaderClient) handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this); else -@@ -8237,6 +8420,7 @@ static Span gpuMachServices() +@@ -8318,6 +8501,7 @@ static Span gpuMachServices() WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr&& websitePolicies) { @@ -17633,7 +19295,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a WebPageCreationParameters parameters; parameters.processDisplayName = configuration().processDisplayName(); -@@ -8427,6 +8611,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc +@@ -8510,6 +8694,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false; @@ -17642,7 +19304,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a #if PLATFORM(IOS) // FIXME: This is also being passed over the to WebProcess via the PreferencesStore. parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload(); -@@ -8495,6 +8681,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even +@@ -8578,6 +8764,14 @@ void WebPageProxy::gamepadActivity(const Vector& gamepadDatas, Even void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS) { @@ -17657,16 +19319,16 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) { m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) { if (shouldAllowLegacyTLS) -@@ -8588,6 +8782,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge +@@ -8671,6 +8865,15 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge request->deny(); }; + auto securityOrigin = frameInfo.securityOrigin.securityOrigin(); + auto permissions = m_permissionsForAutomation.find(securityOrigin->toString()); + if (permissions == m_permissionsForAutomation.end()) -+ permissions = m_permissionsForAutomation.find("*"); ++ permissions = m_permissionsForAutomation.find("*"_s); + if (permissions != m_permissionsForAutomation.end()) { -+ completionHandler(permissions->value.contains("geolocation")); ++ completionHandler(permissions->value.contains("geolocation"_s)); + return; + } + @@ -17674,7 +19336,7 @@ index 98fa570efb16ab3fbab94e0459f5d8a4d6b9c7f5..8f255b3cbf3cbf2b74784cdd3d89af1a // 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 e1626c22598649b786eeac899cdf2767e9ef3fb7..235a2dccdc2c865f57151114769263aa3e299b4e 100644 +index ad77bb68bf4cb619ce05d08bb8daa40b0801ba1e..79cf97e24132f4490cf616a29eddfadb73866d5f 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -17728,7 +19390,7 @@ index e1626c22598649b786eeac899cdf2767e9ef3fb7..235a2dccdc2c865f57151114769263aa class SharedBuffer; class SpeechRecognitionRequest; class TextIndicator; -@@ -546,6 +558,8 @@ public: +@@ -547,6 +559,8 @@ public: void setControlledByAutomation(bool); WebPageInspectorController& inspectorController() { return *m_inspectorController; } @@ -17737,7 +19399,7 @@ index e1626c22598649b786eeac899cdf2767e9ef3fb7..235a2dccdc2c865f57151114769263aa #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -652,6 +666,11 @@ public: +@@ -653,6 +667,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -17749,7 +19411,7 @@ index e1626c22598649b786eeac899cdf2767e9ef3fb7..235a2dccdc2c865f57151114769263aa void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -679,6 +698,7 @@ public: +@@ -680,6 +699,7 @@ public: void closePage(); void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&); @@ -17757,7 +19419,7 @@ index e1626c22598649b786eeac899cdf2767e9ef3fb7..235a2dccdc2c865f57151114769263aa RefPtr loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemesButNotAppLinks, API::Object* userData = nullptr); RefPtr loadFile(const String& fileURL, const String& resourceDirectoryURL, bool isAppInitiated = true, API::Object* userData = nullptr); RefPtr loadData(const IPC::DataReference&, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr, WebCore::ShouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow); -@@ -1202,6 +1222,7 @@ public: +@@ -1206,6 +1226,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17765,7 +19427,7 @@ index e1626c22598649b786eeac899cdf2767e9ef3fb7..235a2dccdc2c865f57151114769263aa void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1288,14 +1309,20 @@ public: +@@ -1293,14 +1314,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17787,7 +19449,7 @@ index e1626c22598649b786eeac899cdf2767e9ef3fb7..235a2dccdc2c865f57151114769263aa #endif void processDidBecomeUnresponsive(); -@@ -1544,6 +1571,8 @@ public: +@@ -1552,6 +1579,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17796,7 +19458,7 @@ index e1626c22598649b786eeac899cdf2767e9ef3fb7..235a2dccdc2c865f57151114769263aa #endif #if ENABLE(WEB_CRYPTO) -@@ -2693,6 +2722,7 @@ private: +@@ -2713,6 +2742,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17804,7 +19466,7 @@ index e1626c22598649b786eeac899cdf2767e9ef3fb7..235a2dccdc2c865f57151114769263aa #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -2957,6 +2987,20 @@ private: +@@ -2981,6 +3011,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17825,7 +19487,7 @@ index e1626c22598649b786eeac899cdf2767e9ef3fb7..235a2dccdc2c865f57151114769263aa #endif PageLoadState m_pageLoadState; -@@ -3167,6 +3211,9 @@ private: +@@ -3190,6 +3234,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -17836,7 +19498,7 @@ index e1626c22598649b786eeac899cdf2767e9ef3fb7..235a2dccdc2c865f57151114769263aa #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 febde09fbfed91166df288479006a68ea7c07cc9..ca6eaf7c3247130167babd79e4d62b6434a737e8 100644 +index c303bb32184697976b1a15915d03cea76152ab05..de7bb33ba3fc1ca2bab43189cfdf867f5b5e5b39 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in @@ -29,6 +29,7 @@ messages -> WebPageProxy { @@ -17847,7 +19509,7 @@ index febde09fbfed91166df288479006a68ea7c07cc9..ca6eaf7c3247130167babd79e4d62b64 #if ENABLE(WEBGL) WebGLPolicyForURL(URL url) -> (enum:uint8_t WebCore::WebGLLoadPolicy loadPolicy) Synchronous -@@ -174,6 +175,7 @@ messages -> WebPageProxy { +@@ -175,6 +176,7 @@ messages -> WebPageProxy { #endif PageScaleFactorDidChange(double scaleFactor) @@ -17855,7 +19517,7 @@ index febde09fbfed91166df288479006a68ea7c07cc9..ca6eaf7c3247130167babd79e4d62b64 PluginScaleFactorDidChange(double zoomFactor) PluginZoomFactorDidChange(double zoomFactor) -@@ -302,10 +304,12 @@ messages -> WebPageProxy { +@@ -303,10 +305,12 @@ messages -> WebPageProxy { StartDrag(struct WebCore::DragItem dragItem, WebKit::ShareableBitmap::Handle dragImage) SetPromisedDataForImage(String pasteboardName, WebKit::SharedMemory::IPCHandle imageHandle, String filename, String extension, String title, String url, String visibleURL, WebKit::SharedMemory::IPCHandle archiveHandle, String originIdentifier) #endif @@ -17871,10 +19533,10 @@ index febde09fbfed91166df288479006a68ea7c07cc9..ca6eaf7c3247130167babd79e4d62b64 DidPerformDragOperation(bool handled) #endif diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp -index 4bd12a1e791a8975f08968ddc9ecde1389001325..f7e08e36d65aa4baea4e5151718104b4a6645795 100644 +index 1b2b851e9724ac50fe398f904fb3ec57ae509a05..b5136bb39098f374bac975163cd2d5d06c24758b 100644 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp -@@ -539,6 +539,14 @@ void WebProcessPool::establishRemoteWorkerContextConnectionToNetworkProcess(Remo +@@ -547,6 +547,14 @@ void WebProcessPool::establishRemoteWorkerContextConnectionToNetworkProcess(Remo RefPtr requestingProcess = requestingProcessIdentifier ? WebProcessProxy::processForIdentifier(*requestingProcessIdentifier) : nullptr; WebProcessPool* processPool = requestingProcess ? &requestingProcess->processPool() : processPools()[0]; @@ -17889,7 +19551,7 @@ index 4bd12a1e791a8975f08968ddc9ecde1389001325..f7e08e36d65aa4baea4e5151718104b4 ASSERT(processPool); WebProcessProxy* remoteWorkerProcessProxy { nullptr }; -@@ -817,8 +825,12 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa +@@ -842,8 +850,12 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa #endif parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel(); @@ -17905,7 +19567,7 @@ index 4bd12a1e791a8975f08968ddc9ecde1389001325..f7e08e36d65aa4baea4e5151718104b4 parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument); parameters.urlSchemesRegisteredAsSecure = copyToVector(LegacyGlobalSettings::singleton().schemesToRegisterAsSecure()); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp -index 3ef75c27f295eb6b2864308225bf2865e5085149..a23282604ea92f63f4bd30927b95d576eb4435a6 100644 +index 170450a95ba6e8a49ee5fc81e11b55091bb94b62..e000d5cb27eaf2eb14bdd790efada4e0623c8674 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp @@ -147,6 +147,11 @@ HashMap& WebProcessProxy::allProcesses() @@ -17921,10 +19583,10 @@ index 3ef75c27f295eb6b2864308225bf2865e5085149..a23282604ea92f63f4bd30927b95d576 { return allProcesses().get(identifier); diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h -index bfc7956c02ee5ace2d557343c507537a85cfd4fc..230d21c78633d1bd47c326d66fd92f4afb3d50e1 100644 +index 0555d3d576345bb249610858d69466e49159f1ac..fd5e11b13a7ffd4ebecb11179e4ec864384e0a82 100644 --- a/Source/WebKit/UIProcess/WebProcessProxy.h +++ b/Source/WebKit/UIProcess/WebProcessProxy.h -@@ -145,6 +145,7 @@ public: +@@ -146,6 +146,7 @@ public: ~WebProcessProxy(); static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, const Function&); @@ -17933,21 +19595,11 @@ index bfc7956c02ee5ace2d557343c507537a85cfd4fc..230d21c78633d1bd47c326d66fd92f4a WebConnection* webConnection() const { return m_webConnection.get(); } diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -index 50c9352b669c5869c7748c399ba21c8b7d590a13..48e26325d5a6165fd0a175d74eae04ea99cb6ee3 100644 +index b700c999e4b0eadd517226561d8d310fadd0b5c0..d07fe92acd396b2d026671e632cf1d19f6a18536 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp -@@ -150,7 +150,8 @@ WebsiteDataStore::~WebsiteDataStore() - - ASSERT(allDataStores().get(m_sessionID) == this); - allDataStores().remove(m_sessionID); -- networkProcess().removeSession(*this); -+ if (m_networkProcess) -+ m_networkProcess->removeSession(*this); - #if ENABLE(GPU_PROCESS) - if (auto* gpuProcessProxy = GPUProcessProxy::singletonIfCreated()) - gpuProcessProxy->removeSession(m_sessionID); -@@ -1988,6 +1989,17 @@ void WebsiteDataStore::renameOriginInWebsiteData(URL&& oldName, URL&& newName, O - networkProcess().renameOriginInWebsiteData(m_sessionID, oldName, newName, dataTypes, WTFMove(completionHandler)); +@@ -2027,6 +2027,17 @@ void WebsiteDataStore::originDirectoryForTesting(URL&& origin, URL&& topOrigin, + networkProcess().websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), WTFMove(topOrigin), type, WTFMove(completionHandler)); } +void WebsiteDataStore::setLanguagesForAutomation(Vector&& languages) @@ -17965,7 +19617,7 @@ index 50c9352b669c5869c7748c399ba21c8b7d590a13..48e26325d5a6165fd0a175d74eae04ea void WebsiteDataStore::hasAppBoundSession(CompletionHandler&& completionHandler) const { diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h -index b129abf3775f5c3a876bffdf332eac1c8e8c24a1..72a8214023987dd5520ee56216284aa9973cd89f 100644 +index d9d62230f905b49adceacebf59eba1aadabb7d8d..742f348bd896bc2a1a69a6bfbb681360707969c0 100644 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h @@ -89,6 +89,7 @@ class SecKeyProxyStore; @@ -17999,7 +19651,7 @@ index b129abf3775f5c3a876bffdf332eac1c8e8c24a1..72a8214023987dd5520ee56216284aa9 class WebsiteDataStore : public API::ObjectImpl, public Identified, public CanMakeWeakPtr { public: static Ref defaultDataStore(); -@@ -288,11 +298,13 @@ public: +@@ -294,11 +304,13 @@ public: const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; } #endif @@ -18014,7 +19666,7 @@ index b129abf3775f5c3a876bffdf332eac1c8e8c24a1..72a8214023987dd5520ee56216284aa9 void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&); const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; } void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType); -@@ -355,6 +367,14 @@ public: +@@ -362,6 +374,14 @@ public: static constexpr uint64_t defaultPerOriginQuota() { return 1000 * MB; } static bool defaultShouldUseCustomStoragePaths(); @@ -18029,7 +19681,7 @@ index b129abf3775f5c3a876bffdf332eac1c8e8c24a1..72a8214023987dd5520ee56216284aa9 void resetQuota(CompletionHandler&&); void clearStorage(CompletionHandler&&); -@@ -443,9 +463,11 @@ private: +@@ -456,9 +476,11 @@ private: WebCore::CurlProxySettings m_proxySettings; #endif @@ -18042,7 +19694,7 @@ index b129abf3775f5c3a876bffdf332eac1c8e8c24a1..72a8214023987dd5520ee56216284aa9 WebCore::SoupNetworkProxySettings m_networkProxySettings; String m_cookiePersistentStoragePath; SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite }; -@@ -473,6 +495,11 @@ private: +@@ -486,6 +508,11 @@ private: RefPtr m_cookieStore; RefPtr m_networkProcess; @@ -18135,7 +19787,7 @@ index b5e48e6c61a8a3f4b40b84112c4010101c4d5f41..46747b1d78bfe0270178609867c0d710 }; diff --git a/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..31a4e32d4cf8442049f0bea04c817a40b801c1f7 +index 0000000000000000000000000000000000000000..37e6a825ecbf941f66013044b2b5fc3a7749c7e4 --- /dev/null +++ b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp @@ -0,0 +1,147 @@ @@ -18221,19 +19873,19 @@ index 0000000000000000000000000000000000000000..31a4e32d4cf8442049f0bea04c817a40 + WebKitWebContext* context = m_idToContext.get(sessionID); + if (!context && !browserContext.dataStore->isPersistent()) { + ASSERT_NOT_REACHED(); -+ error = "Context with provided id not found"; ++ error = "Context with provided id not found"_s; + return nullptr; + } + + RefPtr page = webkitBrowserInspectorCreateNewPageInContext(context); + if (page == nullptr) { -+ error = "Failed to create new page in the context"; ++ error = "Failed to create new page in the context"_s; + return nullptr; + } + + if (context == nullptr && sessionID != page->sessionID()) { + ASSERT_NOT_REACHED(); -+ error = " Failed to create new page in default context"; ++ error = " Failed to create new page in default context"_s; + return nullptr; + } + @@ -18260,7 +19912,7 @@ index 0000000000000000000000000000000000000000..31a4e32d4cf8442049f0bea04c817a40 + GRefPtr data_manager = adoptGRef(webkit_website_data_manager_new_ephemeral()); + GRefPtr context = adoptGRef(WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT, "website-data-manager", data_manager.get(), "process-swap-on-cross-site-navigation-enabled", true, nullptr))); + if (!context) { -+ error = "Failed to create GLib ephemeral context"; ++ error = "Failed to create GLib ephemeral context"_s; + return nullptr; + } + auto browserContext = std::make_unique(); @@ -18426,7 +20078,7 @@ index 054e80bd900cf16d69801e8102ca989ff0563e1d..8245d7ed58008dbb6152e55e619e4331 WebCore::XUniqueDamage m_damage; diff --git a/Source/WebKit/UIProcess/gtk/InspectorTargetProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/InspectorTargetProxyGtk.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..8a86cc348bc210b71bb463dcb3057f575ad7c1d3 +index 0000000000000000000000000000000000000000..f5f811ced4eafef530d101c4e397fe2780ac3071 --- /dev/null +++ b/Source/WebKit/UIProcess/gtk/InspectorTargetProxyGtk.cpp @@ -0,0 +1,44 @@ @@ -18470,7 +20122,7 @@ index 0000000000000000000000000000000000000000..8a86cc348bc210b71bb463dcb3057f57 + if (WebCore::widgetIsOnscreenToplevelWindow(parent)) + gtk_window_present(GTK_WINDOW(parent)); + else -+ error = "The view is not on screen"; ++ error = "The view is not on screen"_s; +} + +} // namespace WebKit @@ -18674,10 +20326,10 @@ index 0000000000000000000000000000000000000000..d0f9827544994e450e24e3f7a427c35e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm -index 8a5403f7ebf070d74bc68d001ea4bc6302c89b01..fca1ed6c6b219e4683a8651d86909a4f5dfa20ab 100644 +index a76a3324913e2c3cf7356df3e06808863e29017c..70b11aeccf98a564e5427def69d385739ef558ab 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) +@@ -440,6 +440,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled) { @@ -18875,7 +20527,7 @@ index 0000000000000000000000000000000000000000..721826c8c98fc85b68a4f45deaee69c1 + +#endif diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h -index 20b314393a8d97220e74bd476d9025b23acf3851..54db7181a6f175161b6fe17510209669afe9d83c 100644 +index 41c7eba887d6f720c9eb2c09e9969be899893d81..7edfe3ece794efb5461cf1778421b1b619baf0bf 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.h +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.h @@ -53,6 +53,8 @@ class PageClientImpl final : public PageClientImplCocoa @@ -18909,7 +20561,7 @@ index 20b314393a8d97220e74bd476d9025b23acf3851..54db7181a6f175161b6fe17510209669 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 27980b07e3fdf55bcbc55566f4be84978dff20f3..f97b0c299a715ddbb3e2c72893c2283cc82b644d 100644 +index de743f26d6d8f9d4693ec74faf64772b5ed93399..b65cbda57aa209821373af45777593d98f247457 100644 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm @@ -81,6 +81,7 @@ @@ -18974,7 +20626,7 @@ index 27980b07e3fdf55bcbc55566f4be84978dff20f3..f97b0c299a715ddbb3e2c72893c2283c } void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newToolTip) -@@ -475,6 +493,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) +@@ -479,6 +497,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled) { @@ -18983,7 +20635,7 @@ index 27980b07e3fdf55bcbc55566f4be84978dff20f3..f97b0c299a715ddbb3e2c72893c2283c m_impl->doneWithKeyEvent(event.nativeEvent(), eventWasHandled); } -@@ -494,6 +514,8 @@ void PageClientImpl::computeHasImageAnalysisResults(const URL& imageURL, Shareab +@@ -498,6 +518,8 @@ void PageClientImpl::computeHasImageAnalysisResults(const URL& imageURL, Shareab RefPtr PageClientImpl::createPopupMenuProxy(WebPageProxy& page) { @@ -18992,7 +20644,7 @@ index 27980b07e3fdf55bcbc55566f4be84978dff20f3..f97b0c299a715ddbb3e2c72893c2283c return WebPopupMenuProxyMac::create(m_view, page); } -@@ -625,6 +647,12 @@ CALayer *PageClientImpl::acceleratedCompositingRootLayer() const +@@ -629,6 +651,12 @@ CALayer *PageClientImpl::acceleratedCompositingRootLayer() const return m_impl->acceleratedCompositingRootLayer(); } @@ -19005,7 +20657,7 @@ index 27980b07e3fdf55bcbc55566f4be84978dff20f3..f97b0c299a715ddbb3e2c72893c2283c RefPtr PageClientImpl::takeViewSnapshot(std::optional&&) { return m_impl->takeViewSnapshot(); -@@ -792,6 +820,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR +@@ -796,6 +824,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR #endif // ENABLE(FULLSCREEN_API) @@ -19019,7 +20671,7 @@ index 27980b07e3fdf55bcbc55566f4be84978dff20f3..f97b0c299a715ddbb3e2c72893c2283c void PageClientImpl::navigationGestureDidBegin() { m_impl->dismissContentRelativeChildWindowsWithAnimation(true); -@@ -969,6 +1004,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c +@@ -973,6 +1008,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event) { @@ -19110,7 +20762,7 @@ index 0000000000000000000000000000000000000000..6113f4cd60a5d72b8ead61176cb43200 +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/mac/WebPageInspectorInputAgentMac.mm b/Source/WebKit/UIProcess/mac/WebPageInspectorInputAgentMac.mm new file mode 100644 -index 0000000000000000000000000000000000000000..cbcc097c924d0a04c5a2265a8027347fe12d0449 +index 0000000000000000000000000000000000000000..104dadb7af05fbf837465614e66c2c0068753b03 --- /dev/null +++ b/Source/WebKit/UIProcess/mac/WebPageInspectorInputAgentMac.mm @@ -0,0 +1,125 @@ @@ -19216,10 +20868,10 @@ index 0000000000000000000000000000000000000000..cbcc097c924d0a04c5a2265a8027347f + Vector macCommands; + for (const String& command : commands) { + m_page.registerKeypressCommandName(command); -+ macCommands.append(WebCore::KeypressCommand(command.utf8().data())); ++ macCommands.append(WebCore::KeypressCommand(command)); + } + if (text.length() > 0 && macCommands.size() == 0) -+ macCommands.append(WebCore::KeypressCommand("insertText:", text)); ++ macCommands.append(WebCore::KeypressCommand("insertText:"_s, text)); + NativeWebKeyboardEvent event( + type, + text, @@ -19999,10 +21651,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd4689692830315eb8 100644 +index fd388d10a3ffa45dc3dd2f0efcf8e8bfe476c3f3..133b69d9d183fd8e4590591cfbde325518a8be57 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1273,6 +1273,7 @@ +@@ -1270,6 +1270,7 @@ 5CABDC8722C40FED001EDE8E /* APIMessageListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CABDC8322C40FA7001EDE8E /* APIMessageListener.h */; }; 5CADDE05215046BD0067D309 /* WKWebProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C74300E21500492004BFA17 /* WKWebProcess.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5CAECB6627465AE400AB78D0 /* UnifiedSource115.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */; }; @@ -20010,7 +21662,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 5CAF7AA726F93AB00003F19E /* adattributiond.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CAF7AA526F93A950003F19E /* adattributiond.cpp */; }; 5CAFDE452130846300B1F7E1 /* _WKInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE422130843500B1F7E1 /* _WKInspector.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE442130843600B1F7E1 /* _WKInspectorInternal.h */; }; -@@ -1972,6 +1973,18 @@ +@@ -2241,6 +2242,18 @@ DF0C5F28252ECB8E00D921DB /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F24252ECB8D00D921DB /* WKDownload.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2A252ECB8E00D921DB /* WKDownloadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; DF0C5F2B252ED44000D921DB /* WKDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */; }; @@ -20029,7 +21681,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; DF84CEE4249AA24D009096F6 /* WKPDFHUDView.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF84CEE2249AA21F009096F6 /* WKPDFHUDView.mm */; }; -@@ -2031,6 +2044,8 @@ +@@ -2300,6 +2313,8 @@ E5BEF6822130C48000F31111 /* WebDataListSuggestionsDropdownIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BEF6802130C47F00F31111 /* WebDataListSuggestionsDropdownIOS.h */; }; E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; }; E5CBA76427A318E100DF7858 /* UnifiedSource120.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA75F27A3187800DF7858 /* UnifiedSource120.cpp */; }; @@ -20038,7 +21690,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 E5CBA76527A318E100DF7858 /* UnifiedSource118.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76127A3187900DF7858 /* UnifiedSource118.cpp */; }; E5CBA76627A318E100DF7858 /* UnifiedSource116.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76327A3187B00DF7858 /* UnifiedSource116.cpp */; }; E5CBA76727A318E100DF7858 /* UnifiedSource119.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76027A3187900DF7858 /* UnifiedSource119.cpp */; }; -@@ -2047,6 +2062,9 @@ +@@ -2316,6 +2331,9 @@ EBA8D3B627A5E33F00CB7900 /* MockPushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B027A5E33F00CB7900 /* MockPushServiceConnection.mm */; }; EBA8D3B727A5E33F00CB7900 /* PushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B127A5E33F00CB7900 /* PushServiceConnection.mm */; }; ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -20048,7 +21700,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; F4299507270E234D0032298B /* StreamMessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = F4299506270E234C0032298B /* StreamMessageReceiver.h */; }; F42D634122A0EFDF00D2FB3A /* WebAutocorrectionData.h in Headers */ = {isa = PBXBuildFile; fileRef = F42D633F22A0EFD300D2FB3A /* WebAutocorrectionData.h */; }; -@@ -5021,6 +5039,7 @@ +@@ -5322,6 +5340,7 @@ 5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMessageListener.h; sourceTree = ""; }; 5CADDE0D2151AA010067D309 /* AuthenticationChallengeDisposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeDisposition.h; sourceTree = ""; }; 5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource115.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource115.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -20056,7 +21708,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 5CAF7AA426F93A750003F19E /* adattributiond */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = adattributiond; sourceTree = BUILT_PRODUCTS_DIR; }; 5CAF7AA526F93A950003F19E /* adattributiond.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = adattributiond.cpp; sourceTree = ""; }; 5CAF7AA626F93AA50003F19E /* adattributiond.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = adattributiond.xcconfig; sourceTree = ""; }; -@@ -6452,6 +6471,19 @@ +@@ -7025,6 +7044,19 @@ DF0C5F24252ECB8D00D921DB /* WKDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownload.h; sourceTree = ""; }; DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadInternal.h; sourceTree = ""; }; DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadDelegate.h; sourceTree = ""; }; @@ -20076,7 +21728,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHTTPCookieStorePrivate.h; sourceTree = ""; }; DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentWorldPrivate.h; sourceTree = ""; }; DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = ""; }; -@@ -6579,6 +6611,8 @@ +@@ -7152,6 +7184,8 @@ E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKFormColorControl.h; path = ios/forms/WKFormColorControl.h; sourceTree = ""; }; E5CB07DB20E1678F0022C183 /* WKFormColorControl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKFormColorControl.mm; path = ios/forms/WKFormColorControl.mm; sourceTree = ""; }; E5CBA75F27A3187800DF7858 /* UnifiedSource120.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource120.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource120.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -20085,7 +21737,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 E5CBA76027A3187900DF7858 /* UnifiedSource119.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource119.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource119.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; E5CBA76127A3187900DF7858 /* UnifiedSource118.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource118.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource118.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; E5CBA76227A3187900DF7858 /* UnifiedSource117.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource117.cpp; path = "DerivedSources/WebKit/unified-sources/UnifiedSource117.cpp"; sourceTree = BUILT_PRODUCTS_DIR; }; -@@ -6600,6 +6634,14 @@ +@@ -7173,6 +7207,14 @@ ECA680D31E6904B500731D20 /* ExtraPrivateSymbolsForTAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtraPrivateSymbolsForTAPI.h; sourceTree = ""; }; ECBFC1DB1E6A4D66000300C7 /* ExtraPublicSymbolsForTAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtraPublicSymbolsForTAPI.h; sourceTree = ""; }; F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = ""; }; @@ -20100,7 +21752,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDragDestinationAction.h; sourceTree = ""; }; F40D1B68220BDC0F00B49A01 /* WebAutocorrectionContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebAutocorrectionContext.h; path = ios/WebAutocorrectionContext.h; sourceTree = ""; }; F41056612130699A0092281D /* APIAttachmentCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = APIAttachmentCocoa.mm; sourceTree = ""; }; -@@ -6746,6 +6788,7 @@ +@@ -7319,6 +7361,7 @@ 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, @@ -20108,7 +21760,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 ); runOnlyForDeploymentPostprocessing = 0; }; -@@ -8852,6 +8895,7 @@ +@@ -9414,6 +9457,7 @@ 37C4C08318149C2A003688B9 /* Cocoa */ = { isa = PBXGroup; children = ( @@ -20116,7 +21768,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 1A43E826188F38E2009E4D30 /* Deprecated */, 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -10045,6 +10089,7 @@ +@@ -10608,6 +10652,7 @@ E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */, DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */, 57A9FF15252C6AEF006A2040 /* libWTF.a */, @@ -20124,7 +21776,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, 51F7BB7E274564A100C45A72 /* Security.framework */, -@@ -10563,6 +10608,12 @@ +@@ -11128,6 +11173,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -20137,7 +21789,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 ); path = Agents; sourceTree = ""; -@@ -10571,6 +10622,7 @@ +@@ -11136,6 +11187,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -20145,7 +21797,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -11117,6 +11169,12 @@ +@@ -11682,6 +11734,12 @@ BC032DC310F438260058C15A /* UIProcess */ = { isa = PBXGroup; children = ( @@ -20158,7 +21810,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 BC032DC410F4387C0058C15A /* API */, 512F588D12A8836F00629530 /* Authentication */, 9955A6E81C79809000EB6A93 /* Automation */, -@@ -11428,6 +11486,7 @@ +@@ -11993,6 +12051,7 @@ BC0C376610F807660076D7CB /* C */ = { isa = PBXGroup; children = ( @@ -20166,7 +21818,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 5123CF18133D25E60056F800 /* cg */, 6EE849C41368D9040038D481 /* mac */, BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -12018,6 +12077,11 @@ +@@ -12583,6 +12642,11 @@ BCCF085C113F3B7500C650C5 /* mac */ = { isa = PBXGroup; children = ( @@ -20178,7 +21830,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 B878B613133428DC006888E9 /* CorrectionPanel.h */, B878B614133428DC006888E9 /* CorrectionPanel.mm */, 07EF07592745A8160066EA04 /* DisplayCaptureSessionManager.h */, -@@ -12942,6 +13006,7 @@ +@@ -13798,6 +13862,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -20186,7 +21838,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -13257,6 +13322,7 @@ +@@ -14258,6 +14323,7 @@ 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, @@ -20194,7 +21846,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -13272,6 +13338,7 @@ +@@ -14273,6 +14339,7 @@ 410F0D4C2701EFF900F96DFC /* GPUProcessConnectionInitializationParameters.h in Headers */, 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, @@ -20202,7 +21854,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -13426,6 +13493,7 @@ +@@ -14428,6 +14495,7 @@ 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, @@ -20210,7 +21862,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -13491,6 +13559,7 @@ +@@ -14494,6 +14562,7 @@ BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */, 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, @@ -20218,7 +21870,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, 517B5F81275E97B6002DC22D /* PushAppBundle.h in Headers */, -@@ -13521,6 +13590,7 @@ +@@ -14524,6 +14593,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -20226,7 +21878,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -13860,6 +13930,7 @@ +@@ -14948,6 +15018,7 @@ A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, @@ -20234,7 +21886,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -14003,6 +14074,7 @@ +@@ -15129,6 +15200,7 @@ BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, @@ -20242,7 +21894,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -14056,6 +14128,7 @@ +@@ -15183,6 +15255,7 @@ 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, @@ -20250,7 +21902,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -14212,6 +14285,7 @@ +@@ -15340,6 +15413,7 @@ 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, @@ -20258,7 +21910,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -15883,6 +15957,8 @@ +@@ -16956,6 +17030,8 @@ 51E9049727BCB3D900929E7E /* ICAppBundle.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -20267,7 +21919,7 @@ index 73ded958227ae5cabbcafb01f9669829851598eb..16a4eaea56507a262566aecd46896928 C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -16223,6 +16299,8 @@ +@@ -17296,6 +17372,8 @@ E3816B3D27E2463A005EAFC0 /* WebMockContentFilterManager.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20465,7 +22117,7 @@ index e00c722c2be5d505243d45f46001839d4eb8a977..33c0832cde6c292230397a13e70d90fb auto permissionHandlers = m_requestsPerOrigin.take(securityOrigin); diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp -index 3e1c90505feb96057c48fc7d10e441a0b553b1c9..ad159899e3b5a8a88ad933ca7984538e71deb361 100644 +index ec83bcae7dce003bc95f0b849b75a244aa5b29a2..8bc6c3aec3eb93549b502948ce6b15b445dd54ae 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp @@ -417,6 +417,8 @@ void WebChromeClient::setResizable(bool resizable) @@ -20477,7 +22129,7 @@ index 3e1c90505feb96057c48fc7d10e441a0b553b1c9..ad159899e3b5a8a88ad933ca7984538e // Notify the bundle client. m_page.injectedBundleUIClient().willAddMessageToConsole(&m_page, source, level, message, lineNumber, columnNumber, sourceID); } -@@ -842,6 +844,13 @@ std::unique_ptr WebChromeClient::createDateTimeChooser(DateTime +@@ -847,6 +849,13 @@ std::unique_ptr WebChromeClient::createDateTimeChooser(DateTime #endif @@ -20519,10 +22171,10 @@ index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..c46393209cb4f80704bbc9268fad4371 { } diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -index f6f2d4a20758013dd06d2c96d832ec5c0461d319..1ee4a060ee714a38a3417e4974002fee1176ea38 100644 +index 70efcd24f3da2b3e83b44077628d62601fa7be45..7ef1e3643215f59ab4f02639e7b7d0947c5c2571 100644 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp -@@ -1582,13 +1582,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() +@@ -1598,13 +1598,6 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage() if (webPage->scrollPinningBehavior() != DoNotPin) view->setScrollPinningBehavior(webPage->scrollPinningBehavior()); @@ -20899,11 +22551,11 @@ index f127d64d005ab7b93875591b94a5899205e91579..df0de26e4dc449a0fbf93e7037444df4 uint64_t m_navigationID; }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c3496795f98f381 100644 +index a2e1c13150527a2e01650712b49de7ee91e6950c..09c9193bf2ac53f208dd0eee5da1b365f68c16fd 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp -@@ -905,6 +905,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) - } +@@ -920,6 +920,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters) + CFPreferencesGetAppIntegerValue(CFSTR("key"), CFSTR("com.apple.WebKit.WebContent.BlockIOKitInWebContentSandbox"), nullptr); #endif + if (parameters.shouldPauseInInspectorWhenShown) @@ -20912,7 +22564,7 @@ index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c349679 updateThrottleState(); } -@@ -1670,6 +1673,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet +@@ -1685,6 +1688,22 @@ void WebPage::platformDidReceiveLoadParameters(const LoadParameters& loadParamet } #endif @@ -20935,7 +22587,7 @@ index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c349679 void WebPage::loadRequest(LoadParameters&& loadParameters) { WEBPAGE_RELEASE_LOG(Loading, "loadRequest: navigationID=%" PRIu64 ", shouldTreatAsContinuingLoad=%u, lastNavigationWasAppInitiated=%d, existingNetworkResourceLoadIdentifierToResume=%" PRIu64, loadParameters.navigationID, static_cast(loadParameters.shouldTreatAsContinuingLoad), loadParameters.request.isAppInitiated(), valueOrDefault(loadParameters.existingNetworkResourceLoadIdentifierToResume).toUInt64()); -@@ -1942,17 +1961,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) +@@ -1957,17 +1976,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize) view->resize(viewSize); m_drawingArea->setNeedsDisplay(); @@ -20954,7 +22606,7 @@ index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c349679 // Viewport properties have no impact on zero sized fixed viewports. if (m_viewSize.isEmpty()) -@@ -1969,20 +1984,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -1984,20 +1999,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize); @@ -20982,7 +22634,7 @@ index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c349679 #if USE(COORDINATED_GRAPHICS) m_drawingArea->didChangeViewportAttributes(WTFMove(attr)); -@@ -1990,7 +2003,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg +@@ -2005,7 +2018,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg send(Messages::WebPageProxy::DidChangeViewportProperties(attr)); #endif } @@ -20990,7 +22642,7 @@ index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c349679 void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset) { -@@ -2282,6 +2294,7 @@ void WebPage::scaleView(double scale) +@@ -2297,6 +2309,7 @@ void WebPage::scaleView(double scale) } m_page->setViewScaleFactor(scale); @@ -20998,7 +22650,7 @@ index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c349679 scalePage(pageScale, scrollPositionAtNewScale); } -@@ -2386,17 +2399,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum +@@ -2476,17 +2489,13 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum viewportConfigurationChanged(); #endif @@ -21017,7 +22669,7 @@ index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c349679 } void WebPage::listenForLayoutMilestones(OptionSet milestones) -@@ -3309,6 +3318,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) +@@ -3399,6 +3408,104 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent) send(Messages::WebPageProxy::DidReceiveEvent(static_cast(touchEvent.type()), handled)); } @@ -21122,7 +22774,7 @@ index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c349679 #endif void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint) -@@ -3385,6 +3492,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m +@@ -3475,6 +3582,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m m_inspectorTargetController->sendMessageToTargetBackend(targetId, message); } @@ -21134,7 +22786,7 @@ index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c349679 void WebPage::insertNewlineInQuotedContent() { Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame(); -@@ -3629,6 +3741,7 @@ void WebPage::didCompletePageTransition() +@@ -3719,6 +3831,7 @@ void WebPage::didCompletePageTransition() void WebPage::show() { send(Messages::WebPageProxy::ShowPage()); @@ -21142,7 +22794,7 @@ index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c349679 } void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension) -@@ -4467,7 +4580,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana +@@ -4588,7 +4701,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana #if ENABLE(DRAG_SUPPORT) @@ -21151,7 +22803,7 @@ index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c349679 void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet draggingSourceOperationMask, SelectionData&& selectionData, OptionSet flags) { if (!m_page) { -@@ -6893,6 +7006,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe +@@ -6985,6 +7098,9 @@ Ref WebPage::createDocumentLoader(Frame& frame, const ResourceRe WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader); m_pendingWebsitePolicies = std::nullopt; } @@ -21162,7 +22814,7 @@ index 0aa7fa4d465732d834a9ad257a5153d1bb0d8b67..c3c37e4436b70186add985490c349679 return documentLoader; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h -index ed2e98f1195a2771cfbe036d473046d418d8a645..7cca76de1b75bcc6e86ba9e319f75deb889c40da 100644 +index 1ee74f4d9237ea089c289fc114a609738c35925c..498f0070f18b9a8b48ade95681f67e228f88542e 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h @@ -117,6 +117,10 @@ @@ -21176,7 +22828,7 @@ index ed2e98f1195a2771cfbe036d473046d418d8a645..7cca76de1b75bcc6e86ba9e319f75deb #if PLATFORM(GTK) || PLATFORM(WPE) #include "InputMethodState.h" #endif -@@ -1003,11 +1007,11 @@ public: +@@ -1009,11 +1013,11 @@ public: void clearSelection(); void restoreSelectionInFocusedEditableElement(); @@ -21190,7 +22842,7 @@ index ed2e98f1195a2771cfbe036d473046d418d8a645..7cca76de1b75bcc6e86ba9e319f75deb void performDragControllerAction(DragControllerAction, const WebCore::DragData&, SandboxExtension::Handle&&, Vector&&); #endif -@@ -1021,6 +1025,9 @@ public: +@@ -1027,6 +1031,9 @@ public: void didStartDrag(); void dragCancelled(); OptionSet allowedDragSourceActions() const { return m_allowedDragSourceActions; } @@ -21200,7 +22852,7 @@ index ed2e98f1195a2771cfbe036d473046d418d8a645..7cca76de1b75bcc6e86ba9e319f75deb #endif void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&); -@@ -1257,6 +1264,7 @@ public: +@@ -1261,6 +1268,7 @@ public: void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType); void disconnectInspector(const String& targetId); void sendMessageToTargetBackend(const String& targetId, const String& message); @@ -21208,7 +22860,7 @@ index ed2e98f1195a2771cfbe036d473046d418d8a645..7cca76de1b75bcc6e86ba9e319f75deb void insertNewlineInQuotedContent(); -@@ -1627,6 +1635,7 @@ private: +@@ -1636,6 +1644,7 @@ private: // Actions void tryClose(CompletionHandler&&); void platformDidReceiveLoadParameters(const LoadParameters&); @@ -21216,7 +22868,7 @@ index ed2e98f1195a2771cfbe036d473046d418d8a645..7cca76de1b75bcc6e86ba9e319f75deb void loadRequest(LoadParameters&&); NO_RETURN void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool); void loadData(LoadParameters&&); -@@ -1664,6 +1673,7 @@ private: +@@ -1673,6 +1682,7 @@ private: void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled); #elif ENABLE(TOUCH_EVENTS) void touchEvent(const WebTouchEvent&); @@ -21224,7 +22876,7 @@ index ed2e98f1195a2771cfbe036d473046d418d8a645..7cca76de1b75bcc6e86ba9e319f75deb #endif void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&); -@@ -1802,9 +1812,7 @@ private: +@@ -1812,9 +1822,7 @@ private: void requestRectForFoundTextRange(const WebFoundTextRange&, CompletionHandler&&); @@ -21234,7 +22886,7 @@ index ed2e98f1195a2771cfbe036d473046d418d8a645..7cca76de1b75bcc6e86ba9e319f75deb void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex); void setTextForActivePopupMenu(int32_t index); -@@ -2339,6 +2347,7 @@ private: +@@ -2351,6 +2359,7 @@ private: UserActivity m_userActivity; uint64_t m_pendingNavigationID { 0 }; @@ -21243,10 +22895,10 @@ index ed2e98f1195a2771cfbe036d473046d418d8a645..7cca76de1b75bcc6e86ba9e319f75deb bool m_mainFrameProgressCompleted { false }; diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -index 97bd2d9860fdab90b164492f8a7d137001fdd700..1e182d158e987f5ad29d7edfd8b08488c8402ec4 100644 +index 2fbdec8b8cc24ea212ba2eac25cc9e3dedae5666..f0ada6d6f61b3bec55fdca7488709a16e6872fff 100644 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in -@@ -144,6 +144,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -142,6 +142,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType ConnectInspector(String targetId, Inspector::FrontendChannel::ConnectionType connectionType) DisconnectInspector(String targetId) SendMessageToTargetBackend(String targetId, String message) @@ -21254,7 +22906,7 @@ index 97bd2d9860fdab90b164492f8a7d137001fdd700..1e182d158e987f5ad29d7edfd8b08488 #if ENABLE(REMOTE_INSPECTOR) SetIndicating(bool indicating); -@@ -155,6 +156,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -153,6 +154,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType #endif #if !ENABLE(IOS_TOUCH_EVENTS) && ENABLE(TOUCH_EVENTS) TouchEvent(WebKit::WebTouchEvent event) @@ -21262,7 +22914,7 @@ index 97bd2d9860fdab90b164492f8a7d137001fdd700..1e182d158e987f5ad29d7edfd8b08488 #endif CancelPointer(WebCore::PointerID pointerId, WebCore::IntPoint documentPoint) -@@ -184,6 +186,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -182,6 +184,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType LoadURLInFrame(URL url, String referrer, WebCore::FrameIdentifier frameID) LoadDataInFrame(IPC::DataReference data, String MIMEType, String encodingName, URL baseURL, WebCore::FrameIdentifier frameID) LoadRequest(struct WebKit::LoadParameters loadParameters) @@ -21270,7 +22922,7 @@ index 97bd2d9860fdab90b164492f8a7d137001fdd700..1e182d158e987f5ad29d7edfd8b08488 LoadRequestWaitingForProcessLaunch(struct WebKit::LoadParameters loadParameters, URL resourceDirectoryURL, WebKit::WebPageProxyIdentifier pageID, bool checkAssumedReadAccessToResourceURL) LoadData(struct WebKit::LoadParameters loadParameters) LoadSimulatedRequestAndResponse(struct WebKit::LoadParameters loadParameters, WebCore::ResourceResponse simulatedResponse) -@@ -342,10 +345,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -346,10 +349,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType AddMIMETypeWithCustomContentProvider(String mimeType) # Drag and drop. @@ -21283,7 +22935,7 @@ index 97bd2d9860fdab90b164492f8a7d137001fdd700..1e182d158e987f5ad29d7edfd8b08488 PerformDragControllerAction(enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, Vector sandboxExtensionsForUpload) #endif #if ENABLE(DRAG_SUPPORT) -@@ -354,6 +357,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType +@@ -358,6 +361,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType DragCancelled() #endif @@ -21337,7 +22989,7 @@ index 1a789f99d89f67f80215fd1661509ce334db1861..8a8e515effd36e277e3390a9cfa82922 } diff --git a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp -index bb512aec34506aa588a736b6dcf6b6f3b669e342..fbcad974ad70113d527f7cac688e47d558a9e18e 100644 +index 76443a94254ae4fe8e58f807baa52156c367d11d..08b2550eb12bce9ac1fb809c520de6babdf7a50f 100644 --- a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp +++ b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp @@ -43,6 +43,7 @@ @@ -21387,7 +23039,7 @@ index bb512aec34506aa588a736b6dcf6b6f3b669e342..fbcad974ad70113d527f7cac688e47d5 } diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp -index 90fbb6dd833eaaa19522a8dcb0628119900e525c..b6bde5586e32a622943dc599415335ba1e6de029 100644 +index 272105032407261021a87c32cdb7bc1285431127..f353ac384ae7ab9326f3df94087e7bcb910110b7 100644 --- a/Source/WebKit/WebProcess/WebProcess.cpp +++ b/Source/WebKit/WebProcess/WebProcess.cpp @@ -92,6 +92,7 @@ @@ -21398,7 +23050,7 @@ index 90fbb6dd833eaaa19522a8dcb0628119900e525c..b6bde5586e32a622943dc599415335ba #include #include #include -@@ -364,6 +365,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter +@@ -368,6 +369,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter platformInitializeProcess(parameters); updateCPULimit(); @@ -21423,7 +23075,7 @@ index 8987c3964a9308f2454759de7f8972215a3ae416..bcac0afeb94ed8123d1f9fb0b932c849 SetProcessDPIAware(); return true; diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -index 877ff287a76c315f1197391d26c04c3eb25e605a..b6c627f9fe8b979528573f03bfa61601c1579792 100644 +index bfd5d09e98adf739ab8f377bcb7e4d54e2e8075f..c3ac49a5a84382d484b9274b599f9d50cc8ecff8 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm @@ -4189,7 +4189,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) @@ -21436,7 +23088,7 @@ index 877ff287a76c315f1197391d26c04c3eb25e605a..b6c627f9fe8b979528573f03bfa61601 - (void)touch:(WebEvent *)event { diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm -index a9c6eba42b3a7e3f704ed52a25741a30cc354c6b..eaf353c7764efddb5d87aede889461bee2d48951 100644 +index f14fa3994f4afabbce5b01b9945752da99a811f9..d583e448422414ecfc0819521db9f0f90da8fdb5 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm @@ -4058,7 +4058,7 @@ IGNORE_WARNINGS_END @@ -21489,7 +23141,7 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d + LIBVPX_LIBRARIES +) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index a6630ec67e3bcca71e8db69c3e6a2a6fa4d76919..86b0cfe667705374d29b34225b1aad170e927a8c 100644 +index d523bea45e7da223d2703249aa4a07db70c3656b..ae587ecd29a787c3eccda2994f82ae41941b9ce2 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -5,6 +5,7 @@ WEBKIT_OPTION_BEGIN() @@ -21531,7 +23183,7 @@ index a6630ec67e3bcca71e8db69c3e6a2a6fa4d76919..86b0cfe667705374d29b34225b1aad17 WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) WEBKIT_OPTION_DEFINE(USE_WPE_RENDERER "Whether to enable WPE rendering" PUBLIC ON) -@@ -119,7 +124,7 @@ endif () +@@ -120,7 +125,7 @@ endif () # without approval from a GTK reviewer. There must be strong reason to support # changing the value of the option. WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON) @@ -21540,7 +23192,7 @@ index a6630ec67e3bcca71e8db69c3e6a2a6fa4d76919..86b0cfe667705374d29b34225b1aad17 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFJS PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON) -@@ -152,10 +157,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON) +@@ -153,10 +158,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYER_BASED_SVG_ENGINE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21553,7 +23205,7 @@ index a6630ec67e3bcca71e8db69c3e6a2a6fa4d76919..86b0cfe667705374d29b34225b1aad17 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) -@@ -163,7 +168,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION P +@@ -164,7 +169,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION P WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21562,7 +23214,7 @@ index a6630ec67e3bcca71e8db69c3e6a2a6fa4d76919..86b0cfe667705374d29b34225b1aad17 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON) -@@ -171,6 +176,15 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) +@@ -172,6 +177,15 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES}) @@ -21578,7 +23230,7 @@ index a6630ec67e3bcca71e8db69c3e6a2a6fa4d76919..86b0cfe667705374d29b34225b1aad17 include(GStreamerDependencies) # Finalize the value for all options. Do not attempt to use an option before -@@ -271,7 +285,8 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") +@@ -272,7 +286,8 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") set(BUILD_REVISION "tarball") endif () @@ -21589,7 +23241,7 @@ index a6630ec67e3bcca71e8db69c3e6a2a6fa4d76919..86b0cfe667705374d29b34225b1aad17 SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1) diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake -index d1fd2f01e8a6924f0c63afe0b789b033b147ca11..80dc2c00b99f2f93520c5e8a608963a015a82f0e 100644 +index 73bb68324ea0f949e3043698b603d0c3b7b3ccd5..41eb3ac554d05d09994cc325629b107b2ff4ba66 100644 --- a/Source/cmake/OptionsWPE.cmake +++ b/Source/cmake/OptionsWPE.cmake @@ -3,6 +3,7 @@ include(VersioningUtils) @@ -21613,7 +23265,7 @@ index d1fd2f01e8a6924f0c63afe0b789b033b147ca11..80dc2c00b99f2f93520c5e8a608963a0 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON) -@@ -68,23 +69,41 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${EN +@@ -68,24 +69,42 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${EN WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON) WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON) @@ -21644,7 +23296,8 @@ index d1fd2f01e8a6924f0c63afe0b789b033b147ca11..80dc2c00b99f2f93520c5e8a608963a0 # Public options specific to the WPE port. Do not add any options here unless # there is a strong reason we should support changing the value of the option, # and the option is not relevant to any other WebKit ports. - WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF) + WEBKIT_OPTION_DEFINE(ENABLE_DOCUMENTATION "Whether to generate documentation." PUBLIC ON) + WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON) WEBKIT_OPTION_DEFINE(ENABLE_JOURNALD_LOG "Whether to enable journald logging" PUBLIC ON) -WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC ${ENABLE_DEVELOPER_MODE}) +WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC OFF) @@ -21660,7 +23313,7 @@ index d1fd2f01e8a6924f0c63afe0b789b033b147ca11..80dc2c00b99f2f93520c5e8a608963a0 WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON) # Private options specific to the WPE port. -@@ -278,7 +297,7 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") +@@ -290,7 +309,7 @@ if (NOT EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py") endif () SET_AND_EXPOSE_TO_BUILD(HAVE_ACCESSIBILITY ${ENABLE_ACCESSIBILITY}) @@ -23485,10 +25138,10 @@ index 4f3640a8b93897d69604ee8ba38cd07561720ad2..00b657a8a585d104afc346dc1126fb71 InjectedBundle/wpe/InjectedBundleWPE.cpp InjectedBundle/wpe/TestRunnerWPE.cpp diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp -index a01cea42771ae0aba9d893736445859e1b1a992d..2ca4c7d886b2c32859fc688d8f9eb0b621328c5f 100644 +index 46aff08139489032aaaf002ec638b669a0218b3c..49563910a054f52e19c3b8a7bdc02fef43bafd36 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp -@@ -859,6 +859,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) +@@ -871,6 +871,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options) 0, // requestStorageAccessConfirm shouldAllowDeviceOrientationAndMotionAccess, runWebAuthenticationPanel, @@ -23497,7 +25150,7 @@ index a01cea42771ae0aba9d893736445859e1b1a992d..2ca4c7d886b2c32859fc688d8f9eb0b6 decidePolicyForMediaKeySystemPermissionRequest, nullptr, // requestWebAuthenticationNoGesture diff --git a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm -index 72f80f8c702458e517fcf1ba204c2ba74d14d9df..2f110c5d51ec2959534162d055ae1adc3ad4164c 100644 +index 3a231b168583cfc378fb67ff42b108c747dd0733..2b0971a411f87be622cf53536f107a446a6d659f 100644 --- a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm +++ b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm @@ -896,4 +896,51 @@ void EventSenderProxy::scaleGestureEnd(double scale)