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

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 41ec5afe78c343a9fc2163ac27b0bf6cb2dc1605
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 15 11:59:55 2010 +0000

    2010-01-15  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
    
            Reviewed by Antti Koivisto.
    
            Use OS(MAC_OS_X) instead of PLATFORM(MAC) when determining navigator.platform
    
            https://bugs.webkit.org/show_bug.cgi?id=33711
    
            * page/NavigatorBase.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53330 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f2f063b..d75031f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-15  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Antti Koivisto.
+
+        Use OS(MAC_OS_X) instead of PLATFORM(MAC) when determining navigator.platform
+
+        https://bugs.webkit.org/show_bug.cgi?id=33711
+
+        * page/NavigatorBase.cpp:
+
 2010-01-14  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/page/NavigatorBase.cpp b/WebCore/page/NavigatorBase.cpp
index 341db66..ca51a29 100644
--- a/WebCore/page/NavigatorBase.cpp
+++ b/WebCore/page/NavigatorBase.cpp
@@ -35,9 +35,9 @@
 #endif
 
 #ifndef WEBCORE_NAVIGATOR_PLATFORM
-#if PLATFORM(MAC) && (CPU(PPC) || CPU(PPC64))
+#if OS(MAC_OS_X) && (CPU(PPC) || CPU(PPC64))
 #define WEBCORE_NAVIGATOR_PLATFORM "MacPPC"
-#elif PLATFORM(MAC) && (CPU(X86) || CPU(X86_64))
+#elif OS(MAC_OS_X) && (CPU(X86) || CPU(X86_64))
 #define WEBCORE_NAVIGATOR_PLATFORM "MacIntel"
 #elif OS(WINDOWS)
 #define WEBCORE_NAVIGATOR_PLATFORM "Win32"

-- 
WebKit Debian packaging