browser(webkit): rebase to 06/12/22 (r295478)

microsoft · Jun 13, 2022 · 1c3c97c · 1c3c97c
1 parent 41529bb
commit 1c3c97c
Show file tree

Hide file tree

Showing 6 changed files with 777 additions and 677 deletions.
diff --git 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
@@ -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
@@ -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 = "<group>";
@@ -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
@@ -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
+