[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 5079dddd05ac16a8ff6b2aa4cf36782f496a7b28
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 29 17:22:23 2010 +0000

    2010-01-29  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Fix MacOS X version detection
    
            MacOS X version can have 2 or 3 segments.
            https://bugs.webkit.org/show_bug.cgi?id=34322
    
            * inspector/front-end/inspector.js:
            (WebInspector._detectPlatform):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54067 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 55ed6e0..0c2ab34 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-29  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Fix MacOS X version detection
+
+        MacOS X version can have 2 or 3 segments.
+        https://bugs.webkit.org/show_bug.cgi?id=34322
+
+        * inspector/front-end/inspector.js:
+        (WebInspector._detectPlatform):
+
 2010-01-29  Jakob Petsovits  <jpetsovits at rim.com>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index c8532d8..c637f37 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -83,18 +83,18 @@ var WebInspector = {
                 return WebInspector.OS.WindowsVistaOrLater;
             return WebInspector.OS.Windows;
         } else if (nativePlatform === "mac") {
-            var match = userAgent.match(/Mac OS X\s*(?:(\d+)_(\d+)_(?:\d+))?/);
+            var match = userAgent.match(/Mac OS X\s*(?:(\d+)_(\d+))?/);
             if (!match || match[1] != 10)
-                return WebInspector.OS.MacLeopard;
+                return WebInspector.OS.MacSnowLeopard;
             switch (Number(match[2])) {
                 case 4:
                     return WebInspector.OS.MacTiger;
                 case 5:
                     return WebInspector.OS.MacLeopard;
                 case 6:
+                default:
                     return WebInspector.OS.MacSnowLeopard;
             }
-            return WebInspector.OS.MacLeopard;
         }
 
         return nativePlatform;

-- 
WebKit Debian packaging