From 1c3c97cb714ddcff28a36af3a8e58826e1c8e6fd Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Mon, 13 Jun 2022 10:24:44 +0800 Subject: [PATCH] browser(webkit): rebase to 06/12/22 (r295478) --- browser_patches/webkit/BUILD_NUMBER | 4 +- browser_patches/webkit/UPSTREAM_CONFIG.sh | 2 +- .../Playwright.xcodeproj/project.pbxproj | 10 +- .../embedder/Playwright/win/Playwright.rc | 152 ++-- .../embedder/Playwright/win/PlaywrightLib.rc | 708 +++++++++--------- browser_patches/webkit/patches/bootstrap.diff | 578 ++++++++------ 6 files changed, 777 insertions(+), 677 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index bbad90cc1b7609..651f454f58c5b4 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1664 -Changed: lushnikov@chromium.org Fri Jun 10 12:05:37 +03 2022 +1665 +Changed: dpino@igalia.com Mon Jun 13 10:23:52 AM HKT 2022 diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh index c6bba69e252e06..515c8e0e3208b7 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="321d351b4f829293aa94cdfd5cb2030e182f81f8" +BASE_REVISION="79ad9ed64760e9fb1d02e26be2ff69b849907061" diff --git a/browser_patches/webkit/embedder/Playwright/Playwright.xcodeproj/project.pbxproj b/browser_patches/webkit/embedder/Playwright/Playwright.xcodeproj/project.pbxproj index c150ce3753a998..86a70cd278c0f9 100644 --- a/browser_patches/webkit/embedder/Playwright/Playwright.xcodeproj/project.pbxproj +++ b/browser_patches/webkit/embedder/Playwright/Playwright.xcodeproj/project.pbxproj @@ -60,14 +60,14 @@ children = ( 256AC3D80F4B6AC300CF336A /* AppDelegate.h */, 256AC3D90F4B6AC300CF336A /* AppDelegate.m */, + BC329496116A941B008635D1 /* BrowserWindowController.h */, + BC329497116A941B008635D1 /* BrowserWindowController.m */, + 7A8E843D26858D80008EC0B1 /* Images.xcassets */, BC72B89A11E57E8A001EB4EB /* Info.plist */, BC329486116A92E2008635D1 /* main.m */, 51E244F811EFCE07008228D2 /* MBToolbarItem.h */, 51E244F911EFCE07008228D2 /* MBToolbarItem.m */, 37BAF90620218053000EA87A /* Playwright.entitlements */, - BC329496116A941B008635D1 /* BrowserWindowController.h */, - BC329497116A941B008635D1 /* BrowserWindowController.m */, - 7A8E843D26858D80008EC0B1 /* Images.xcassets */, ); name = Playwright; sourceTree = ""; @@ -193,8 +193,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 7A8E843E26858D80008EC0B1 /* Images.xcassets in Resources */, BC72B89611E57E0F001EB4EB /* BrowserWindow.xib in Resources */, + 7A8E843E26858D80008EC0B1 /* Images.xcassets in Resources */, BC72B89511E57E07001EB4EB /* MainMenu.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -207,9 +207,9 @@ buildActionMask = 2147483647; files = ( 256AC3DA0F4B6AC300CF336A /* AppDelegate.m in Sources */, + BC329498116A941B008635D1 /* BrowserWindowController.m in Sources */, BC329487116A92E2008635D1 /* main.m in Sources */, 51E244FA11EFCE07008228D2 /* MBToolbarItem.m in Sources */, - BC329498116A941B008635D1 /* BrowserWindowController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/browser_patches/webkit/embedder/Playwright/win/Playwright.rc b/browser_patches/webkit/embedder/Playwright/win/Playwright.rc index 4430f19062cc9f..8d712765121dcb 100644 --- a/browser_patches/webkit/embedder/Playwright/win/Playwright.rc +++ b/browser_patches/webkit/embedder/Playwright/win/Playwright.rc @@ -1,76 +1,76 @@ -// Microsoft Visual C++ generated resource script. -// -#include "PlaywrightResource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_PLAYWRIGHT ICON "Playwright.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "PlaywrightResource.\0" -END - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +// Microsoft Visual C++ generated resource script. +// +#include "PlaywrightResource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_PLAYWRIGHT ICON "Playwright.ico" + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "PlaywrightResource.\0" +END + +2 TEXTINCLUDE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/browser_patches/webkit/embedder/Playwright/win/PlaywrightLib.rc b/browser_patches/webkit/embedder/Playwright/win/PlaywrightLib.rc index 83039d330fa60c..ddd837e49fa72a 100644 --- a/browser_patches/webkit/embedder/Playwright/win/PlaywrightLib.rc +++ b/browser_patches/webkit/embedder/Playwright/win/PlaywrightLib.rc @@ -1,354 +1,354 @@ -// Microsoft Visual C++ generated resource script. -// -#include "PlaywrightLibResource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_PLAYWRIGHT ICON "Playwright.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDC_PLAYWRIGHT MENU -BEGIN - POPUP "&File" - BEGIN - MENUITEM "New Window\tCtrl-N" IDM_NEW_WINDOW - MENUITEM "Close\tCtrl-W", IDM_CLOSE_WINDOW - END - POPUP "&View" - BEGIN - MENUITEM "Actual Size\tCtrl+0", IDM_ACTUAL_SIZE - MENUITEM "Zoom In\tCtrl++", IDM_ZOOM_IN - MENUITEM "Zoom Out\tCtrl+-", IDM_ZOOM_OUT - MENUITEM "Invert Colors", IDM_INVERT_COLORS - END - POPUP "&History" - BEGIN - MENUITEM "Reload\tCtrl-R", IDM_RELOAD - MENUITEM "Back", IDM_HISTORY_BACKWARD - MENUITEM "Forward", IDM_HISTORY_FORWARD - END - POPUP "D&evelop" - BEGIN - MENUITEM "Show Web Inspector", IDM_WEB_INSPECTOR - END - POPUP "&Help" - BEGIN - MENUITEM "&About ...", IDM_ABOUT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDC_PLAYWRIGHT ACCELERATORS -BEGIN - "/", IDM_ABOUT, ASCII, ALT, NOINVERT - "0", IDM_ACTUAL_SIZE, VIRTKEY, CONTROL, NOINVERT - "?", IDM_ABOUT, ASCII, ALT, NOINVERT - "R", IDM_RELOAD, VIRTKEY, CONTROL, NOINVERT - "N", IDM_NEW_WINDOW, VIRTKEY, CONTROL, NOINVERT - VK_ADD, IDM_ZOOM_IN, VIRTKEY, CONTROL, NOINVERT - VK_OEM_MINUS, IDM_ZOOM_OUT, VIRTKEY, CONTROL, NOINVERT - VK_OEM_PLUS, IDM_ZOOM_IN, VIRTKEY, CONTROL, NOINVERT - VK_SUBTRACT, IDM_ZOOM_OUT, VIRTKEY, CONTROL, NOINVERT -END - -IDR_ACCELERATORS_PRE ACCELERATORS -BEGIN - "W", IDM_CLOSE_WINDOW, VIRTKEY, CONTROL, NOINVERT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUTBOX DIALOGEX 22, 17, 230, 41 -STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - ICON IDI_PLAYWRIGHT,IDC_MYICON,14,9,20,20 - LTEXT "Playwright Version 1.1",IDC_STATIC,49,10,119,8 - LTEXT "Copyright (C) 2015-2019",IDC_STATIC,49,20,119,8 - DEFPUSHBUTTON "OK",IDOK,186,10,30,11,WS_GROUP -END - -IDD_CACHES DIALOGEX 0, 0, 401, 456 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,287,435,50,14 - PUSHBUTTON "Cancel",IDCANCEL,344,435,50,14 - GROUPBOX "FastMalloc",IDC_STATIC,208,14,186,67 - GROUPBOX "WebCore Cache",IDC_STATIC,17,83,376,105 - GROUPBOX "JavaScript Heap",IDC_STATIC,18,193,376,168 - GROUPBOX "Site Icon Database",IDC_STATIC,18,366,142,65 - GROUPBOX "Font and Glyph Caches",IDC_STATIC,168,366,226,66 - GROUPBOX "CFURLCache",IDC_STATIC,7,14,197,67 - PUSHBUTTON "Empty URLCache",IDC_EMPTY_URL_CACHE,131,63,69,14,WS_DISABLED - PUSHBUTTON "Return Free Memory",IDC_RETURN_FREE_MEMORY,308,63,76,14,WS_DISABLED - PUSHBUTTON "Empty WebCore Cache",IDC_EMPTY_WEBCORE_CACHE,21,170,83,14,WS_DISABLED - CONTROL "Disable WebCore Cache",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,119,172,93,10 - PUSHBUTTON "Garbage Collect JavaScript Objects",IDC_GC_JSC,253,343,135,14,WS_DISABLED - RTEXT "Reserved VM",IDC_STATIC,212,26,67,9 - RTEXT "0",IDC_RESERVED_VM,290,26,94,8 - RTEXT "Committed VM",IDC_STATIC,211,39,67,8 - RTEXT "0",IDC_COMMITTED_VM,290,39,94,8 - RTEXT "Free List Bytes",IDC_STATIC,211,52,67,8 - RTEXT "0",IDC_FREE_LIST_BYTES,290,52,94,8 - RTEXT "Images",IDC_STATIC,37,106,24,8 - RTEXT "CSS",IDC_STATIC,47,116,14,8 - RTEXT "XSL",IDC_STATIC,49,126,12,8 - RTEXT "JavaScript",IDC_STATIC,27,135,34,8 - RTEXT "Total",IDC_STATIC,43,146,17,8 - LTEXT "Objects",IDC_STATIC,111,96,26,8 - LTEXT "Bytes",IDC_STATIC,175,96,19,8 - LTEXT "Live",IDC_STATIC,232,96,14,8 - LTEXT "Decoded",IDC_STATIC,284,96,29,8 - LTEXT "Purgeable",IDC_STATIC,351,96,33,8 - RTEXT "0",IDC_IMAGES_OBJECT_COUNT,100,106,32,8 - RTEXT "0",IDC_CSS_OBJECT_COUNT,100,116,32,8 - RTEXT "0",IDC_XSL_OBJECT_COUNT,100,126,32,8 - RTEXT "0",IDC_JSC_OBJECT_COUNT,100,135,32,8 - RTEXT "0",IDC_TOTAL_OBJECT_COUNT,100,146,32,8 - RTEXT "0",IDC_IMAGES_BYTES,162,106,32,8 - RTEXT "0",IDC_CSS_BYTES,162,116,32,8 - RTEXT "0",IDC_XSL_BYTES,162,126,32,8 - RTEXT "0",IDC_JSC_BYTES,162,135,32,8 - RTEXT "0",IDC_TOTAL_BYTES,162,146,32,8 - RTEXT "0",IDC_IMAGES_LIVE_COUNT,221,106,32,8 - RTEXT "0",IDC_CSS_LIVE_COUNT,221,116,32,8 - RTEXT "0",IDC_XSL_LIVE_COUNT,221,126,32,8 - RTEXT "0",IDC_JSC_LIVE_COUNT,221,135,32,8 - RTEXT "0",IDC_TOTAL_LIVE_COUNT,221,146,32,8 - RTEXT "0",IDC_IMAGES_DECODED_COUNT,284,106,32,8 - RTEXT "0",IDC_CSS_DECODED_COUNT,284,116,32,8 - RTEXT "0",IDC_XSL_DECODED_COUNT,284,126,32,8 - RTEXT "0",IDC_JSC_DECODED_COUNT,284,135,32,8 - RTEXT "0",IDC_TOTAL_DECODED,284,146,32,8 - RTEXT "0",IDC_IMAGES_PURGEABLE_COUNT,354,106,32,8 - RTEXT "0",IDC_CSS_PURGEABLE_COUNT,354,116,32,8 - RTEXT "0",IDC_XSL_PURGEABLE_COUNT,354,126,32,8 - RTEXT "0",IDC_JSC_PURGEABLE_COUNT,354,135,32,8 - RTEXT "0",IDC_TOTAL_PURGEABLE,354,146,32,8 - RTEXT "Total Objects",IDC_STATIC,63,207,44,8 - RTEXT "Global Objects",IDC_STATIC,56,217,51,8 - RTEXT "Protected Objects",IDC_STATIC,48,227,59,8 - RTEXT "0",IDC_TOTAL_JSC_HEAP_OBJECTS,127,207,56,8 - RTEXT "0",IDC_GLOBAL_JSC_HEAP_OBJECTS,127,217,56,8 - RTEXT "0",IDC_PROTECTED_JSC_HEAP_OBJECTS,127,227,56,8 - RTEXT "Size",IDC_STATIC56,223,207,14,8 - RTEXT "Free",IDC_STATIC57,222,217,16,8 - RTEXT "0",IDC_JSC_HEAP_SIZE,270,207,56,8 - RTEXT "0",IDC_JSC_HEAP_FREE,270,217,56,8 - PUSHBUTTON "Purge Inactive Font Data",IDC_BUTTON5,293,415,95,14,WS_DISABLED - LTEXT "Total Font Data Objects",IDC_STATIC,208,379,78,8 - LTEXT "Inactive Font Data Objects",IDC_STATIC,198,390,88,8 - LTEXT "Glyph Pages",IDC_STATIC,246,402,40,8 - RTEXT "0",IDC_TOTAL_FONT_OBJECTS,329,379,56,8 - RTEXT "0",IDC_INACTIVE_FONT_OBJECTS,329,390,56,8 - RTEXT "0",IDC_GLYPH_PAGES,329,402,56,8 - LTEXT "Page URL Mappings",IDC_STATIC,33,380,64,8 - LTEXT "Retained Page URLs",IDC_STATIC,31,390,66,8 - LTEXT "Site Icon Records",IDC_STATIC,40,400,57,8 - LTEXT "Site Icons with Data",IDC_STATIC,32,410,65,8 - RTEXT "0",IDC_PAGE_URL_MAPPINGS,101,380,52,8 - RTEXT "0",IDC_RETAINED_PAGE_URLS,101,390,52,8 - RTEXT "0",IDC_SITE_ICON_RECORDS,101,400,52,8 - RTEXT "0",IDC_SITE_ICONS_WITH_DATA,101,410,52,8 -END - -IDD_AUTH DIALOGEX 0, 0, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Authentication Required" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "Sign In",IDOK,116,98,50,14 - PUSHBUTTON "Cancel",IDCANCEL,174,98,50,14 - LTEXT "Realm",IDC_REALM_TEXT,67,21,157,8 - RTEXT "User Name:",IDC_STATIC,7,41,57,8 - EDITTEXT IDC_AUTH_USER,67,39,157,14,ES_AUTOHSCROLL - RTEXT "Password:",IDC_STATIC,7,66,57,8 - EDITTEXT IDC_AUTH_PASSWORD,67,64,157,14,ES_PASSWORD | ES_AUTOHSCROLL -END - -IDD_PROXY DIALOGEX 0, 0, 310, 176 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Proxy Configuration" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,199,155,50,14 - PUSHBUTTON "Cancel",IDCANCEL,253,155,50,14 - CONTROL "Use system default proxy configuration.",IDC_PROXY_DEFAULT, - "Button",BS_AUTORADIOBUTTON | WS_GROUP,22,15,226,10 - CONTROL "Use custom proxy configuration:",IDC_PROXY_CUSTOM, - "Button",BS_AUTORADIOBUTTON,22,33,226,10 - CONTROL "Don't use proxy.",IDC_PROXY_DISABLE,"Button",BS_AUTORADIOBUTTON,22,117,226,10 - EDITTEXT IDC_PROXY_URL,76,52,193,14,ES_AUTOHSCROLL - EDITTEXT IDC_PROXY_EXCLUDE,76,85,193,14,ES_AUTOHSCROLL - LTEXT "URL:",IDC_STATIC,30,55,43,8,0,WS_EX_RIGHT - LTEXT "Excude list:",IDC_STATIC,30,88,43,8,0,WS_EX_RIGHT - LTEXT "Example: http://192.168.0.2:8000",IDC_STATIC,80,68,194,8 - LTEXT "Comma separated hostnames.",IDC_STATIC,80,101,194,8 -END - -IDD_SERVER_TRUST DIALOGEX 0, 0, 319, 184 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Server Trust Evaluation Request" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "Yes",IDOK,197,163,50,14 - PUSHBUTTON "No",IDCANCEL,262,163,50,14 - LTEXT "Certificate information",IDC_STATIC,7,7,294,17 - EDITTEXT IDC_SERVER_TRUST_TEXT,7,24,305,130,ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_HSCROLL | NOT WS_TABSTOP -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "PlaywrightLibResource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - END - - IDD_CACHES, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 394 - TOPMARGIN, 7 - BOTTOMMARGIN, 449 - END - - IDD_AUTH, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 224 - VERTGUIDE, 64 - VERTGUIDE, 67 - TOPMARGIN, 7 - BOTTOMMARGIN, 92 - HORZGUIDE, 25 - HORZGUIDE, 50 - END - - IDD_PROXY, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 303 - VERTGUIDE, 22 - TOPMARGIN, 7 - BOTTOMMARGIN, 169 - END - - IDD_SERVER_TRUST, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 312 - TOPMARGIN, 7 - BOTTOMMARGIN, 177 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_TOOLBAR BITMAP "toolbar.bmp" - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDS_APP_TITLE "Playwright" - IDC_PLAYWRIGHT "Playwright" -END - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +// Microsoft Visual C++ generated resource script. +// +#include "PlaywrightLibResource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_PLAYWRIGHT ICON "Playwright.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDC_PLAYWRIGHT MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "New Window\tCtrl-N" IDM_NEW_WINDOW + MENUITEM "Close\tCtrl-W", IDM_CLOSE_WINDOW + END + POPUP "&View" + BEGIN + MENUITEM "Actual Size\tCtrl+0", IDM_ACTUAL_SIZE + MENUITEM "Zoom In\tCtrl++", IDM_ZOOM_IN + MENUITEM "Zoom Out\tCtrl+-", IDM_ZOOM_OUT + MENUITEM "Invert Colors", IDM_INVERT_COLORS + END + POPUP "&History" + BEGIN + MENUITEM "Reload\tCtrl-R", IDM_RELOAD + MENUITEM "Back", IDM_HISTORY_BACKWARD + MENUITEM "Forward", IDM_HISTORY_FORWARD + END + POPUP "D&evelop" + BEGIN + MENUITEM "Show Web Inspector", IDM_WEB_INSPECTOR + END + POPUP "&Help" + BEGIN + MENUITEM "&About ...", IDM_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDC_PLAYWRIGHT ACCELERATORS +BEGIN + "/", IDM_ABOUT, ASCII, ALT, NOINVERT + "0", IDM_ACTUAL_SIZE, VIRTKEY, CONTROL, NOINVERT + "?", IDM_ABOUT, ASCII, ALT, NOINVERT + "R", IDM_RELOAD, VIRTKEY, CONTROL, NOINVERT + "N", IDM_NEW_WINDOW, VIRTKEY, CONTROL, NOINVERT + VK_ADD, IDM_ZOOM_IN, VIRTKEY, CONTROL, NOINVERT + VK_OEM_MINUS, IDM_ZOOM_OUT, VIRTKEY, CONTROL, NOINVERT + VK_OEM_PLUS, IDM_ZOOM_IN, VIRTKEY, CONTROL, NOINVERT + VK_SUBTRACT, IDM_ZOOM_OUT, VIRTKEY, CONTROL, NOINVERT +END + +IDR_ACCELERATORS_PRE ACCELERATORS +BEGIN + "W", IDM_CLOSE_WINDOW, VIRTKEY, CONTROL, NOINVERT +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOGEX 22, 17, 230, 41 +STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_PLAYWRIGHT,IDC_MYICON,14,9,20,20 + LTEXT "Playwright Version 1.1",IDC_STATIC,49,10,119,8 + LTEXT "Copyright (C) 2015-2019",IDC_STATIC,49,20,119,8 + DEFPUSHBUTTON "OK",IDOK,186,10,30,11,WS_GROUP +END + +IDD_CACHES DIALOGEX 0, 0, 401, 456 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,287,435,50,14 + PUSHBUTTON "Cancel",IDCANCEL,344,435,50,14 + GROUPBOX "FastMalloc",IDC_STATIC,208,14,186,67 + GROUPBOX "WebCore Cache",IDC_STATIC,17,83,376,105 + GROUPBOX "JavaScript Heap",IDC_STATIC,18,193,376,168 + GROUPBOX "Site Icon Database",IDC_STATIC,18,366,142,65 + GROUPBOX "Font and Glyph Caches",IDC_STATIC,168,366,226,66 + GROUPBOX "CFURLCache",IDC_STATIC,7,14,197,67 + PUSHBUTTON "Empty URLCache",IDC_EMPTY_URL_CACHE,131,63,69,14,WS_DISABLED + PUSHBUTTON "Return Free Memory",IDC_RETURN_FREE_MEMORY,308,63,76,14,WS_DISABLED + PUSHBUTTON "Empty WebCore Cache",IDC_EMPTY_WEBCORE_CACHE,21,170,83,14,WS_DISABLED + CONTROL "Disable WebCore Cache",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,119,172,93,10 + PUSHBUTTON "Garbage Collect JavaScript Objects",IDC_GC_JSC,253,343,135,14,WS_DISABLED + RTEXT "Reserved VM",IDC_STATIC,212,26,67,9 + RTEXT "0",IDC_RESERVED_VM,290,26,94,8 + RTEXT "Committed VM",IDC_STATIC,211,39,67,8 + RTEXT "0",IDC_COMMITTED_VM,290,39,94,8 + RTEXT "Free List Bytes",IDC_STATIC,211,52,67,8 + RTEXT "0",IDC_FREE_LIST_BYTES,290,52,94,8 + RTEXT "Images",IDC_STATIC,37,106,24,8 + RTEXT "CSS",IDC_STATIC,47,116,14,8 + RTEXT "XSL",IDC_STATIC,49,126,12,8 + RTEXT "JavaScript",IDC_STATIC,27,135,34,8 + RTEXT "Total",IDC_STATIC,43,146,17,8 + LTEXT "Objects",IDC_STATIC,111,96,26,8 + LTEXT "Bytes",IDC_STATIC,175,96,19,8 + LTEXT "Live",IDC_STATIC,232,96,14,8 + LTEXT "Decoded",IDC_STATIC,284,96,29,8 + LTEXT "Purgeable",IDC_STATIC,351,96,33,8 + RTEXT "0",IDC_IMAGES_OBJECT_COUNT,100,106,32,8 + RTEXT "0",IDC_CSS_OBJECT_COUNT,100,116,32,8 + RTEXT "0",IDC_XSL_OBJECT_COUNT,100,126,32,8 + RTEXT "0",IDC_JSC_OBJECT_COUNT,100,135,32,8 + RTEXT "0",IDC_TOTAL_OBJECT_COUNT,100,146,32,8 + RTEXT "0",IDC_IMAGES_BYTES,162,106,32,8 + RTEXT "0",IDC_CSS_BYTES,162,116,32,8 + RTEXT "0",IDC_XSL_BYTES,162,126,32,8 + RTEXT "0",IDC_JSC_BYTES,162,135,32,8 + RTEXT "0",IDC_TOTAL_BYTES,162,146,32,8 + RTEXT "0",IDC_IMAGES_LIVE_COUNT,221,106,32,8 + RTEXT "0",IDC_CSS_LIVE_COUNT,221,116,32,8 + RTEXT "0",IDC_XSL_LIVE_COUNT,221,126,32,8 + RTEXT "0",IDC_JSC_LIVE_COUNT,221,135,32,8 + RTEXT "0",IDC_TOTAL_LIVE_COUNT,221,146,32,8 + RTEXT "0",IDC_IMAGES_DECODED_COUNT,284,106,32,8 + RTEXT "0",IDC_CSS_DECODED_COUNT,284,116,32,8 + RTEXT "0",IDC_XSL_DECODED_COUNT,284,126,32,8 + RTEXT "0",IDC_JSC_DECODED_COUNT,284,135,32,8 + RTEXT "0",IDC_TOTAL_DECODED,284,146,32,8 + RTEXT "0",IDC_IMAGES_PURGEABLE_COUNT,354,106,32,8 + RTEXT "0",IDC_CSS_PURGEABLE_COUNT,354,116,32,8 + RTEXT "0",IDC_XSL_PURGEABLE_COUNT,354,126,32,8 + RTEXT "0",IDC_JSC_PURGEABLE_COUNT,354,135,32,8 + RTEXT "0",IDC_TOTAL_PURGEABLE,354,146,32,8 + RTEXT "Total Objects",IDC_STATIC,63,207,44,8 + RTEXT "Global Objects",IDC_STATIC,56,217,51,8 + RTEXT "Protected Objects",IDC_STATIC,48,227,59,8 + RTEXT "0",IDC_TOTAL_JSC_HEAP_OBJECTS,127,207,56,8 + RTEXT "0",IDC_GLOBAL_JSC_HEAP_OBJECTS,127,217,56,8 + RTEXT "0",IDC_PROTECTED_JSC_HEAP_OBJECTS,127,227,56,8 + RTEXT "Size",IDC_STATIC56,223,207,14,8 + RTEXT "Free",IDC_STATIC57,222,217,16,8 + RTEXT "0",IDC_JSC_HEAP_SIZE,270,207,56,8 + RTEXT "0",IDC_JSC_HEAP_FREE,270,217,56,8 + PUSHBUTTON "Purge Inactive Font Data",IDC_BUTTON5,293,415,95,14,WS_DISABLED + LTEXT "Total Font Data Objects",IDC_STATIC,208,379,78,8 + LTEXT "Inactive Font Data Objects",IDC_STATIC,198,390,88,8 + LTEXT "Glyph Pages",IDC_STATIC,246,402,40,8 + RTEXT "0",IDC_TOTAL_FONT_OBJECTS,329,379,56,8 + RTEXT "0",IDC_INACTIVE_FONT_OBJECTS,329,390,56,8 + RTEXT "0",IDC_GLYPH_PAGES,329,402,56,8 + LTEXT "Page URL Mappings",IDC_STATIC,33,380,64,8 + LTEXT "Retained Page URLs",IDC_STATIC,31,390,66,8 + LTEXT "Site Icon Records",IDC_STATIC,40,400,57,8 + LTEXT "Site Icons with Data",IDC_STATIC,32,410,65,8 + RTEXT "0",IDC_PAGE_URL_MAPPINGS,101,380,52,8 + RTEXT "0",IDC_RETAINED_PAGE_URLS,101,390,52,8 + RTEXT "0",IDC_SITE_ICON_RECORDS,101,400,52,8 + RTEXT "0",IDC_SITE_ICONS_WITH_DATA,101,410,52,8 +END + +IDD_AUTH DIALOGEX 0, 0, 231, 119 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Authentication Required" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Sign In",IDOK,116,98,50,14 + PUSHBUTTON "Cancel",IDCANCEL,174,98,50,14 + LTEXT "Realm",IDC_REALM_TEXT,67,21,157,8 + RTEXT "User Name:",IDC_STATIC,7,41,57,8 + EDITTEXT IDC_AUTH_USER,67,39,157,14,ES_AUTOHSCROLL + RTEXT "Password:",IDC_STATIC,7,66,57,8 + EDITTEXT IDC_AUTH_PASSWORD,67,64,157,14,ES_PASSWORD | ES_AUTOHSCROLL +END + +IDD_PROXY DIALOGEX 0, 0, 310, 176 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Proxy Configuration" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,199,155,50,14 + PUSHBUTTON "Cancel",IDCANCEL,253,155,50,14 + CONTROL "Use system default proxy configuration.",IDC_PROXY_DEFAULT, + "Button",BS_AUTORADIOBUTTON | WS_GROUP,22,15,226,10 + CONTROL "Use custom proxy configuration:",IDC_PROXY_CUSTOM, + "Button",BS_AUTORADIOBUTTON,22,33,226,10 + CONTROL "Don't use proxy.",IDC_PROXY_DISABLE,"Button",BS_AUTORADIOBUTTON,22,117,226,10 + EDITTEXT IDC_PROXY_URL,76,52,193,14,ES_AUTOHSCROLL + EDITTEXT IDC_PROXY_EXCLUDE,76,85,193,14,ES_AUTOHSCROLL + LTEXT "URL:",IDC_STATIC,30,55,43,8,0,WS_EX_RIGHT + LTEXT "Excude list:",IDC_STATIC,30,88,43,8,0,WS_EX_RIGHT + LTEXT "Example: http://192.168.0.2:8000",IDC_STATIC,80,68,194,8 + LTEXT "Comma separated hostnames.",IDC_STATIC,80,101,194,8 +END + +IDD_SERVER_TRUST DIALOGEX 0, 0, 319, 184 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Server Trust Evaluation Request" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Yes",IDOK,197,163,50,14 + PUSHBUTTON "No",IDCANCEL,262,163,50,14 + LTEXT "Certificate information",IDC_STATIC,7,7,294,17 + EDITTEXT IDC_SERVER_TRUST_TEXT,7,24,305,130,ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_HSCROLL | NOT WS_TABSTOP +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "PlaywrightLibResource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + END + + IDD_CACHES, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 394 + TOPMARGIN, 7 + BOTTOMMARGIN, 449 + END + + IDD_AUTH, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 224 + VERTGUIDE, 64 + VERTGUIDE, 67 + TOPMARGIN, 7 + BOTTOMMARGIN, 92 + HORZGUIDE, 25 + HORZGUIDE, 50 + END + + IDD_PROXY, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 303 + VERTGUIDE, 22 + TOPMARGIN, 7 + BOTTOMMARGIN, 169 + END + + IDD_SERVER_TRUST, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 312 + TOPMARGIN, 7 + BOTTOMMARGIN, 177 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_TOOLBAR BITMAP "toolbar.bmp" + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Playwright" + IDC_PLAYWRIGHT "Playwright" +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 3db0358b0296fe..105d3114fbfd17 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 bb4ad01e4262640d9d6dad18655be08468f073ce..5697dfc37cabe285f975b9f0e13d48251dde7803 100644 +index 0aa6bbc263dcefd52c5660a3c16a517116b2482d..73a0bfbd99e77e4a00f590a4c206b2cf808e7e90 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt -@@ -1352,22 +1352,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS +@@ -1354,22 +1354,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json @@ -1815,7 +1815,7 @@ index 64433d3d2a0be3d9b83bde060700af8ce57a0b9d..14e35310c06a3add1cbe951287706be7 PUBLIC_HEADERS_FOLDER_PREFIX = $(WK_LIBRARY_HEADERS_FOLDER_PATH); 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 e4b94b59216277aae01696e6d4846abf8f287dce..86dd35168450f2d9ab91c2b2d0f6ca954ecf8ba7 100644 +index e4b94b59216277aae01696e6d4846abf8f287dce..8cbe085788ba582ee4615faef20769b6d0eaea03 100644 --- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj +++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj @@ -6,6 +6,20 @@ @@ -1938,30 +1938,16 @@ index e4b94b59216277aae01696e6d4846abf8f287dce..86dd35168450f2d9ab91c2b2d0f6ca95 /* 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 */, -+ F3B7819A24C7CC5200FCB122 /* mkvmuxer.cc in Sources */, - 5CDD8FFE1E43CE3A00621E92 /* audio_encoder_pcm16b.cc in Sources */, - 5CD285461E6A61D20094FDC8 /* audio_format.cc in Sources */, - 41DDB26F212679D200296D47 /* audio_format_to_string.cc in Sources */, -@@ -21787,6 +21845,7 @@ +@@ -21787,6 +21844,9 @@ 417953DB216983910028266B /* metrics.cc in Sources */, 5CDD865E1E43B8B500621E92 /* min_max_operations.c in Sources */, 4189395B242A71F5007FDC41 /* min_video_bitrate_experiment.cc in Sources */, ++ F3B7819A24C7CC5200FCB122 /* mkvmuxer.cc in Sources */, ++ F3B7819924C7CC5200FCB122 /* mkvmuxerutil.cc in Sources */, + F3B7819B24C7CC5200FCB122 /* mkvwriter.cc in Sources */, 4131C387234B957D0028A615 /* moving_average.cc in Sources */, 41FCBB1521B1F7AA00A5DF27 /* moving_average.cc in Sources */, 5CD286101E6A64C90094FDC8 /* moving_max.cc in Sources */, -@@ -22020,6 +22079,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 */, - 4131BF2D234B88200028A615 /* rtc_stats_collector.cc in Sources */, - 4131C3CE234B98420028A615 /* rtc_stats_report.cc in Sources */, @@ -22471,6 +22531,11 @@ target = DDF30D0527C5C003006A526F /* absl */; targetProxy = DD2E76E727C6B69A00F2A74C /* PBXContainerItemProxy */; @@ -2020,7 +2006,7 @@ index e4b94b59216277aae01696e6d4846abf8f287dce..86dd35168450f2d9ab91c2b2d0f6ca95 isa = XCConfigurationList; buildConfigurations = ( diff --git a/Source/WTF/Scripts/Preferences/WebPreferences.yaml b/Source/WTF/Scripts/Preferences/WebPreferences.yaml -index 182300f1eb59a8d32f793a86a69fbebe0432ee63..6ffe778c13805991d8d00778460d214f54aed654 100644 +index b5f8fd479df19c98317b1113fff01be9b7da0685..6c96c4924a1d01eabc0b066bf576a44da0693b55 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferences.yaml @@ -965,7 +965,7 @@ InspectorStartsAttached: @@ -2051,7 +2037,7 @@ index 182300f1eb59a8d32f793a86a69fbebe0432ee63..6ffe778c13805991d8d00778460d214f type: bool humanReadableName: "Private Click Measurement" diff --git a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml -index 766be08177248750e8cbbddff798bfd4e3a81ba1..11ca05a55357ff757719a1e5f62729e7aaadb74d 100644 +index f83931fde2e4d27a289de339106081878d7d56d3..4faf91ab2a7c75232956a57be2fe5e640af1fb41 100644 --- a/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml +++ b/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml @@ -503,7 +503,7 @@ CrossOriginOpenerPolicyEnabled: @@ -2123,7 +2109,7 @@ index a12654571fa6e364f9490a59b3543496cfaa7aaf..1246e7b0296bf477e4782b51364b29b4 UseGPUProcessForMediaEnabled: diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h -index c155ac2804b08de6ccf250b80e8257ca840a95cd..9e5db39af6af8aa523396ec54b34edf340f87e24 100644 +index 375c6911d99ac3349ab3d47275ba857578d74f09..bb781a6d58fa184032044e8b5d4e87cd1a24fce2 100644 --- a/Source/WTF/wtf/PlatformEnable.h +++ b/Source/WTF/wtf/PlatformEnable.h @@ -416,7 +416,7 @@ @@ -2145,10 +2131,10 @@ index c155ac2804b08de6ccf250b80e8257ca840a95cd..9e5db39af6af8aa523396ec54b34edf3 #if !defined(ENABLE_TOUCH_ACTION_REGIONS) diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h -index a69e19f17edb1f4c0140842bf7e59f9c64dce236..8774c500f21a4e8abe54c7a38bd274f1ac852f6b 100644 +index dbe21780fb9e4831616ec70e4fddc15554bcb699..3419ac6dc056f3bd54a752d711a6f9ca2f21d06b 100644 --- a/Source/WTF/wtf/PlatformEnableCocoa.h +++ b/Source/WTF/wtf/PlatformEnableCocoa.h -@@ -223,7 +223,7 @@ +@@ -243,7 +243,7 @@ #define ENABLE_DATA_DETECTION 1 #endif @@ -2170,7 +2156,7 @@ index bb01bfeeac63f854fa656ec6b8d262fafc4c9df5..f8376ea8aada69d2e53734ba8fd234c2 if (Journald_FOUND) diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h -index 33a81078f2f36f5db5ad697ab3b12c4b47072d20..a872ea8238ce30a90c425abe0c3993e2a9e97403 100644 +index 57f1adb7d7de5b4c0f667b457dc7c6001776d96b..247ec5e6f0c0b9ee22772c985636ed76eb1bb877 100644 --- a/Source/WTF/wtf/PlatformHave.h +++ b/Source/WTF/wtf/PlatformHave.h @@ -419,7 +419,7 @@ @@ -2195,10 +2181,10 @@ index 09d4af604a835c7c6be1e43c249565bd1053aff4..0d6112342480454ce41a6b56dd925e1d if (Journald_FOUND) diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make -index 3bf84fb312a1dee449355051364265decd71cda7..cef41d07443ff5e6f187ab2acd12b22de49f1b78 100644 +index dce16a9ea51a0f70f34b34856b931b94aa3d1f8f..e760f3a1f3859e630fc4a3bdebf3ffebcb5880b5 100644 --- a/Source/WebCore/DerivedSources.make +++ b/Source/WebCore/DerivedSources.make -@@ -976,6 +976,10 @@ JS_BINDING_IDLS := \ +@@ -979,6 +979,10 @@ JS_BINDING_IDLS := \ $(WebCore)/dom/Slotable.idl \ $(WebCore)/dom/StaticRange.idl \ $(WebCore)/dom/StringCallback.idl \ @@ -2209,7 +2195,7 @@ index 3bf84fb312a1dee449355051364265decd71cda7..cef41d07443ff5e6f187ab2acd12b22d $(WebCore)/dom/Text.idl \ $(WebCore)/dom/TextDecoder.idl \ $(WebCore)/dom/TextDecoderStream.idl \ -@@ -1522,9 +1526,6 @@ JS_BINDING_IDLS := \ +@@ -1525,9 +1529,6 @@ JS_BINDING_IDLS := \ ADDITIONAL_BINDING_IDLS = \ DocumentTouch.idl \ GestureEvent.idl \ @@ -2238,7 +2224,7 @@ diff --git a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm b/So index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d768ace22 100644 --- a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm +++ b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm -@@ -198,6 +198,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -198,6 +198,7 @@ - (void)sendEndIfNeeded - (void)speechRecognizer:(SFSpeechRecognizer *)speechRecognizer availabilityDidChange:(BOOL)available { @@ -2246,7 +2232,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d ASSERT(isMainThread()); if (available || !_task) -@@ -211,6 +212,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -211,6 +212,7 @@ - (void)speechRecognizer:(SFSpeechRecognizer *)speechRecognizer availabilityDidC - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didHypothesizeTranscription:(SFTranscription *)transcription { @@ -2254,7 +2240,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d ASSERT(isMainThread()); [self sendSpeechStartIfNeeded]; -@@ -219,6 +221,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -219,6 +221,7 @@ - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didHypothesizeTran - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didFinishRecognition:(SFSpeechRecognitionResult *)recognitionResult { @@ -2262,7 +2248,7 @@ index a941d76a4f748718df1e3cff2a6c5e0827f48891..f62db5a27ac0e4c12430e7d19e60c83d ASSERT(isMainThread()); [self callbackWithTranscriptions:recognitionResult.transcriptions isFinal:YES]; -@@ -230,6 +233,7 @@ NS_ASSUME_NONNULL_BEGIN +@@ -230,6 +233,7 @@ - (void)speechRecognitionTask:(SFSpeechRecognitionTask *)task didFinishRecogniti - (void)speechRecognitionTaskWasCancelled:(SFSpeechRecognitionTask *)task { @@ -2283,10 +2269,10 @@ index 9604d21ceb51ab8d20a337c8dbe52c4059043d2c..86a9eec09c4ac457bdd4567eeab57021 set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1") diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt -index 6dbaa8a39bd10eee5b50f84ff6e780ef91779228..2f490713d6656a15634888ea924329d10243c4dd 100644 +index d63c1d23922ff61c803711de63fd0da7c27f9a36..cf60fa6540def99712cb897b3e4bd13fa43e7cb6 100644 --- a/Source/WebCore/SourcesCocoa.txt +++ b/Source/WebCore/SourcesCocoa.txt -@@ -634,3 +634,9 @@ platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify +@@ -637,3 +637,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 @@ -2375,10 +2361,10 @@ index 82f617e0d496ee71ffc2f2ce4c00ddc0e640f0de..ad47858a0ba283ed44a486dbee29c10a __ZN7WebCore14DocumentLoaderD2Ev __ZN7WebCore14DocumentLoader17clearMainResourceEv diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -index a166bcac55d10d7f1d758eb43fc091136e8865ad..af023d66b56b3f68d6b7aa0be6151b433c3d67b6 100644 +index 0e75c8a3504b6a8878230cd64e50beb5511dce66..01401a06fd527b388f71d7de52d6fb531da727ed 100644 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj -@@ -5546,6 +5546,13 @@ +@@ -5552,6 +5552,13 @@ EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; }; EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; }; EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -2392,7 +2378,7 @@ index a166bcac55d10d7f1d758eb43fc091136e8865ad..af023d66b56b3f68d6b7aa0be6151b43 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, ); }; }; -@@ -17917,6 +17924,14 @@ +@@ -17936,6 +17943,14 @@ EDEC98020AED7E170059137F /* WebCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCorePrefix.h; sourceTree = ""; tabWidth = 4; usesTabs = 0; }; EFB7287B2124C73D005C2558 /* CanvasActivityRecord.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasActivityRecord.cpp; sourceTree = ""; }; EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasActivityRecord.h; sourceTree = ""; }; @@ -2407,20 +2393,80 @@ index a166bcac55d10d7f1d758eb43fc091136e8865ad..af023d66b56b3f68d6b7aa0be6151b43 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 = ""; }; -@@ -24353,7 +24368,12 @@ - 1AF326770D78B9440068F0C4 /* EditorClient.h */, - E36D701E27B71F04006531B7 /* EmptyAttachmentElementClient.h */, - 93C09A800B064F00005ABD4D /* EventHandler.cpp */, +@@ -24624,6 +24639,11 @@ + BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */, + 2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */, + 2D4F96F21A1ECC240098BF88 /* TextIndicator.h */, ++ F050E16923AD660C0011CE47 /* Touch.cpp */, + F050E16F23AD669E0011CE47 /* TouchEvent.cpp */, + F050E17023AD669F0011CE47 /* TouchEvent.h */, - 93C09A520B064DB3005ABD4D /* EventHandler.h */, -+ F050E16923AD660C0011CE47 /* Touch.cpp */, + F050E16C23AD66630011CE47 /* TouchList.cpp */, + F050E16B23AD66620011CE47 /* TouchList.h */, - E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */, - E0FEF371B17C53EAC1C1FBEE /* EventSource.h */, - E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */, -@@ -30406,6 +30426,8 @@ + F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */, + F4E1965F21F26E4E00285078 /* UndoItem.cpp */, + 2ECDBAD521D8906300F00ECD /* UndoItem.h */, +@@ -24765,8 +24785,6 @@ + 6FB7D2D5250FD7B5000207AA /* flex */ = { + isa = PBXGroup; + children = ( +- 6F047A9128453EDB00C25EE7 /* FlexLayout.h */, +- 6F047A9028453ED200C25EE7 /* FlexLayout.cpp */, + 6FB17475283A8FF40067D8CA /* FlexFormattingConstraints.h */, + 6FB7D2D7250FD7E5000207AA /* FlexFormattingContext.cpp */, + 6FB7D2D9250FD7FC000207AA /* FlexFormattingContext.h */, +@@ -24774,6 +24792,8 @@ + 6FF911F626487FC8002021DF /* FlexFormattingGeometry.h */, + 6FB7D2D8250FD7EF000207AA /* FlexFormattingState.cpp */, + 6FB7D2DA250FD7FC000207AA /* FlexFormattingState.h */, ++ 6F047A9028453ED200C25EE7 /* FlexLayout.cpp */, ++ 6F047A9128453EDB00C25EE7 /* FlexLayout.h */, + 6FB9105B2830BC8A00004929 /* FlexRect.h */, + ); + path = flex; +@@ -29458,6 +29478,8 @@ + B23540F00D00782E002382FA /* StringTruncator.cpp */, + B23540F10D00782E002382FA /* StringTruncator.h */, + 087558C413B4A57D00F49307 /* SurrogatePairAwareTextIterator.h */, ++ 1C4C77DE284DA83900BD0936 /* SystemFontDatabase.cpp */, ++ 1C4C77DF284DA83900BD0936 /* SystemFontDatabase.h */, + 95E9F44427C9A39B00945337 /* SystemImage.h */, + 3BB6B80F22A7D311003A2A69 /* TabSize.h */, + 722AF2E327E1CF110078D997 /* TextBoxIterator.h */, +@@ -29487,8 +29509,6 @@ + 501BAAA813950E2C00F7ACEB /* WindRule.h */, + 379919941200DDF400EA041C /* WOFFFileFormat.cpp */, + 379919951200DDF400EA041C /* WOFFFileFormat.h */, +- 1C4C77DE284DA83900BD0936 /* SystemFontDatabase.cpp */, +- 1C4C77DF284DA83900BD0936 /* SystemFontDatabase.h */, + ); + path = graphics; + sourceTree = ""; +@@ -29586,6 +29606,7 @@ + F48D2AA32159740D00C6752B /* ColorCocoa.h */, + F48D2AA42159740D00C6752B /* ColorCocoa.mm */, + B275354C0B053814002CE64F /* FloatRectCocoa.mm */, ++ 1C16B86C284D73EF00318FEC /* FontCacheCocoa.mm */, + 1C3969CF1B74211E002BCFA7 /* FontCacheCoreText.cpp */, + C2458E611FE8979E00594759 /* FontCacheCoreText.h */, + B2AFFC780D00A5C10030074D /* FontCascadeCocoa.cpp */, +@@ -29616,6 +29637,7 @@ + CDEB3D7324C41A6E001FBEEF /* SourceBufferParser.h */, + CD8F667024C0F208000C421C /* SourceBufferParserWebM.cpp */, + CD8F667224C0F208000C421C /* SourceBufferParserWebM.h */, ++ 1C16B86A284D6B8200318FEC /* SystemFontDatabaseCocoa.mm */, + E4E8B4ED216B79F400B8834D /* SystemFontDatabaseCoreText.cpp */, + E4E8B4EA216B79E500B8834D /* SystemFontDatabaseCoreText.h */, + 526724F21CB2FDF60075974D /* TextTrackRepresentationCocoa.h */, +@@ -29633,8 +29655,6 @@ + 07F5CFF42582A4F800662EF5 /* WebMAudioUtilitiesCocoa.h */, + 07F5CFF22582A4F800662EF5 /* WebMAudioUtilitiesCocoa.mm */, + 7B1619102719880E00C40EAC /* WebProcessGraphicsContextGLCocoa.mm */, +- 1C16B86C284D73EF00318FEC /* FontCacheCocoa.mm */, +- 1C16B86A284D6B8200318FEC /* SystemFontDatabaseCocoa.mm */, + ); + path = cocoa; + sourceTree = ""; +@@ -30438,6 +30458,8 @@ 29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */, 1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */, 1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */, @@ -2429,39 +2475,96 @@ index a166bcac55d10d7f1d758eb43fc091136e8865ad..af023d66b56b3f68d6b7aa0be6151b43 0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */, 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */, BCBB8AB513F1AFB000734DF0 /* PODInterval.h */, -@@ -32715,6 +32737,7 @@ - BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */, - AD6E71AA1668899D00320C13 /* DocumentSharedObjectPool.cpp */, +@@ -32749,6 +32771,7 @@ AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */, -+ F050E17323AD6A800011CE47 /* DocumentTouch.cpp */, 6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */, 6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */, ++ F050E17323AD6A800011CE47 /* DocumentTouch.cpp */, 7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */, -@@ -33724,6 +33747,7 @@ - 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */, - 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */, - 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */, -+ F050E16D23AD66630011CE47 /* TouchList.h in Headers */, - 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */, - 69A6CBAD1C6BE42C00B836E9 /* AccessibilitySVGElement.h in Headers */, - AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */, -@@ -35878,6 +35902,7 @@ - 6E4ABCD5138EA0B70071D291 /* JSHTMLUnknownElement.h in Headers */, - E44614170CD6826900FADA75 /* JSHTMLVideoElement.h in Headers */, - 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */, -+ F050E17823AD70C50011CE47 /* PlatformTouchPoint.h in Headers */, - 7C3D8EF01E0B21430023B084 /* JSIDBCursorDirection.h in Headers */, - C585A68311D4FB08004C3E4B /* JSIDBDatabase.h in Headers */, - C585A69711D4FB13004C3E4B /* JSIDBFactory.h in Headers */, -@@ -37002,6 +37027,7 @@ + 7CE7FA591EF882300060C9D6 /* DocumentTouch.h */, + A8185F3209765765005826D9 /* DocumentType.cpp */, +@@ -34059,6 +34082,7 @@ + 7A45033018DB717200377B34 /* BufferedLineReader.h in Headers */, + 2DFA488F1DB541D000362B99 /* BufferSource.h in Headers */, + F55B3DB01251F12D003EF269 /* ButtonInputType.h in Headers */, ++ 72C11DAD2849425800E826DD /* ByteArrayPixelBuffer.h in Headers */, + 07C046C41E42508B007201E7 /* CAAudioStreamDescription.h in Headers */, + 6353E1E61F91743100A34208 /* CachedApplicationManifest.h in Headers */, + BCB16C1A0979C3BD00467741 /* CachedCSSStyleSheet.h in Headers */, +@@ -34944,6 +34968,7 @@ + 6FB7D2DD250FD828000207AA /* FlexFormattingContext.h in Headers */, + 6FF911F726487FC8002021DF /* FlexFormattingGeometry.h in Headers */, + 6FB7D2DE250FD82E000207AA /* FlexFormattingState.h in Headers */, ++ 6F047A9228453EDB00C25EE7 /* FlexLayout.h in Headers */, + 6FB9105C2830BC8A00004929 /* FlexRect.h in Headers */, + 6FFDC442212EFF1700A9CA91 /* FloatAvoider.h in Headers */, + BC073BAA0C399B1F000F5979 /* FloatConversion.h in Headers */, +@@ -35353,6 +35378,7 @@ + 7C7903B31F86F95C00463A70 /* ImageBitmapRenderingContext.h in Headers */, + 318EAD4D1FA91380008CEF86 /* ImageBitmapRenderingContextSettings.h in Headers */, + B2A10B920B3818BD00099AA4 /* ImageBuffer.h in Headers */, ++ 724DCF2328486C9B0026ACF4 /* ImageBufferAllocator.h in Headers */, + 72BAC3AE23E1F0B0008D741C /* ImageBufferBackend.h in Headers */, + 550640B02407587E00AAE045 /* ImageBufferCGBackend.h in Headers */, + 2D7705C925528D34001D0C94 /* ImageBufferCGBitmapBackend.h in Headers */, +@@ -35373,7 +35399,6 @@ + BC7F44A80B9E324E00A9D081 /* ImageObserver.h in Headers */, + 2D5A5931152525D00036EE51 /* ImageOrientation.h in Headers */, + F46D5386273D7E460009FA80 /* ImageOverlay.h in Headers */, +- 6F047A9228453EDB00C25EE7 /* FlexLayout.h in Headers */, + F482434B260C33060022497C /* ImageOverlayController.h in Headers */, + F446EDE1265DB1E50031DA8F /* ImageOverlayDataDetectionResultIdentifier.h in Headers */, + 72283F0E230B268C00F5D828 /* ImagePaintingOptions.h in Headers */, +@@ -35407,7 +35432,6 @@ + 517138F81BF128BB000D5F01 /* IndexValueStore.h in Headers */, + CD063F831E23FA8900812BE3 /* InitDataRegistry.h in Headers */, + E4F819C626FB4EBF0094E162 /* InlineBoxPainter.h in Headers */, +- 72C11DAD2849425800E826DD /* ByteArrayPixelBuffer.h in Headers */, + E30592641E27A3AD00D57C98 /* InlineClassicScript.h in Headers */, + 6FE198172178397C00446F08 /* InlineContentBreaker.h in Headers */, + 111FA1C826F0F30F003B8F16 /* InlineDamage.h in Headers */, +@@ -37039,6 +37063,8 @@ + 1AD8F81B11CAB9E900E93E54 /* PlatformStrategies.h in Headers */, 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */, 074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */, - CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, + F050E16823AC9C080011CE47 /* PlatformTouchEvent.h in Headers */, ++ F050E17823AD70C50011CE47 /* PlatformTouchPoint.h in Headers */, + CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */, CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */, CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */, - CD1F9B032700323D00617EB6 /* PlatformVideoMatrixCoefficients.h in Headers */, -@@ -39103,6 +39129,7 @@ +@@ -37371,7 +37397,6 @@ + BE20507E18A458C20080647E /* RenderVTTCue.h in Headers */, + A871DFE40A15376B00B12A68 /* RenderWidget.h in Headers */, + A89CCC530F44E98100B5DA10 /* ReplaceNodeWithSpanCommand.h in Headers */, +- 1CFD5D7E284DBE7F00089667 /* SystemFontDatabase.h in Headers */, + 2DF512CE1D873E47001D6780 /* ReplaceRangeWithTextCommand.h in Headers */, + 93309E0A099E64920056E581 /* ReplaceSelectionCommand.h in Headers */, + 071C00342707D95500D027C7 /* ReplayKitCaptureSource.h in Headers */, +@@ -37838,7 +37863,6 @@ + 0FF50272102BA96A0066F39A /* StyleMedia.h in Headers */, + BC5EB74E0E81E06700B25965 /* StyleMultiColData.h in Headers */, + E4DACE6A1D12E10B0075980F /* StylePendingResources.h in Headers */, +- 724DCF2328486C9B0026ACF4 /* ImageBufferAllocator.h in Headers */, + A80E6DFC0A199067007FB8C5 /* StyleProperties.h in Headers */, + 4BD781BF21C1965F00D9703E /* StylePropertyMap.h in Headers */, + 4BAFD0CF2190F9B500C0AB64 /* StylePropertyMapReadOnly.h in Headers */, +@@ -38080,6 +38104,7 @@ + 517A53461F50C17F00DCDC0A /* SWServerWorker.h in Headers */, + E180811716FCF9CB00B80D07 /* SynchronousLoaderClient.h in Headers */, + C1692DD523D23E08006E88F7 /* SystemBattery.h in Headers */, ++ 1CFD5D7E284DBE7F00089667 /* SystemFontDatabase.h in Headers */, + E4E8B4EC216B79E500B8834D /* SystemFontDatabaseCoreText.h in Headers */, + 95E9F44627C9A39C00945337 /* SystemImage.h in Headers */, + 0F03C0741884695E00A5F8CA /* SystemMemory.h in Headers */, +@@ -38185,6 +38210,7 @@ + 0F54DD081881D5F5003EEDBB /* Touch.h in Headers */, + 71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */, + 0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */, ++ F050E16D23AD66630011CE47 /* TouchList.h in Headers */, + 0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */, + 070334D71459FFD5008D8D45 /* TrackBase.h in Headers */, + BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */, +@@ -39141,6 +39167,7 @@ 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 2D22830323A8470700364B7E /* CursorMac.mm in Sources */, 5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */, @@ -2469,30 +2572,16 @@ index a166bcac55d10d7f1d758eb43fc091136e8865ad..af023d66b56b3f68d6b7aa0be6151b43 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */, 5130F2F624AEA60A00E1D0A0 /* GameControllerSoftLink.mm in Sources */, 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */, -@@ -39179,6 +39206,7 @@ +@@ -39217,6 +39244,9 @@ C1692DD223D23ABD006E88F7 /* SystemBattery.mm in Sources */, CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */, 51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */, ++ F050E16A23AD660C0011CE47 /* Touch.cpp in Sources */, + F050E17123AD669F0011CE47 /* TouchEvent.cpp in Sources */, ++ F050E16E23AD66630011CE47 /* TouchList.cpp in Sources */, 538EC8031F96AF81004D22A8 /* UnifiedSource1-mm.mm in Sources */, 538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */, 538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */, -@@ -39227,6 +39255,7 @@ - 538EC8881F993F9C004D22A8 /* UnifiedSource23.cpp in Sources */, - DE5F85801FA1ABF4006DB63A /* UnifiedSource24-mm.mm in Sources */, - 538EC8891F993F9D004D22A8 /* UnifiedSource24.cpp in Sources */, -+ F050E16E23AD66630011CE47 /* TouchList.cpp in Sources */, - DE5F85811FA1ABF4006DB63A /* UnifiedSource25-mm.mm in Sources */, - 538EC88A1F993F9D004D22A8 /* UnifiedSource25.cpp in Sources */, - DE5F85821FA1ABF4006DB63A /* UnifiedSource26-mm.mm in Sources */, -@@ -39759,6 +39788,7 @@ - 2D8B92F1203D13E1009C868F /* UnifiedSource516.cpp in Sources */, - 2D8B92F2203D13E1009C868F /* UnifiedSource517.cpp in Sources */, - 2D8B92F3203D13E1009C868F /* UnifiedSource518.cpp in Sources */, -+ F050E16A23AD660C0011CE47 /* Touch.cpp in Sources */, - 2D8B92F4203D13E1009C868F /* UnifiedSource519.cpp in Sources */, - 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 f54be5414e003305257b29abe2e2ac38b9191dc2..6b3cfe10bc504b8a598f04feb0d88df19380e486 100644 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp @@ -2642,10 +2731,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 41b03fd31e9879a93a07a018c33bf166b4c2d713..08fa7e77c9b491a91c21cb49a0ca6cf59e1220c4 100644 +index d0735146084d058b7c9a59db6f06fc32a8638278..bad4fdb901745169ad84bb869c0a761bd5ade71f 100644 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h -@@ -132,6 +132,8 @@ namespace WebCore { +@@ -151,6 +151,8 @@ namespace WebCore { macro(DataTransferItem) \ macro(DataTransferItemList) \ macro(DelayNode) \ @@ -6812,7 +6901,7 @@ index 44799e0b2a93cbcf25f4315d62a3d95896c02f3d..29277223448a0936a16f975970ab60d7 #endif diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h -index 0fbd9949f8a8927f1f342cbe33dea685dd482f41..27be181d431d58ef25c3f638178bd78593d7bb61 100644 +index 78a23f64c6bd7bdfe37c41b77dc5682e868f6233..fff6c69423d9709e8142c6549db5d798a7a71ae6 100644 --- a/Source/WebCore/platform/ScrollableArea.h +++ b/Source/WebCore/platform/ScrollableArea.h @@ -102,7 +102,7 @@ public: @@ -8829,7 +8918,7 @@ diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/ index 8b32817b6c0efbcbd221dc7a3ebe420b42d8b51d..a468653cffcfaca8824e94d628c48b7b5d61e164 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 +@@ -720,7 +720,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didRece if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { sessionCocoa->setClientAuditToken(challenge); @@ -9894,10 +9983,10 @@ index c03306be47340b44317c7e70c0df9ebe9dbe6fe9..2b2494459e169e2ab0762a494e4110b6 UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp UIProcess/Media/MediaUsageManager.cpp diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt -index 0ec8eca8cb9f393c9464a83ebf2ef9984cae1b6a..1bc846e858a4b004817aa050cfa255cb06bb4f6d 100644 +index 14bb808bb4d659faaca9df623a2ed3213dccf3ee..e36d2ea060310a90a73a0f8af7d96040152122ac 100644 --- a/Source/WebKit/SourcesCocoa.txt +++ b/Source/WebKit/SourcesCocoa.txt -@@ -276,6 +276,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm +@@ -279,6 +279,7 @@ UIProcess/API/Cocoa/_WKApplicationManifest.mm UIProcess/API/Cocoa/_WKAttachment.mm UIProcess/API/Cocoa/_WKAutomationSession.mm UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @@ -9905,7 +9994,7 @@ index 0ec8eca8cb9f393c9464a83ebf2ef9984cae1b6a..1bc846e858a4b004817aa050cfa255cb UIProcess/API/Cocoa/_WKContentRuleListAction.mm UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify -@@ -454,6 +455,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm +@@ -456,6 +457,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm @@ -10239,7 +10328,7 @@ index b8bf936e2eb8ca4dc0f445099dfb899395950bdb..30a2af76de0daac450c7afbb8a2dfe81 #import #import #import -@@ -234,6 +235,11 @@ static WallTime toSystemClockTime(NSDate *date) +@@ -234,6 +235,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple }); } @@ -10403,7 +10492,7 @@ index b1c6e033c8a86353f96161482d92c227d7946201..64e592705c97d2d78668aa532f271ddf #import "WKObject.h" #import diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h -index a4b6d757e066334af98dec218ac52261b9d5ccd8..2c2e3c70b4bb9a4ddcd2ba2afd5af842d9b59eb6 100644 +index 5b5d106b46392ed95bc7bc6df74c9b43ad07627b..846b2bbbc19b17fa4a2b8d14751b7c5c44beb902 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h @@ -67,6 +67,7 @@ WK_CLASS_AVAILABLE(macos(10.10), ios(8.0)) @@ -10418,7 +10507,7 @@ diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/ index 2e235bb880c638a0e74256b6d66cb0244ea0a3f1..3471eebb47e860f7c2071d0e7f2691c9f0a6355d 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm -@@ -257,6 +257,16 @@ +@@ -257,6 +257,16 @@ - (BOOL)processSwapsOnNavigation return _processPoolConfiguration->processSwapsOnNavigation(); } @@ -16923,7 +17012,7 @@ index 51eb4833d140baef40501790ef05906c1f5285a0..86434813aebe0e5e1955a19c70a1e63c // 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 f69420b0b67e1d9d37b4af1feb3cea731f1f3285..00d99f5b7b192c650817302b5e38bc786f047d05 100644 +index c186e2e3cd9e2ef50c7bab0c3630e82380fce903..00d99f5b7b192c650817302b5e38bc786f047d05 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.h +++ b/Source/WebKit/UIProcess/WebPageProxy.h @@ -39,6 +39,7 @@ @@ -16977,15 +17066,7 @@ index f69420b0b67e1d9d37b4af1feb3cea731f1f3285..00d99f5b7b192c650817302b5e38bc78 class SharedBuffer; class SpeechRecognitionRequest; class TextIndicator; -@@ -399,7 +411,6 @@ struct EditingRange; - struct EditorState; - struct FrameTreeNodeData; - struct FocusedElementInformation; --struct FontInfo; - struct FrameInfoData; - struct InputMethodState; - struct InsertTextOptions; -@@ -543,6 +554,8 @@ public: +@@ -542,6 +554,8 @@ public: void setControlledByAutomation(bool); WebPageInspectorController& inspectorController() { return *m_inspectorController; } @@ -16994,7 +17075,7 @@ index f69420b0b67e1d9d37b4af1feb3cea731f1f3285..00d99f5b7b192c650817302b5e38bc78 #if PLATFORM(IOS_FAMILY) void showInspectorIndication(); -@@ -653,6 +666,11 @@ public: +@@ -652,6 +666,11 @@ public: void setPageLoadStateObserver(std::unique_ptr&&); @@ -17006,7 +17087,7 @@ index f69420b0b67e1d9d37b4af1feb3cea731f1f3285..00d99f5b7b192c650817302b5e38bc78 void initializeWebPage(); void setDrawingArea(std::unique_ptr&&); -@@ -680,6 +698,7 @@ public: +@@ -679,6 +698,7 @@ public: void closePage(); void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&); @@ -17014,7 +17095,7 @@ index f69420b0b67e1d9d37b4af1feb3cea731f1f3285..00d99f5b7b192c650817302b5e38bc78 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); -@@ -1213,6 +1232,7 @@ public: +@@ -1212,6 +1232,7 @@ public: #endif void pageScaleFactorDidChange(double); @@ -17022,7 +17103,7 @@ index f69420b0b67e1d9d37b4af1feb3cea731f1f3285..00d99f5b7b192c650817302b5e38bc78 void pluginScaleFactorDidChange(double); void pluginZoomFactorDidChange(double); -@@ -1300,14 +1320,20 @@ public: +@@ -1299,14 +1320,20 @@ public: void didStartDrag(); void dragCancelled(); void setDragCaretRect(const WebCore::IntRect&); @@ -17044,7 +17125,7 @@ index f69420b0b67e1d9d37b4af1feb3cea731f1f3285..00d99f5b7b192c650817302b5e38bc78 #endif void processDidBecomeUnresponsive(); -@@ -1558,6 +1584,8 @@ public: +@@ -1557,6 +1584,8 @@ public: #if PLATFORM(COCOA) || PLATFORM(GTK) RefPtr takeViewSnapshot(std::optional&&); @@ -17053,7 +17134,7 @@ index f69420b0b67e1d9d37b4af1feb3cea731f1f3285..00d99f5b7b192c650817302b5e38bc78 #endif #if ENABLE(WEB_CRYPTO) -@@ -2734,6 +2762,7 @@ private: +@@ -2733,6 +2762,7 @@ private: String m_overrideContentSecurityPolicy; RefPtr m_inspector; @@ -17061,7 +17142,7 @@ index f69420b0b67e1d9d37b4af1feb3cea731f1f3285..00d99f5b7b192c650817302b5e38bc78 #if PLATFORM(COCOA) WeakObjCPtr m_cocoaView; -@@ -3003,6 +3032,20 @@ private: +@@ -3002,6 +3032,20 @@ private: unsigned m_currentDragNumberOfFilesToBeAccepted { 0 }; WebCore::IntRect m_currentDragCaretRect; WebCore::IntRect m_currentDragCaretEditableElementRect; @@ -17082,7 +17163,7 @@ index f69420b0b67e1d9d37b4af1feb3cea731f1f3285..00d99f5b7b192c650817302b5e38bc78 #endif PageLoadState m_pageLoadState; -@@ -3213,6 +3256,9 @@ private: +@@ -3212,6 +3256,9 @@ private: RefPtr messageBody; }; Vector m_pendingInjectedBundleMessages; @@ -19243,10 +19324,10 @@ index 0000000000000000000000000000000000000000..c3d7cacea987ba2b094d5022c670705e + +} // namespace WebKit diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d07113151d306549 100644 +index 19cd9ecd9904a068cb25af242dc557c2ab19bc47..c9ed861f1c6848fb16297fff72423b6000578d4f 100644 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj -@@ -1243,6 +1243,7 @@ +@@ -1242,6 +1242,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 */; }; @@ -19254,7 +19335,7 @@ index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d0711315 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 */; }; -@@ -2220,6 +2221,18 @@ +@@ -2222,6 +2223,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 */; }; @@ -19273,7 +19354,7 @@ index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d0711315 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 */; }; -@@ -2281,6 +2294,8 @@ +@@ -2283,6 +2296,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 */; }; @@ -19282,7 +19363,7 @@ index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d0711315 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 */; }; -@@ -2297,6 +2312,9 @@ +@@ -2299,6 +2314,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, ); }; }; @@ -19300,7 +19381,7 @@ index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d0711315 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 = ""; }; -@@ -6968,6 +6987,19 @@ +@@ -6974,6 +6993,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 = ""; }; @@ -19320,7 +19401,7 @@ index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d0711315 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 = ""; }; -@@ -7096,6 +7128,8 @@ +@@ -7102,6 +7134,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; }; @@ -19329,7 +19410,7 @@ index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d0711315 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; }; -@@ -7117,6 +7151,14 @@ +@@ -7123,6 +7157,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 = ""; }; @@ -19344,31 +19425,31 @@ index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d0711315 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 = ""; }; -@@ -7253,6 +7295,7 @@ +@@ -7256,6 +7298,7 @@ + files = ( + 3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */, + 3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */, ++ F33C7AC7249AD79C0018BE41 /* libwebrtc.dylib in Frameworks */, 3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */, 37694525184FC6B600CDE21F /* Security.framework in Frameworks */, 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */, -+ F33C7AC7249AD79C0018BE41 /* libwebrtc.dylib in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -@@ -9350,6 +9393,7 @@ - 37C4C08318149C2A003688B9 /* Cocoa */ = { - isa = PBXGroup; - children = ( +@@ -9398,6 +9441,7 @@ + 99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */, + 990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */, + 990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */, + D71A94492372290B002C4D9E /* _WKBrowserInspector.h */, - 1A43E826188F38E2009E4D30 /* Deprecated */, - 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */, - 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */, -@@ -10478,6 +10522,7 @@ + 5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */, + 5C4609E322430E4D009943C2 /* _WKContentRuleListAction.mm */, + 5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */, +@@ -10487,6 +10531,7 @@ + E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */, E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */, DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */, - 57A9FF15252C6AEF006A2040 /* libWTF.a */, + F33C7AC6249AD79C0018BE41 /* libwebrtc.dylib */, + 57A9FF15252C6AEF006A2040 /* libWTF.a */, 5750F32A2032D4E500389347 /* LocalAuthentication.framework */, 570DAAB0230273D200E8FC04 /* NearField.framework */, - 51F7BB7E274564A100C45A72 /* Security.framework */, -@@ -11004,6 +11049,12 @@ +@@ -11014,6 +11059,12 @@ children = ( 9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */, 9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */, @@ -19381,7 +19462,7 @@ index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d0711315 ); path = Agents; sourceTree = ""; -@@ -11012,6 +11063,7 @@ +@@ -11022,6 +11073,7 @@ isa = PBXGroup; children = ( A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */, @@ -19389,40 +19470,68 @@ index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d0711315 1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */, 99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */, 99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */, -@@ -11532,6 +11584,12 @@ - BC032DC310F438260058C15A /* UIProcess */ = { - isa = PBXGroup; - children = ( -+ D76D6887238DBD80008D314B /* InspectorDialogAgent.h */, +@@ -11566,6 +11618,7 @@ + E1513C65166EABB200149FCB /* AuxiliaryProcessProxy.h */, + 46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */, + 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */, + D71A944B237239FB002C4D9E /* BrowserInspectorPipe.h */, + 4659F25E275FF6B200BBB369 /* CaptivePortalModeObserver.h */, + 07297F9C1C1711EA003F0735 /* DeviceIdHashSaltStorage.cpp */, + 07297F9D1C17BBEA223F0735 /* DeviceIdHashSaltStorage.h */, +@@ -11583,6 +11636,8 @@ + 2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */, + 839A2F2F1E2067390039057E /* HighPerformanceGraphicsUsageSampler.cpp */, + 839A2F301E2067390039057E /* HighPerformanceGraphicsUsageSampler.h */, ++ D76D6887238DBD80008D314B /* InspectorDialogAgent.h */, ++ D71A94332370E07A002C4D9E /* InspectorPlaywrightAgentClient.h */, + 5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */, + 5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */, + 31607F3819627002009B87DA /* LegacySessionStateCoding.h */, +@@ -11612,6 +11667,7 @@ + 1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */, + 1AEE57232409F142002005D6 /* QuickLookThumbnailLoader.h */, + 1AEE57242409F142002005D6 /* QuickLookThumbnailLoader.mm */, ++ D71A94392370F060002C4D9E /* RemoteInspectorPipe.h */, + BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */, + 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */, + 5CA98549210BEB5A0057EB6B /* SafeBrowsingWarning.h */, +@@ -11712,6 +11768,8 @@ + BC7B6204129A0A6700D174A4 /* WebPageGroup.h */, + 2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */, + 2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */, + D71A943F2371F67E002C4D9E /* WebPageInspectorEmulationAgent.h */, + D71A94402371F67E002C4D9E /* WebPageInspectorInputAgent.h */, -+ D71A94392370F060002C4D9E /* RemoteInspectorPipe.h */, -+ D71A94332370E07A002C4D9E /* InspectorPlaywrightAgentClient.h */, - BC032DC410F4387C0058C15A /* API */, - 512F588D12A8836F00629530 /* Authentication */, - 9955A6E81C79809000EB6A93 /* Automation */, -@@ -11840,6 +11898,7 @@ - BC0C376610F807660076D7CB /* C */ = { - isa = PBXGroup; - children = ( + BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */, + BC032DCB10F4389F0058C15A /* WebPageProxy.h */, + BCBD38FA125BAB9A00D2C29F /* WebPageProxy.messages.in */, +@@ -11864,6 +11922,7 @@ + BC646C1911DD399F006455B0 /* WKBackForwardListItemRef.h */, + BC646C1611DD399F006455B0 /* WKBackForwardListRef.cpp */, + BC646C1711DD399F006455B0 /* WKBackForwardListRef.h */, + D71A942C2370DF81002C4D9E /* WKBrowserInspector.h */, - 5123CF18133D25E60056F800 /* cg */, - 6EE849C41368D9040038D481 /* mac */, - BCB63477116BF10600603215 /* WebKit2_C.h */, -@@ -12430,6 +12489,11 @@ - BCCF085C113F3B7500C650C5 /* mac */ = { - isa = PBXGroup; - children = ( -+ D7EB04E62372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm */, + BCB9E24A1120E15C00A137E0 /* WKContext.cpp */, + BCB9E2491120E15C00A137E0 /* WKContext.h */, + 1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */, +@@ -12448,6 +12507,9 @@ + C18173602058424700DFDA65 /* DisplayLink.h */, + 31ABA79C215AF9E000C90E31 /* HighPerformanceGPUManager.h */, + 31ABA79D215AF9E000C90E31 /* HighPerformanceGPUManager.mm */, + D71A94302370E025002C4D9E /* InspectorPlaywrightAgentClientMac.h */, ++ D7EB04E62372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm */, ++ D79902AF236E9404005D6F7E /* InspectorTargetProxyMac.mm */, + 1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */, + 0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */, + 0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */, +@@ -12474,6 +12536,8 @@ + E568B92120A3AC6A00E3C856 /* WebDataListSuggestionsDropdownMac.mm */, + E55CD20124D09F1F0042DB9C /* WebDateTimePickerMac.h */, + E55CD20224D09F1F0042DB9C /* WebDateTimePickerMac.mm */, + D79902AE236E9404005D6F7E /* WebPageInspectorEmulationAgentMac.mm */, + D79902B0236E9404005D6F7E /* WebPageInspectorInputAgentMac.mm */, -+ D79902AF236E9404005D6F7E /* InspectorTargetProxyMac.mm */, - B878B613133428DC006888E9 /* CorrectionPanel.h */, - B878B614133428DC006888E9 /* CorrectionPanel.mm */, - 07EF07592745A8160066EA04 /* DisplayCaptureSessionManager.h */, -@@ -13648,6 +13712,7 @@ + BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */, + BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */, + BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */, +@@ -13658,6 +13722,7 @@ 99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */, 990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */, 990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */, @@ -19430,39 +19539,27 @@ index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d0711315 5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */, 5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */, 1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */, -@@ -14115,6 +14180,7 @@ - 1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */, - 1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */, - 5C121E842410208D00486F9B /* FrameTreeNodeData.h in Headers */, -+ F303B849249A8D640031DE5C /* ScreencastEncoder.h in Headers */, - 2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */, - CD78E1151DB7D7ED0014A2DE /* FullscreenClient.h in Headers */, - CD19D2EA2046406F0017074A /* FullscreenTouchSecheuristic.h in Headers */, -@@ -14129,6 +14195,7 @@ - 2DA944A41884E4F000ED86DB /* GestureTypes.h in Headers */, - 4614F13225DED875007006E7 /* GPUProcessConnectionParameters.h in Headers */, - 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */, -+ D71A94342370E07A002C4D9E /* InspectorPlaywrightAgentClient.h in Headers */, - C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */, - 1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */, - 57AC8F50217FEED90055438C /* HidConnection.h in Headers */, -@@ -14284,6 +14351,7 @@ - 413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */, - 41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */, - 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */, -+ D71A94422371F67E002C4D9E /* WebPageInspectorEmulationAgent.h in Headers */, - 532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */, - 417915B92257046F00D6F97E /* NetworkSocketChannel.h in Headers */, - 93085DE026E5BCFD000EC6A7 /* NetworkStorageManager.h in Headers */, -@@ -14349,6 +14417,7 @@ - 93E05E40282CD560000B69EB /* ProcessStateMonitor.h in Headers */, - 463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */, - 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */, +@@ -13906,6 +13971,7 @@ + E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */, + 4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */, + 1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */, + D71A944C237239FB002C4D9E /* BrowserInspectorPipe.h in Headers */, - 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */, - 2D279E1926955768004B3EEB /* PrototypeToolsSPI.h in Headers */, - 517B5F81275E97B6002DC22D /* PushAppBundle.h in Headers */, -@@ -14380,6 +14449,7 @@ + BC3065FA1259344E00E71278 /* CacheModel.h in Headers */, + 41897ED81F415D8A0016FA42 /* CacheStorageEngine.h in Headers */, + 41FABD2A1F4DE001006A6C97 /* CacheStorageEngineCache.h in Headers */, +@@ -14172,7 +14238,11 @@ + 2DD45ADE1E5F8972006C355F /* InputViewUpdateDeferrer.h in Headers */, + CE550E152283752200D28791 /* InsertTextOptions.h in Headers */, + 9197940523DBC4BB00257892 /* InspectorBrowserAgent.h in Headers */, ++ D76D6888238DBD81008D314B /* InspectorDialogAgent.h in Headers */, + 996B2B9D25E257FF00719379 /* InspectorExtensionDelegate.h in Headers */, ++ D71A94342370E07A002C4D9E /* InspectorPlaywrightAgentClient.h in Headers */, ++ D71A94322370E025002C4D9E /* InspectorPlaywrightAgentClientMac.h in Headers */, ++ F3867F0A24607D4E008F0F31 /* InspectorScreencastAgent.h in Headers */, + A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */, + 51E9049C27BCB9D400929E7E /* InstallCoordinationSPI.h in Headers */, + C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */, +@@ -14392,6 +14462,7 @@ CDAC20CA23FC2F750021DEE3 /* RemoteCDMInstanceSession.h in Headers */, CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */, F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */, @@ -19470,39 +19567,24 @@ index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d0711315 2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */, 2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */, 1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */, -@@ -14790,6 +14860,7 @@ +@@ -14450,6 +14521,7 @@ + E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */, + E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */, + 7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */, ++ F303B849249A8D640031DE5C /* ScreencastEncoder.h in Headers */, + E4D54D0421F1D72D007E3C36 /* ScrollingTreeFrameScrollingNodeRemoteIOS.h in Headers */, + 0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */, + 0F931C1C18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.h in Headers */, +@@ -14798,6 +14870,8 @@ + 2D9EA30F1A96CBFF002D2807 /* WebPageInjectedBundleClient.h in Headers */, + 9197940823DBC4CB00257892 /* WebPageInspectorAgentBase.h in Headers */, + A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */, ++ D71A94422371F67E002C4D9E /* WebPageInspectorEmulationAgent.h in Headers */, ++ D71A94432371F67E002C4D9E /* WebPageInspectorInputAgent.h in Headers */, + A543E30C215C8A8D00279CD9 /* WebPageInspectorTarget.h in Headers */, A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */, A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */, - C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */, -+ F3867F0A24607D4E008F0F31 /* InspectorScreencastAgent.h in Headers */, - 2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */, - 46C392292316EC4D008EED9B /* WebPageProxyIdentifier.h in Headers */, - BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */, -@@ -14971,6 +15042,7 @@ - BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */, - BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */, - BC49862F124D18C100D834E1 /* WKBundleHitTestResult.h in Headers */, -+ D71A94432371F67E002C4D9E /* WebPageInspectorInputAgent.h in Headers */, - BC204EF211C83EC8008F3375 /* WKBundleInitialize.h in Headers */, - 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */, - 1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */, -@@ -15025,6 +15097,7 @@ - 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */, - 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */, - 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */, -+ D76D6888238DBD81008D314B /* InspectorDialogAgent.h in Headers */, - A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */, - BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */, - 9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */, -@@ -15183,6 +15256,7 @@ - 1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */, - 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */, - 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */, -+ D71A94322370E025002C4D9E /* InspectorPlaywrightAgentClientMac.h in Headers */, - 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */, - 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */, - BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */, -@@ -16691,6 +16765,8 @@ +@@ -16703,6 +16777,8 @@ 51E9049727BCB3D900929E7E /* ICAppBundle.mm in Sources */, 2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */, 2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */, @@ -19511,7 +19593,7 @@ index 67b4c354dc3141b85ddf98cb9008bf047d4c3bce..49bfaec0e5a38f52fa9bd717d0711315 C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */, C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */, 2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */, -@@ -17025,6 +17101,8 @@ +@@ -17037,6 +17113,8 @@ E3816B3D27E2463A005EAFC0 /* WebMockContentFilterManager.cpp in Sources */, 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */, 2DF6FE52212E110900469030 /* WebPage.cpp in Sources */, @@ -20670,7 +20752,7 @@ diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegac index 5fa2c59e5e93bc923d37ae5bb751e2f4d7fe68ee..73378254b62a7ec61b3efc3fd46aadaf45d55601 100644 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -@@ -4189,7 +4189,7 @@ static BOOL currentScrollIsBlit(NSView *clipView) +@@ -4189,7 +4189,7 @@ - (void)mouseDown:(WebEvent *)event _private->handlingMouseDownEvent = NO; } @@ -20683,7 +20765,7 @@ diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/ma index 59cecf9242ab834dadc904ef295365e1476f47f9..ca4cc96e62df62e92c22c3535f5972cc1fdc4cba 100644 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm -@@ -4039,7 +4039,7 @@ IGNORE_WARNINGS_END +@@ -4039,7 +4039,7 @@ + (void)_doNotStartObservingNetworkReachability } #endif // PLATFORM(IOS_FAMILY) @@ -20692,7 +20774,7 @@ index 59cecf9242ab834dadc904ef295365e1476f47f9..ca4cc96e62df62e92c22c3535f5972cc - (NSArray *)_touchEventRegions { -@@ -4081,7 +4081,7 @@ IGNORE_WARNINGS_END +@@ -4081,7 +4081,7 @@ - (NSArray *)_touchEventRegions }).autorelease(); } @@ -21677,10 +21759,10 @@ index 0000000000000000000000000000000000000000..3618075f10824beb0bc6cd8070772ab8 +#endif // USE(ATSPI) diff --git a/Tools/WebKitTestRunner/InjectedBundle/empty/AccessibilityUIElementEmpty.cpp b/Tools/WebKitTestRunner/InjectedBundle/empty/AccessibilityUIElementEmpty.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..b52141c28ad89e0486d3bbdae5f9f86dc88f5f3f +index 0000000000000000000000000000000000000000..fb739f862252dcdda61aa08e8e4861f8ba06d76c --- /dev/null +++ b/Tools/WebKitTestRunner/InjectedBundle/empty/AccessibilityUIElementEmpty.cpp -@@ -0,0 +1,1026 @@ +@@ -0,0 +1,1044 @@ +/* + * Copyright (C) 2022 Microsoft Corporation. + * @@ -21981,6 +22063,24 @@ index 0000000000000000000000000000000000000000..b52141c28ad89e0486d3bbdae5f9f86d + return nullptr; +} + ++bool AccessibilityUIElement::isAtomicLiveRegion() const ++{ ++ notImplemented(); ++ return false; ++} ++ ++JSRetainPtr AccessibilityUIElement::liveRegionRelevant() const ++{ ++ notImplemented(); ++ return nullptr; ++} ++ ++JSRetainPtr AccessibilityUIElement::liveRegionStatus() const ++{ ++ notImplemented(); ++ return nullptr; ++} ++ +JSRetainPtr AccessibilityUIElement::stringValue() +{ + notImplemented(); @@ -22764,7 +22864,7 @@ index 16253216895fd73900d22fb2d8b6741310c2f4bc..8b67a71bf5d2b6909eb36d0e54180c29 decidePolicyForMediaKeySystemPermissionRequest, nullptr, // requestWebAuthenticationNoGesture diff --git a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm -index 3a231b168583cfc378fb67ff42b108c747dd0733..2b0971a411f87be622cf53536f107a446a6d659f 100644 +index b0a503013185f29feeca47e4313b27e349973c02..ee1f87780a99b2b626b1ada984d6310975076019 100644 --- a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm +++ b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm @@ -896,4 +896,51 @@ void EventSenderProxy::scaleGestureEnd(double scale)