[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 12:45:59 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 03f96895ceb54f1a75e08682b1966fc4c9af7254
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 29 13:55:56 2010 +0000

    2010-08-29  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Adam Roben.
    
            [WINCE] Port SystemInfo to WinCE
            https://bugs.webkit.org/show_bug.cgi?id=44817
    
            * platform/win/SystemInfo.cpp:
            (WebCore::isRunningOnVistaOrLater):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66330 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 908f761..51ab2ee 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-29  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Adam Roben.
+
+        [WINCE] Port SystemInfo to WinCE
+        https://bugs.webkit.org/show_bug.cgi?id=44817
+
+        * platform/win/SystemInfo.cpp:
+        (WebCore::isRunningOnVistaOrLater):
+
 2010-08-28  Jeremy Moskovich  <jeremy at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/platform/win/SystemInfo.cpp b/WebCore/platform/win/SystemInfo.cpp
index f010769..f2fe62b 100644
--- a/WebCore/platform/win/SystemInfo.cpp
+++ b/WebCore/platform/win/SystemInfo.cpp
@@ -32,6 +32,9 @@ namespace WebCore {
 
 bool isRunningOnVistaOrLater()
 {
+#if OS(WINCE)
+    return false;
+#else
     static bool isVistaOrLater;
     static bool initialized;
 
@@ -47,6 +50,7 @@ bool isRunningOnVistaOrLater()
     isVistaOrLater = vi.dwMajorVersion >= 6;
 
     return isVistaOrLater;
+#endif
 }
 
 } // namespace WebCore

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list