Title: [153024] branches/safari-537-branch/Source/WebKit2
- Revision
- 153024
- Author
- [email protected]
- Date
- 2013-07-22 18:51:21 -0700 (Mon, 22 Jul 2013)
Log Message
Merged r152950. <rdar://problem/14496721>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (153023 => 153024)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-23 01:47:40 UTC (rev 153023)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-23 01:51:21 UTC (rev 153024)
@@ -1,5 +1,24 @@
2013-07-22 Lucas Forschler <[email protected]>
+ Merge r152950
+
+ 2013-07-21 Anders Carlsson <[email protected]>
+
+ Java Updater not launched on Lion and Mountain Lion
+ https://bugs.webkit.org/show_bug.cgi?id=118953
+ <rdar://problem/14496721>
+
+ Reviewed by Sam Weinig.
+
+ On Lion and Mountain Lion, -[NSURL isEqual:] will return NO for two file URLs if one of
+ them has "localhost" specified, even if the paths are otherwise equal. Work around this by
+ comparing the paths directly.
+
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::isJavaUpdaterURL):
+
+2013-07-22 Lucas Forschler <[email protected]>
+
Merge r152787
2013-07-17 Simon Cooper <[email protected]>
Modified: branches/safari-537-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (153023 => 153024)
--- branches/safari-537-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2013-07-23 01:47:40 UTC (rev 153023)
+++ branches/safari-537-branch/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2013-07-23 01:51:21 UTC (rev 153024)
@@ -405,9 +405,12 @@
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]];
+ NSURL *url = "" URLWithString:urlString];
+ if (![url isFileURL])
+ return false;
- return [[NSURL URLWithString:urlString] isEqual:javaUpdaterURL];
+ NSString *javaUpdaterPath = [NSString pathWithComponents:[NSArray arrayWithObjects:(NSString *)pluginProcessAttributes.moduleInfo.path, @"Contents/Resources/Java Updater.app", nil]];
+ return [url.path isEqualToString:javaUpdaterPath];
}
static bool shouldLaunchApplicationAtURL(const PluginProcessAttributes& pluginProcessAttributes, const String& urlString)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes