Changeset 152182 in webkit

Timestamp:

Jun 28, 2013 11:57:39 AM (11 years ago)

Author:

andersca@apple.com

Message:

Make the UI process run the Java Updater
​https://bugs.webkit.org/show_bug.cgi?id=118197
<rdar://problem/14255677>

Reviewed by Sam Weinig.

Patch the relevant NSWorkspace method and pipe through the request to launch the Java updater to the UI process.

• PluginProcess/PluginProcess.h:
• PluginProcess/mac/PluginProcessMac.mm:

(WebKit::replacedNSWorkspace_launchApplicationAtURL_options_configuration_error):
(WebKit::initializeCocoaOverrides):
(WebKit::PluginProcess::launchApplicationAtURL):

• UIProcess/Plugins/PluginProcessProxy.h:
• UIProcess/Plugins/PluginProcessProxy.messages.in:
• UIProcess/Plugins/mac/PluginProcessProxyMac.mm:

(WebKit::isJavaUpdaterURL):
(WebKit::shouldLaunchApplicationAtURL):
(WebKit::PluginProcessProxy::launchApplicationAtURL):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/PluginProcess.h (modified) (1 diff)
• PluginProcess/mac/PluginProcessMac.mm (modified) (2 diffs)
• UIProcess/Plugins/PluginProcessProxy.h (modified) (1 diff)
• UIProcess/Plugins/PluginProcessProxy.messages.in (modified) (1 diff)
• UIProcess/Plugins/mac/PluginProcessProxyMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-06-28  Anders Carlsson  <andersca@apple.com>
+
+        Make the UI process run the Java Updater
+        https://bugs.webkit.org/show_bug.cgi?id=118197
+        <rdar://problem/14255677>
+
+        Reviewed by Sam Weinig.
+
+        Patch the relevant NSWorkspace method and pipe through the request to launch the Java updater to the UI process.
+
+        * PluginProcess/PluginProcess.h:
+        * PluginProcess/mac/PluginProcessMac.mm:
+        (WebKit::replacedNSWorkspace_launchApplicationAtURL_options_configuration_error):
+        (WebKit::initializeCocoaOverrides):
+        (WebKit::PluginProcess::launchApplicationAtURL):
+        * UIProcess/Plugins/PluginProcessProxy.h:
+        * UIProcess/Plugins/PluginProcessProxy.messages.in:
+        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+        (WebKit::isJavaUpdaterURL):
+        (WebKit::shouldLaunchApplicationAtURL):
+        (WebKit::PluginProcessProxy::launchApplicationAtURL):
+
 2013-06-28  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/PluginProcess/PluginProcess.h

@@ -59 +59 @@
 
     bool launchProcess(const String& launchPath, const Vector<String>& arguments);
+    bool launchApplicationAtURL(const String& urlString, const Vector<String>& arguments);
     bool openURL(const String& urlString, int32_t& status, String& launchedURLString);
 

trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm

@@ -280 +280 @@
 }
 
+static NSRunningApplication *(*NSWorkspace_launchApplicationAtURL_options_configuration_error)(NSWorkspace *, SEL, NSURL *, NSWorkspaceLaunchOptions, NSDictionary *, NSError **);
+
+static NSRunningApplication *replacedNSWorkspace_launchApplicationAtURL_options_configuration_error(NSWorkspace *self, SEL _cmd, NSURL *url, NSWorkspaceLaunchOptions options, NSDictionary *configuration, NSError **error)
+{
+    Vector<String> arguments;
+    if (NSArray *argumentsArray = [configuration objectForKey:NSWorkspaceLaunchConfigurationArguments]) {
+        if ([argumentsArray isKindOfClass:[NSArray array]]) {
+            for (NSString *argument in argumentsArray) {
+                if ([argument isKindOfClass:[NSString class]])
+                    arguments.append(argument);
+            }
+        }
+    }
+
+    if (PluginProcess::shared().launchApplicationAtURL(KURL(url).string(), arguments)) {
+        if (error)
+            *error = nil;
+        return nil;
+    }
+
+    return NSWorkspace_launchApplicationAtURL_options_configuration_error(self, _cmd, url, options, configuration, error);
+}
+
 static void initializeCocoaOverrides()
 {
     // Override -[NSConcreteTask launch:]
     Method launchMethod = class_getInstanceMethod(objc_getClass("NSConcreteTask"), @selector(launch));
-
     NSConcreteTask_launch = method_setImplementation(launchMethod, reinterpret_cast<IMP>(replacedNSConcreteTask_launch));
+
+    // Override -[NSWorkspace launchApplicationAtURL:options:configuration:error:]
+    Method launchApplicationAtURLOptionsConfigurationErrorMethod = class_getInstanceMethod(objc_getClass("NSWorkspace"), @selector(launchApplicationAtURL:options:configuration:error:));
+    NSWorkspace_launchApplicationAtURL_options_configuration_error = reinterpret_cast<NSRunningApplication *(*)(NSWorkspace *, SEL, NSURL *, NSWorkspaceLaunchOptions, NSDictionary *, NSError **)>(method_setImplementation(launchApplicationAtURLOptionsConfigurationErrorMethod, reinterpret_cast<IMP>(replacedNSWorkspace_launchApplicationAtURL_options_configuration_error)));
 
     // Override -[NSApplication runModalForWindow:]
@@ -328 +354 @@
 }
 
+bool PluginProcess::launchApplicationAtURL(const String& urlString, const Vector<String>& arguments)
+{
+    bool result = false;
+    if (!parentProcessConnection()->sendSync(Messages::PluginProcessProxy::LaunchApplicationAtURL(urlString, arguments), Messages::PluginProcessProxy::LaunchProcess::Reply(result), 0))
+        return false;
+
+    return result;
+}
+
 bool PluginProcess::openURL(const String& urlString, int32_t& status, String& launchedURLString)
 {

trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h

@@ -137 +137 @@
     void openPluginPreferencePane();
     void launchProcess(const String& launchPath, const Vector<String>& arguments, bool& result);
+    void launchApplicationAtURL(const String& urlString, const Vector<String>& arguments, bool& result);
     void openURL(const String& url, bool& result, int32_t& status, String& launchedURLString);
 #endif

trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.messages.in

@@ -39 +39 @@
     LaunchProcess(WTF::String launchPath, Vector<WTF::String> arguments) -> (bool result)
 
+    # Returns true if the UI process launched the application.
+    LaunchApplicationAtURL(WTF::String url, Vector<WTF::String> arguments) -> (bool result)
+
     # Returns true if the UI process did open the URL.
     OpenURL(WTF::String urlString) -> (bool result, int32_t status, WTF::String launchedURLString)

trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm

@@ -398 +398 @@
 }
 
+static bool isJavaUpdaterURL(const PluginProcessAttributes& pluginProcessAttributes, const String& urlString)
+{
+    NSURL *javaUpdaterURL = [NSURL fileURLWithPathComponents:[NSArray arrayWithObjects:(NSString *)pluginProcessAttributes.moduleInfo.path, @"Contents/Resources/Java Updater.app", nil]];
+
+    return [[NSURL URLWithString:urlString] isEqual:javaUpdaterURL];
+}
+
+static bool shouldLaunchApplicationAtURL(const PluginProcessAttributes& pluginProcessAttributes, const String& urlString)
+{
+    if (pluginProcessAttributes.moduleInfo.bundleIdentifier == "com.oracle.java.JavaAppletPlugin")
+        return isJavaUpdaterURL(pluginProcessAttributes, urlString);
+
+    return false;
+}
+
+void PluginProcessProxy::launchApplicationAtURL(const String& urlString, const Vector<String>& arguments, bool& result)
+{
+    if (!shouldLaunchApplicationAtURL(m_pluginProcessAttributes, urlString)) {
+        result = false;
+        return;
+    }
+
+    result = true;
+
+    RetainPtr<NSMutableArray> argumentsArray = adoptNS([[NSMutableArray alloc] initWithCapacity:arguments.size()]);
+    for (size_t i = 0; i < arguments.size(); ++i)
+        [argumentsArray addObject:(NSString *)arguments[i]];
+
+    NSDictionary *configuration = [NSDictionary dictionaryWithObject:argumentsArray.get() forKey:NSWorkspaceLaunchConfigurationArguments];
+    [[NSWorkspace sharedWorkspace] launchApplicationAtURL:[NSURL URLWithString:urlString] options:NSWorkspaceLaunchAsync configuration:configuration error:nullptr];
+}
+
 static bool isSilverlightPreferencesURL(const PluginProcessAttributes& pluginProcessAttributes, const String& urlString)
 {