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

andreas.kling at nokia.com andreas.kling at nokia.com
Wed Dec 22 18:41:20 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8e508244a56db08e481b2bf14bfede3e13f9c9de
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 15 21:00:00 2010 +0000

    2010-12-15  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Antonio Gomes.
    
            [Qt] screenIsMonochrome() is broken
            https://bugs.webkit.org/show_bug.cgi?id=49957
    
            * platform/qt/PlatformScreenQt.cpp:
            (WebCore::screenIsMonochrome):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74137 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e16c2c5..63ac79a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-15  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] screenIsMonochrome() is broken
+        https://bugs.webkit.org/show_bug.cgi?id=49957
+
+        * platform/qt/PlatformScreenQt.cpp:
+        (WebCore::screenIsMonochrome):
+
 2010-12-15  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebCore/platform/qt/PlatformScreenQt.cpp b/WebCore/platform/qt/PlatformScreenQt.cpp
index db34e21..4db8bd1 100644
--- a/WebCore/platform/qt/PlatformScreenQt.cpp
+++ b/WebCore/platform/qt/PlatformScreenQt.cpp
@@ -86,7 +86,7 @@ int screenDepthPerComponent(Widget* w)
 
 bool screenIsMonochrome(Widget* w)
 {
-    return QApplication::desktop()->screen(screenNumber(w))->numColors() < 2;
+    return QApplication::desktop()->screen(screenNumber(w))->colorCount() == 2;
 }
 
 FloatRect screenRect(Widget* w)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list