Merge in WebKit r47029.

1 files changed, 8 insertions, 4 deletions

diff --git a/WebCore/plugins/mac/PluginPackageMac.cpp b/WebCore/plugins/mac/PluginPackageMac.cpp
index aed3516..bf6a81b 100644
--- a/WebCore/plugins/mac/PluginPackageMac.cpp
+++ b/WebCore/plugins/mac/PluginPackageMac.cpp
@@ -50,7 +50,7 @@ void PluginPackage::determineQuirks(const String& mimeType)
 {
     if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType)) {
         // Because a single process cannot create multiple VMs, and we cannot reliably unload a
-        // Java VM, we cannot unload the Java plugin, or we'll lose reference to our only VM
+        // Java VM, we cannot unload the Java Plugin, or we'll lose reference to our only VM
         m_quirks.add(PluginQuirkDontUnloadPlugin);
 
         // Setting the window region to an empty region causes bad scrolling repaint problems
@@ -235,9 +235,9 @@ bool PluginPackage::fetchInfo()
         CFBundleCloseBundleResourceMap(m_module, resFile);
     }
 
-    LOG(Plugin, "PluginPackage::fetchInfo(): Found plug-in '%s'", m_name.utf8().data());
+    LOG(Plugins, "PluginPackage::fetchInfo(): Found plug-in '%s'", m_name.utf8().data());
     if (isPluginBlacklisted()) {
-        LOG(Plugin, "\tPlug-in is blacklisted!");
+        LOG(Plugins, "\tPlug-in is blacklisted!");
         return false;
     }
 
@@ -264,7 +264,7 @@ bool PluginPackage::load()
                                                                         kCFURLPOSIXPathStyle, false));
     m_module = CFBundleCreate(NULL, url.get());
     if (!m_module || !CFBundleLoadExecutable(m_module)) {
-        LOG(Plugin, "%s not loaded", m_path.utf8().data());
+        LOG(Plugins, "%s not loaded", m_path.utf8().data());
         return false;
     }
 
@@ -306,4 +306,8 @@ abort:
 
 } // namespace WebCore
 
+#else
+
+#include "../PluginPackageNone.cpp"
+
 #endif // !__LP64__