From 43ecb8aa94f682c4e46d882d05de4631945d935e Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Tue, 13 Jul 2021 21:13:17 -0700 Subject: [PATCH] browser(webkit): compile device orientation on mac (#7595) --- browser_patches/webkit/BUILD_NUMBER | 4 ++-- browser_patches/webkit/patches/bootstrap.diff | 13 +++++++++++++ browser_patches/webkit/pw_run.sh | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 5504f8a82c..3672d17e99 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1512 -Changed: aslushnikov@gmail.com Tue Jul 13 17:11:05 UTC 2021 +1513 +Changed: pavel.feldman@gmail.com Tue Jul 13 20:08:24 PDT 2021 diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 5922b51344..daaf552286 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -2129,6 +2129,19 @@ index d10aa42b80a2b576c9e8c5c699a5d8b0ee2d8009..94ebea19af93d8282246c6af6e8d4a1e #endif #if !defined(ENABLE_TOUCH_ACTION_REGIONS) +diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h +index a9e10a2519e0939313bf2f58f4a9696ee21f57ad..e092b9c8180663afc80efc1ff5b7b1f98068b442 100644 +--- a/Source/WTF/wtf/PlatformEnableCocoa.h ++++ b/Source/WTF/wtf/PlatformEnableCocoa.h +@@ -200,7 +200,7 @@ + #define ENABLE_DATA_DETECTION 1 + #endif + +-#if !defined(ENABLE_DEVICE_ORIENTATION) && !PLATFORM(MAC) && !PLATFORM(MACCATALYST) ++#if !defined(ENABLE_DEVICE_ORIENTATION) && !PLATFORM(MACCATALYST) + #define ENABLE_DEVICE_ORIENTATION 1 + #endif + diff --git a/Source/WTF/wtf/PlatformGTK.cmake b/Source/WTF/wtf/PlatformGTK.cmake index 9bd5fde5bc38355e25bc09d05a045df31efaa259..3f3be653fef9930a7ac8a348c8b9f9a281eea363 100644 --- a/Source/WTF/wtf/PlatformGTK.cmake diff --git a/browser_patches/webkit/pw_run.sh b/browser_patches/webkit/pw_run.sh index 04a04303ae..10c166f234 100755 --- a/browser_patches/webkit/pw_run.sh +++ b/browser_patches/webkit/pw_run.sh @@ -2,7 +2,7 @@ function runOSX() { # if script is run as-is - if [[ -f "${SCRIPT_PATH}/EXPECTED_BUILDS" && -n "$WK_CHECKOUT_PATH" -d "$WK_CHECKOUT_PATH/WebKitBuild/Release/Playwright.app" ]]; then + if [[ -f "${SCRIPT_PATH}/EXPECTED_BUILDS" && -n "$WK_CHECKOUT_PATH" && -d "$WK_CHECKOUT_PATH/WebKitBuild/Release/Playwright.app" ]]; then DYLIB_PATH="$WK_CHECKOUT_PATH/WebKitBuild/Release" elif [[ -f "${SCRIPT_PATH}/EXPECTED_BUILDS" && -d $SCRIPT_PATH/checkout/WebKitBuild/Release/Playwright.app ]]; then DYLIB_PATH="$SCRIPT_PATH/checkout/WebKitBuild/Release"