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

[sfalken at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 17e877ec30db221d6959cc40a363c75b3d777d24
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 22:24:44 2010 +0000

    Rubber stamped by Adam Roben.
    
    Load debug version of graphics library in Windows Debug_All builds.
    
    * platform/graphics/win/WKCACFLayerRenderer.cpp:
    (WebCore::WKCACFLayerRenderer::acceleratedCompositingAvailable):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55747 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3055b23..98e4193 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-09  Steve Falkenburg  <sfalken at apple.com>
+
+        Rubber stamped by Adam Roben.
+
+        Load debug version of graphics library in Windows Debug_All builds.
+
+        * platform/graphics/win/WKCACFLayerRenderer.cpp:
+        (WebCore::WKCACFLayerRenderer::acceleratedCompositingAvailable):
+
 2010-03-09  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp b/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
index 9e43eab..6b54e24 100644
--- a/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
+++ b/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
@@ -169,7 +169,11 @@ bool WKCACFLayerRenderer::acceleratedCompositingAvailable()
     }
 
     FreeLibrary(library);
+#ifdef DEBUG_ALL
+    library = LoadLibrary(TEXT("QuartzCore_debug.dll"));
+#else
     library = LoadLibrary(TEXT("QuartzCore.dll"));
+#endif
     if (!library) {
         available = false;
         return available;

-- 
WebKit Debian packaging