[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 5254d74e2c165e6d0b2476a4e9dd0c8ef6946a97
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 15 11:55:03 2002 +0000

    	Get current bits per pixel from CoreGraphics, thereby fixing
    
            Radar 2943736 - JavaScript screen.colorDepth and
    screen.pixelDepth properties always returns 32,
            regardless of real depth
    
            * kwq/KWQPaintDeviceMetrics.mm:
    	(QPaintDeviceMetrics::depth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1370 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 251410f..8c58ec1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-06-15  Maciej Stachowiak  <mjs at apple.com>
 
+	Get current bits per pixel from CoreGraphics, thereby fixing
+        
+        Radar 2943736 - JavaScript screen.colorDepth and screen.pixelDepth properties always returns 32, 
+        regardless of real depth
+        
+        * kwq/KWQPaintDeviceMetrics.mm:
+	(QPaintDeviceMetrics::depth):
+
+2002-06-15  Maciej Stachowiak  <mjs at apple.com>
+
 	Removed product and vendor properties, thereby fixing:
         
         Radar 2943751 - JavaScript navigator.product property is "Konqueror/khtml"
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 251410f..8c58ec1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-06-15  Maciej Stachowiak  <mjs at apple.com>
 
+	Get current bits per pixel from CoreGraphics, thereby fixing
+        
+        Radar 2943736 - JavaScript screen.colorDepth and screen.pixelDepth properties always returns 32, 
+        regardless of real depth
+        
+        * kwq/KWQPaintDeviceMetrics.mm:
+	(QPaintDeviceMetrics::depth):
+
+2002-06-15  Maciej Stachowiak  <mjs at apple.com>
+
 	Removed product and vendor properties, thereby fixing:
         
         Radar 2943751 - JavaScript navigator.product property is "Konqueror/khtml"
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 251410f..8c58ec1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-06-15  Maciej Stachowiak  <mjs at apple.com>
 
+	Get current bits per pixel from CoreGraphics, thereby fixing
+        
+        Radar 2943736 - JavaScript screen.colorDepth and screen.pixelDepth properties always returns 32, 
+        regardless of real depth
+        
+        * kwq/KWQPaintDeviceMetrics.mm:
+	(QPaintDeviceMetrics::depth):
+
+2002-06-15  Maciej Stachowiak  <mjs at apple.com>
+
 	Removed product and vendor properties, thereby fixing:
         
         Radar 2943751 - JavaScript navigator.product property is "Konqueror/khtml"
diff --git a/WebCore/kwq/KWQPaintDeviceMetrics.mm b/WebCore/kwq/KWQPaintDeviceMetrics.mm
index 7f70afc..776a559 100644
--- a/WebCore/kwq/KWQPaintDeviceMetrics.mm
+++ b/WebCore/kwq/KWQPaintDeviceMetrics.mm
@@ -27,6 +27,9 @@
 
 #include <kwqdebug.h>
 
+#import <ApplicationServices/ApplicationServices.h>
+
+
 QPaintDeviceMetrics::QPaintDeviceMetrics(const QPaintDevice *)
 {
 }
@@ -41,8 +44,7 @@ int QPaintDeviceMetrics::logicalDpiY() const
 
 int QPaintDeviceMetrics::depth() const
 {
-    _logPartiallyImplemented();
-    return 32;
+    return CGDisplayBitsPerPixel(kCGDirectMainDisplay);
 }
 
 

-- 
WebKit Debian packaging