commit 0b050654bb55c4667e04abbae0079c8848071fe7
author dfarler@apple.com <dfarler@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Jun 28 20:38:55 2013 +0000
committer dfarler@apple.com <dfarler@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Jun 28 20:38:55 2013 +0000
tree 0a1cdc44f1f3e4ddabbad6afaf14966b616ebece
parent eca78b0fb12e60cb4c61dc3ce534aa03bab8fa5c

Upstream WebKit Nightly’s WebKitLauncher
https://bugs.webkit.org/show_bug.cgi?id=117418

Reviewed by Mark Rowe.

Literal patch from Nightly's OpenSource repo.

* WebKitLauncher/Configurations/Base.xcconfig:
* WebKitLauncher/Configurations/WebKitLauncher.xcconfig:
* WebKitLauncher/Info.plist:
* WebKitLauncher/WebKitLauncher.xcodeproj/project.pbxproj:
* WebKitLauncher/WebKitLauncherURLProtocol.m:
(+[WebKitLauncherURLProtocol load]):
(+[WebKitLauncherURLProtocol canInitWithRequest:]):
(-[WebKitLauncherURLProtocol startLoading]):
(-[WebKitLauncherURLProtocol handleWebKitVersionInformation]):
(-[WebKitLauncherURLProtocol resourceNotFound]):
* WebKitLauncher/WebKitNightlyEnablerSparkle.m:
(initializeSparkle):
* WebKitLauncher/main.m:
(determineExecutablePath):
(currentMacOSXVersion):
(main):
* WebKitLauncher/start.html:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@152186 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/WebKitLauncher/WebKitNightlyEnablerSparkle.m

diff --git a/Tools/WebKitLauncher/WebKitNightlyEnablerSparkle.m b/Tools/WebKitLauncher/WebKitNightlyEnablerSparkle.m
index 8b13ab8..d604072 100644
--- a/Tools/WebKitLauncher/WebKitNightlyEnablerSparkle.m
+++ b/Tools/WebKitLauncher/WebKitNightlyEnablerSparkle.m
@@ -102,19 +102,6 @@
 
 @end
 
-#if __LP64__
-
-#define setMethodImplementation method_setImplementation
-
-#else
-
-static void setMethodImplementation(Method m, IMP imp)
-{
-    m->method_imp = imp;
-}
-
-#endif
-
 static NSString *userAgentStringForSparkle()
 {
     NSBundle *safariBundle = [NSBundle mainBundle];
@@ -130,10 +117,10 @@
 {
     // Override some Sparkle behaviour
     Method methodToPatch = class_getInstanceMethod(objc_getRequiredClass("SUUpdatePermissionPrompt"), @selector(promptDescription));
-    setMethodImplementation(methodToPatch, (IMP)updatePermissionPromptDescription);
+    method_setImplementation(methodToPatch, (IMP)updatePermissionPromptDescription);
 
     methodToPatch = class_getInstanceMethod(objc_getRequiredClass("SUUpdateAlert"), @selector(initWithAppcastItem:host:));
-    setMethodImplementation(methodToPatch, (IMP)updateAlertInitForAlertPanel);
+    method_setImplementation(methodToPatch, (IMP)updateAlertInitForAlertPanel);
 
     SUUpdater *updater = [SUUpdater updaterForBundle:webKitLauncherBundle()];
     [updater setUserAgentString:userAgentStringForSparkle()];