Attachment 340718 Details for Bug 185774 – Patch

[patch] Patch

bug-185774-20180518113653.patch (text/plain), 5.75 KB, created by Daniel Bates on 2018-05-18 11:36:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-05-18 11:36:53 PDT

Size: 5.75 KB

patch

obsolete

>Subversion Revision: 231965
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 5dc6da1b4a1356f96d9a1e83f25b403188f149ea..83da7b5dd2fba433d30a53f57c0df1f95dc76ba9 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,28 @@
>+2018-05-18  Daniel Bates  <dabates@apple.com>
>+
>+        "debug-safari --ios-simulator" creates lldb target to launch Mac Safari
>+        https://bugs.webkit.org/show_bug.cgi?id=185774
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        For now, the script debug-safari is not supported for WebKit for iOS. To
>+        fix this we differentiate between the Apple Mac port and Apple embedded
>+        ports.
>+
>+        * Scripts/webkitdirs.pm:
>+        (safariPath): Substitute isAppleMacWebKit() for isAppleCocoaWebKit().
>+        (builtDylibPathForName): Ditto.
>+        (isAppleMacWebKit): Added.
>+        (isAppleCocoaWebKit): Write in terms of isAppleMacWebKit() and isEmbeddedWebKit().
>+        (launcherName): Substitute isAppleMacWebKit() for isAppleCocoaWebKit().
>+        (mobileSafariBundle): Substitute isIOSWebKit() for isAppleCocoaWebKit().
>+        (debugSafari): Substitute isAppleMacWebKit() for isAppleCocoaWebKit().
>+        (runSafari): Ditto.
>+        (runMiniBrowser): Ditto.
>+        (debugMiniBrowser): Ditto.
>+        (runWebKitTestRunner): Ditto.
>+        (debugWebKitTestRunner): Ditto.
>+
> 2018-05-18  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [Win][MiniBrowser] Create MainWindow even in transparent mode
>diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
>index 7d05f48faa63daabe642f483a930396ce7472983..c3f6ded16156e3ef35b73800b9e6929e770bac93 100755
>--- a/Tools/Scripts/webkitdirs.pm
>+++ b/Tools/Scripts/webkitdirs.pm
>@@ -989,7 +989,7 @@ sub setArchitecture
> # Locate Safari.
> sub safariPath
> {
>-    die "Safari path is only relevant on Apple Mac platform\n" unless isAppleCocoaWebKit();
>+    die "Safari path is only relevant on Apple Mac platform\n" unless isAppleMacWebKit();
> 
>     my $safariPath;
> 
>@@ -1025,7 +1025,7 @@ sub builtDylibPathForName
>     if (isIOSWebKit()) {
>         return "$configurationProductDir/$libraryName.framework/$libraryName";
>     }
>-    if (isAppleCocoaWebKit()) {
>+    if (isAppleMacWebKit()) {
>         return "$configurationProductDir/$libraryName.framework/Versions/A/$libraryName";
>     }
>     if (isAppleWinWebKit()) {
>@@ -1373,14 +1373,39 @@ sub isCrossCompilation()
>     return 0;
> }
> 
>+sub isIOSWebKit()
>+{
>+    return portName() eq iOS;
>+}
>+
>+sub isTVOSWebKit()
>+{
>+    return portName() eq tvOS;
>+}
>+
>+sub isWatchOSWebKit()
>+{
>+    return portName() eq watchOS;
>+}
>+
>+sub isEmbeddedWebKit()
>+{
>+    return isIOSWebKit() || isTVOSWebKit() || isWatchOSWebKit();
>+}
>+
> sub isAppleWebKit()
> {
>     return isAppleCocoaWebKit() || isAppleWinWebKit();
> }
> 
>+sub isAppleMacWebKit()
>+{
>+    return portName() eq Mac;
>+}
>+
> sub isAppleCocoaWebKit()
> {
>-    return (portName() eq Mac) || isIOSWebKit() || isTVOSWebKit() || isWatchOSWebKit();
>+    return isAppleMacWebKit() || isEmbeddedWebKit();
> }
> 
> sub isAppleWinWebKit()
>@@ -1466,26 +1491,6 @@ sub willUseWatchSimulatorSDK()
>     return xcodeSDKPlatformName() eq "watchsimulator";
> }
> 
>-sub isIOSWebKit()
>-{
>-    return portName() eq iOS;
>-}
>-
>-sub isTVOSWebKit()
>-{
>-    return portName() eq tvOS;
>-}
>-
>-sub isWatchOSWebKit()
>-{
>-    return portName() eq watchOS;
>-}
>-
>-sub isEmbeddedWebKit()
>-{
>-    return isIOSWebKit() || isTVOSWebKit() || isWatchOSWebKit();
>-}
>-
> sub determineNmPath()
> {
>     return if $nmPath;
>@@ -1647,7 +1652,7 @@ sub launcherName()
> {
>     if (isGtk()) {
>         return "MiniBrowser";
>-    } elsif (isAppleCocoaWebKit()) {
>+    } elsif (isAppleMacWebKit()) {
>         return "Safari";
>     } elsif (isAppleWinWebKit()) {
>         return "MiniBrowser";
>@@ -2410,7 +2415,7 @@ sub mobileSafariBundle()
>     determineConfigurationProductDir();
> 
>     # Use MobileSafari.app in product directory if present.
>-    if (isAppleCocoaWebKit() && -d "$configurationProductDir/MobileSafari.app") {
>+    if (isIOSWebKit() && -d "$configurationProductDir/MobileSafari.app") {
>         return "$configurationProductDir/MobileSafari.app";
>     }
>     return installedMobileSafariBundle();
>@@ -2723,7 +2728,7 @@ sub execMacWebKitAppForDebugging($)
> 
> sub debugSafari
> {
>-    if (isAppleCocoaWebKit()) {
>+    if (isAppleMacWebKit()) {
>         checkFrameworks();
>         execMacWebKitAppForDebugging(safariPath());
>     }
>@@ -2737,7 +2742,7 @@ sub runSafari
>         return runIOSWebKitApp(mobileSafariBundle());
>     }
> 
>-    if (isAppleCocoaWebKit()) {
>+    if (isAppleMacWebKit()) {
>         return runMacWebKitApp(safariPath());
>     }
> 
>@@ -2752,20 +2757,19 @@ sub runSafari
> 
> sub runMiniBrowser
> {
>-    if (isAppleCocoaWebKit()) {
>+    if (isAppleMacWebKit()) {
>         return runMacWebKitApp(File::Spec->catfile(productDir(), "MiniBrowser.app", "Contents", "MacOS", "MiniBrowser"));
>-    } elsif (isAppleWinWebKit()) {
>-        my $result;
>+    }
>+    if (isAppleWinWebKit()) {
>         my $webKitLauncherPath = File::Spec->catfile(executableProductDir(), "MiniBrowser.exe");
>         return system { $webKitLauncherPath } $webKitLauncherPath, @ARGV;
>     }
>-
>     return 1;
> }
> 
> sub debugMiniBrowser
> {
>-    if (isAppleCocoaWebKit()) {
>+    if (isAppleMacWebKit()) {
>         execMacWebKitAppForDebugging(File::Spec->catfile(productDir(), "MiniBrowser.app", "Contents", "MacOS", "MiniBrowser"));
>     }
>     
>@@ -2774,7 +2778,7 @@ sub debugMiniBrowser
> 
> sub runWebKitTestRunner
> {
>-    if (isAppleCocoaWebKit()) {
>+    if (isAppleMacWebKit()) {
>         return runMacWebKitApp(File::Spec->catfile(productDir(), "WebKitTestRunner"));
>     }
> 
>@@ -2783,7 +2787,7 @@ sub runWebKitTestRunner
> 
> sub debugWebKitTestRunner
> {
>-    if (isAppleCocoaWebKit()) {
>+    if (isAppleMacWebKit()) {
>         execMacWebKitAppForDebugging(File::Spec->catfile(productDir(), "WebKitTestRunner"));
>     }
>

Flags:

aestes: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 185774: 340718