[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[japhet at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit f610cadd08fde8262e918194ee3202485dd2e7c3
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 28 19:57:16 2009 +0000

    2009-10-28  Nate Chapin  <japhet at chromium.org>
    
            Unreviewed, Chromium build fix for r50225.
    
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::defaultObjectContentType):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50231 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1a20297..c8cd1a4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-28  Nate Chapin  <japhet at chromium.org>
+
+        Unreviewed, Chromium build fix for r50225.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::defaultObjectContentType):
+
 2009-10-28  Eric Z. Ayers  <zundel at google.com>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 74336b6..9b15448 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -1301,7 +1301,7 @@ ObjectContentType FrameLoader::defaultObjectContentType(const KURL& url, const S
     if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
         return WebCore::ObjectContentImage;
 
-#if !PLATFORM(MAC)  // Mac has no PluginDatabase
+#if !PLATFORM(MAC) && !PLATFORM(CHROMIUM)  // Mac has no PluginDatabase, nor does Chromium 
     if (PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType))
         return WebCore::ObjectContentNetscapePlugin;
 #endif

-- 
WebKit Debian packaging