diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 1170287d2e..da3796329f 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1671 -Changed: dpino@igalia.com Mon Jun 27 17:53:44 CEST 2022 +1672 +Changed: yurys@chromium.org Mon Jun 27 16:23:58 PDT 2022 diff --git a/browser_patches/webkit/build.sh b/browser_patches/webkit/build.sh index dee53b66b7..063d2c413f 100755 --- a/browser_patches/webkit/build.sh +++ b/browser_patches/webkit/build.sh @@ -53,7 +53,7 @@ fi if is_mac; then selectXcodeVersionOrDie $(node "$SCRIPT_FOLDER/../get_xcode_version.js" webkit) - ./Tools/Scripts/build-webkit --release --touch-events --orientation-events --no-use-workspace + ./Tools/Scripts/build-webkit --release --touch-events --orientation-events elif is_linux; then if [[ $# == 0 || (-z "$1") ]]; then echo diff --git a/browser_patches/webkit/embedder/Playwright/Playwright.xcodeproj/project.pbxproj b/browser_patches/webkit/embedder/Playwright/Playwright.xcodeproj/project.pbxproj index 86a70cd278..e2dd63d3c4 100644 --- a/browser_patches/webkit/embedder/Playwright/Playwright.xcodeproj/project.pbxproj +++ b/browser_patches/webkit/embedder/Playwright/Playwright.xcodeproj/project.pbxproj @@ -30,7 +30,7 @@ 51E244F811EFCE07008228D2 /* MBToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBToolbarItem.h; sourceTree = ""; }; 51E244F911EFCE07008228D2 /* MBToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBToolbarItem.m; sourceTree = ""; }; 5C9332AE24C1349C0036DECF /* SecurityInterface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityInterface.framework; path = System/Library/Frameworks/SecurityInterface.framework; sourceTree = SDKROOT; }; - 7A8E843D26858D80008EC0B1 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Images.xcassets; sourceTree = ""; }; + 7A8E843D26858D80008EC0B1 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 8D1107320486CEB800E47091 /* Playwright.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Playwright.app; sourceTree = BUILT_PRODUCTS_DIR; }; A1B89B95221E027A00EB4CEB /* SDKVariant.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = SDKVariant.xcconfig; sourceTree = ""; }; BC329486116A92E2008635D1 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = mac/main.m; sourceTree = ""; }; @@ -41,6 +41,7 @@ BCA8CBDD11E578A000812FB8 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = ""; }; BCA8CBDE11E578A000812FB8 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = ""; }; BCA8CBDF11E578A000812FB8 /* Playwright.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Playwright.xcconfig; sourceTree = ""; }; + F393B1A6286A71AE007B8F61 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -118,6 +119,7 @@ 1058C7A2FEA54F0111CA2CBC /* Other Frameworks */, 1AFFEF761860EE6800DA465F /* Cocoa.framework */, 5C9332AE24C1349C0036DECF /* SecurityInterface.framework */, + F393B1A6286A71AE007B8F61 /* WebKit.framework */, ); name = Frameworks; sourceTree = ""; diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 2154963a56..e7f9a8218c 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -23106,3 +23106,42 @@ index 8b8ba5b934075fe53e231a418db17ddcf7ba92aa..08aba0aa37ffbbd5878befe05e2950ab +diff --git a/WebKit.xcworkspace/contents.xcworkspacedata b/WebKit.xcworkspace/contents.xcworkspacedata +index 8660306662de6faabab78662034958811e3e4a67..979c470d97950007ad990564eba18de965c295b2 100644 +--- a/WebKit.xcworkspace/contents.xcworkspacedata ++++ b/WebKit.xcworkspace/contents.xcworkspacedata +@@ -1,6 +1,9 @@ + + ++ ++ + + +diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme +index 0a7672a9d18fead0f7c0b451683835beff4f94a1..87ccc0e4fcb4a386165392fe8df6acade41b755e 100644 +--- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme ++++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme +@@ -188,6 +188,20 @@ + ReferencedContainer = "container:Tools/MiniBrowser/MiniBrowser.xcodeproj"> + + ++ ++ ++ ++ +