Title: [186125] trunk/Source/WebKit2
- Revision
- 186125
- Author
- [email protected]
- Date
- 2015-06-30 12:12:45 -0700 (Tue, 30 Jun 2015)
Log Message
Java Plugin cannot launch JavaUpdater.app after renaming
https://bugs.webkit.org/show_bug.cgi?id=146464
rdar://problem/19747153
Reviewed by Tim Horton.
Check for both "JavaUpdater.app" and "Java Updater.app".
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::isJavaUpdaterURL):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186124 => 186125)
--- trunk/Source/WebKit2/ChangeLog 2015-06-30 18:26:01 UTC (rev 186124)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-30 19:12:45 UTC (rev 186125)
@@ -1,3 +1,16 @@
+2015-06-30 Anders Carlsson <[email protected]>
+
+ Java Plugin cannot launch JavaUpdater.app after renaming
+ https://bugs.webkit.org/show_bug.cgi?id=146464
+ rdar://problem/19747153
+
+ Reviewed by Tim Horton.
+
+ Check for both "JavaUpdater.app" and "Java Updater.app".
+
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::isJavaUpdaterURL):
+
2015-06-30 Chris Dumez <[email protected]>
[WK2] Avoid taking a useless / blank navigation snapshot when navigating after restoring sessionState
Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (186124 => 186125)
--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2015-06-30 18:26:01 UTC (rev 186124)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2015-06-30 19:12:45 UTC (rev 186125)
@@ -391,8 +391,15 @@
if (![url isFileURL])
return false;
- NSString *javaUpdaterPath = [NSString pathWithComponents:[NSArray arrayWithObjects:(NSString *)pluginProcessAttributes.moduleInfo.path, @"Contents/Resources/Java Updater.app", nil]];
- return [url.path isEqualToString:javaUpdaterPath];
+ NSArray *javaUpdaterAppNames = [NSArray arrayWithObjects:@"Java Updater.app", @"JavaUpdater.app", nil];
+
+ for (NSString *javaUpdaterAppName in javaUpdaterAppNames) {
+ NSString *javaUpdaterPath = [NSString pathWithComponents:[NSArray arrayWithObjects:(NSString *)pluginProcessAttributes.moduleInfo.path, @"Contents/Resources", javaUpdaterAppName, nil]];
+ if ([url.path isEqualToString:javaUpdaterPath])
+ return YES;
+ }
+
+ return NO;
}
static bool shouldLaunchApplicationAtURL(const PluginProcessAttributes& pluginProcessAttributes, const String& urlString)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
