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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ed0a19642485c13fc9df6ffd218839698b7087ea..2930d021cf65e1c5ea3eb6ad21f34c5e1f0d02b2 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2006-09-19  Alexey Proskuryakov  <ap@nypop.com>
+
+        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  <beidson@apple.com>
 
         Reviewed by Anders

diff --git a/WebKit/Plugins/WebBasePluginPackage.m b/WebKit/Plugins/WebBasePluginPackage.m
index bc790ac36c0aba60b84f1859549a42594c820579..5e49d6f3852869e4b9e9bc44d112b7a95a6e5096 100644 (file)
--- 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];