Changeset 44680 in webkit

Timestamp:

Jun 15, 2009 12:37:38 AM (15 years ago)

Author:

mrowe@apple.com

Message:

Fix <​https://bugs.webkit.org/show_bug.cgi?id=26312>.
Bug 26312: Multiple copies of Safari opened with WebKit nightly and Safari 3.2.3

Reviewed by Cameron Zwarich.

Skip the trampoline detection for versions of Safari < 4.0 as they don't play these
tricks, and having WebKitNightlyEnabler assume that we were in the trampoline was
preventing our LaunchServices trickery from being run. This led to fresh copies of
WebKit.app being launched when a URL or file was opened from an external application
rather than the existing instance being reused.

• WebKitLauncher/WebKitNightlyEnabler.m:

(insideSafari4OnTigerTrampoline):
(enableWebKitNightlyBehaviour):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• WebKitLauncher/WebKitNightlyEnabler.m (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-06-15  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Cameron Zwarich.
+
+        Fix <https://bugs.webkit.org/show_bug.cgi?id=26312>.
+        Bug 26312: Multiple copies of Safari opened with WebKit nightly and Safari 3.2.3
+
+        Skip the trampoline detection for versions of Safari < 4.0 as they don't play these
+        tricks, and having WebKitNightlyEnabler assume that we were in the trampoline was
+        preventing our LaunchServices trickery from being run.  This led to fresh copies of
+        WebKit.app being launched when a URL or file was opened from an external application
+        rather than the existing instance being reused.
+
+        * WebKitLauncher/WebKitNightlyEnabler.m:
+        (insideSafari4OnTigerTrampoline):
+        (enableWebKitNightlyBehaviour):
+
 2009-06-13  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/WebKitLauncher/WebKitNightlyEnabler.m

@@ -129 +129 @@
 }
 
-static BOOL insideSafariOnTigerTrampoline()
-{
-    SInt32 version;
-    if (Gestalt(gestaltSystemVersion, &version) != noErr)
+static BOOL insideSafari4OnTigerTrampoline()
+{
+    SInt32 systemVersion;
+    if (Gestalt(gestaltSystemVersion, &systemVersion) != noErr)
         return NO;
 
     // If we're not on Tiger then we can't be in the trampoline state.
-    if ((version & 0xFFF0) != 0x1040)
+    if ((systemVersion & 0xFFF0) != 0x1040)
+        return NO;
+
+    // If we're running Safari < 4.0 then we can't be in the trampoline state.
+    CFBundleRef safariBundle = CFBundleGetMainBundle();
+    CFStringRef safariVersion = CFBundleGetValueForInfoDictionaryKey(safariBundle, CFSTR("CFBundleShortVersionString"));
+    if ([(NSString *)safariVersion intValue] < 4)
         return NO;
 
@@ -153 +159 @@
     // If we're inside Safari in its trampoline state, it will very shortly relaunch itself.
     // We bail out here so that we'll be called again in the freshly-launched Safari process.
-    if (insideSafariOnTigerTrampoline())
+    if (insideSafari4OnTigerTrampoline())
         return;