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

[mrowe at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 4fb31717b465b43d1a31184e51ac9842db10f4e6
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 3 04:00:55 2009 +0000

    Re-enable support for web archives on Windows.  It was mistakenly disabled in r50438.
    
    Rubber-stamped by Brady Eidson.
    
    * loader/archive/ArchiveFactory.cpp:
    (WebCore::archiveMIMETypes):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50439 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 286c1f3..15ebe73 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-02  Mark Rowe  <mrowe at apple.com>
+
+        Rubber-stamped by Brady Eidson.
+
+        Re-enable support for web archives on Windows.  It was mistakenly disabled in r50438.
+
+        * loader/archive/ArchiveFactory.cpp:
+        (WebCore::archiveMIMETypes):
+
 2009-11-02  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/loader/archive/ArchiveFactory.cpp b/WebCore/loader/archive/ArchiveFactory.cpp
index 48ad7c2..2dfe53c 100644
--- a/WebCore/loader/archive/ArchiveFactory.cpp
+++ b/WebCore/loader/archive/ArchiveFactory.cpp
@@ -29,12 +29,13 @@
 #include "config.h"
 #include "ArchiveFactory.h"
 
-#if PLATFORM(CF) && (PLATFORM(MAC) || PLATFORM(CHROMIUM))
-#include "LegacyWebArchive.h"
-#endif
 #include "MIMETypeRegistry.h"
 #include "PlatformString.h"
 
+#if PLATFORM(CF) && !PLATFORM(QT)
+#include "LegacyWebArchive.h"
+#endif
+
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/StdLibExtras.h>
@@ -55,14 +56,14 @@ static ArchiveMIMETypesMap& archiveMIMETypes()
 {
     DEFINE_STATIC_LOCAL(ArchiveMIMETypesMap, mimeTypes, ());
     static bool initialized = false;
-    
+
     if (initialized)
         return mimeTypes;
-    
-#if PLATFORM(CF) && (PLATFORM(MAC) || PLATFORM(CHROMIUM))
+
+#if PLATFORM(CF) & !PLATFORM(QT)
     mimeTypes.set("application/x-webarchive", archiveFactoryCreate<LegacyWebArchive>);
 #endif
-        
+
     initialized = true;
     return mimeTypes;
 }

-- 
WebKit Debian packaging