[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit be6356031c1a0556790f03a95694adebcb3a48cc
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 3 17:48:44 2010 +0000

    2010-02-03  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            [Chromium] Return a consistent set of platforms from WebDevToolsFrontendImpl
            https://bugs.webkit.org/show_bug.cgi?id=34523
    
            * src/WebDevToolsFrontendImpl.cpp:
            (WebKit::WebDevToolsFrontendImpl::jsPlatform):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54283 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 754b6af..b1c592b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-03  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        [Chromium] Return a consistent set of platforms from WebDevToolsFrontendImpl
+        https://bugs.webkit.org/show_bug.cgi?id=34523
+
+        * src/WebDevToolsFrontendImpl.cpp:
+        (WebKit::WebDevToolsFrontendImpl::jsPlatform):
+
 2010-02-02  Joel Stanley  <joel at jms.id.au>
 
         Reviewed by David Levin.
diff --git a/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp b/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
index 2165cec..0a92319 100644
--- a/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp
@@ -259,15 +259,13 @@ v8::Handle<v8::Value> WebDevToolsFrontendImpl::jsLoaded(const v8::Arguments& arg
 v8::Handle<v8::Value> WebDevToolsFrontendImpl::jsPlatform(const v8::Arguments& args)
 {
 #if defined(OS_MACOSX)
-    return v8String("mac-leopard");
+    return v8String("mac");
 #elif defined(OS_LINUX)
     return v8String("linux");
-#elif defined(OS_FREEBSD)
-    return v8String("freebsd");
-#elif defined(OS_OPENBSD)
-    return v8String("openbsd");
 #elif defined(OS_WIN)
     return v8String("windows");
+#else
+    return v8String("unknown");
 #endif
 }
 

-- 
WebKit Debian packaging