From a6a85c333f609c9fe514ddcd8d9e932782031ce5 Mon Sep 17 00:00:00 2001 From: ap Date: Tue, 19 Sep 2006 18:04:11 +0000 Subject: [PATCH] Reviewed by Tim O. http://bugzilla.opendarwin.org/show_bug.cgi?id=10661 REGRESSION: CFM plug-ins (Shockwave, SVG) are not loaded * Plugins/WebBasePluginPackage.m: (-[WebBasePluginPackage initWithPath:]): On 32-bit PowerPC, don't bail out if the bundle is nil - it can be a CFM plugin. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16450 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebKit/ChangeLog | 11 +++++++++++ WebKit/Plugins/WebBasePluginPackage.m | 3 +++ 2 files changed, 14 insertions(+) diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog index ed0a19642485..2930d021cf65 100644 --- a/WebKit/ChangeLog +++ b/WebKit/ChangeLog @@ -1,3 +1,14 @@ +2006-09-19 Alexey Proskuryakov + + Reviewed by Tim O. + + http://bugzilla.opendarwin.org/show_bug.cgi?id=10661 + REGRESSION: CFM plug-ins (Shockwave, SVG) are not loaded + + * Plugins/WebBasePluginPackage.m: + (-[WebBasePluginPackage initWithPath:]): On 32-bit PowerPC, don't bail out if + the bundle is nil - it can be a CFM plugin. + 2006-09-18 Brady Eidson Reviewed by Anders diff --git a/WebKit/Plugins/WebBasePluginPackage.m b/WebKit/Plugins/WebBasePluginPackage.m index bc790ac36c0a..5e49d6f38528 100644 --- a/WebKit/Plugins/WebBasePluginPackage.m +++ b/WebKit/Plugins/WebBasePluginPackage.m @@ -102,10 +102,13 @@ path = [[self pathByResolvingSymlinksAndAliasesInPath:pluginPath] retain]; bundle = [[NSBundle alloc] initWithPath:path]; +#ifndef __ppc__ + // 32-bit PowerPC is the only platform where non-bundled CFM plugins are supported if (!bundle) { [self release]; return nil; } +#endif cfBundle = CFBundleCreate(NULL, (CFURLRef)[NSURL fileURLWithPath:path]); extensionToMIME = [[NSMutableDictionary alloc] init]; -- 2.36.0