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

[staikos at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 79b1021a05e1263a00015b642583642621964841
Author: staikos at webkit.org <staikos at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 28 19:03:50 2009 +0000

    2009-10-28  George Staikos  <george.staikos at torchmobile.com>
    
            Attempt to fix the Mac debug build after 50225.
    
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::defaultObjectContentType):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50228 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3d35787..7d3fbd6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-28  George Staikos  <george.staikos at torchmobile.com>
+
+        Attempt to fix the Mac debug build after 50225.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::defaultObjectContentType):
+
 2009-10-28  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index eb6cb0b..74336b6 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -1301,8 +1301,10 @@ ObjectContentType FrameLoader::defaultObjectContentType(const KURL& url, const S
     if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
         return WebCore::ObjectContentImage;
 
+#if !PLATFORM(MAC)  // Mac has no PluginDatabase
     if (PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType))
         return WebCore::ObjectContentNetscapePlugin;
+#endif
 
     if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType))
         return WebCore::ObjectContentFrame;

-- 
WebKit Debian packaging