[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 9144efdbdaf2f2bf75b8523468271eccaee9713f
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 22:49:26 2009 +0000

    WebCore: If we are on Windows, don't try and get the kCGColorSpaceSRGB ColorSpace,
    because there is a CG bug preventing this from working.
    
    Reviewed by Beth Dakin.
    
    * platform/graphics/cg/GraphicsContextCG.cpp:
    (WebCore::sRGBColorSpaceRef):
    
    LayoutTests: Unskip the webkit-color-correction tests because the workaround of using
    the deviceRGBColorSpace allows the tests to pass on Windows.
    
    Reviewed by Beth Dakin.
    
    * platform/win/Skipped:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50843 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 44e4c6d..732d7ee 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,14 @@
 2009-11-11  Brian Weinstein  <bweinstein at apple.com>
 
+        Reviewed by Beth Dakin.
+
+        Unskip the webkit-color-correction tests because the workaround of using
+        the deviceRGBColorSpace allows the tests to pass on Windows.
+
+        * platform/win/Skipped:
+
+2009-11-11  Brian Weinstein  <bweinstein at apple.com>
+
         Reviewed by Darin Adler.
 
         Skip the webkit-color-correction tests because they crash on Windows 
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 8b90d89..bcc33ad 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -682,9 +682,3 @@ fast/dom/HTMLObjectElement/children-changed.html
 
 # Missing SocketStreamHandle implementation
 websocket/tests
-
-# https://bugs.webkit.org/show_bug.cgi?id=31363
-fast/css/color-correction-backgrounds-and-text.html
-fast/css/color-correction-on-backgrounds.html
-fast/css/color-correction-on-text.html
-fast/css/color-correction.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b0170b5..5b28586 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-11  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Beth Dakin.
+
+        If we are on Windows, don't try and get the kCGColorSpaceSRGB ColorSpace,
+        because there is a CG bug preventing this from working.
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::sRGBColorSpaceRef):
+
 2009-11-11  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/platform/graphics/cg/GraphicsContextCG.cpp b/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
index 05e7059..719bb96 100644
--- a/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
+++ b/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
@@ -69,7 +69,8 @@ static CGColorSpaceRef deviceRGBColorSpaceRef()
 
 static CGColorSpaceRef sRGBColorSpaceRef()
 {
-#ifdef BUILDING_ON_TIGER
+    // FIXME: Windows should be able to use kCGColorSpaceSRGB, this is tracked by http://webkit.org/b/31363.
+#if PLATFORM(WIN) || defined(BUILDING_ON_TIGER)
     return deviceRGBColorSpaceRef();
 #else
     static CGColorSpaceRef sRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);

-- 
WebKit Debian packaging