[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 b79e1b6f0a4f19f0ff7fd9a63de84c9219336136
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 28 00:46:16 2010 +0000

    Windows Debug_All build fix.
    
    * platform/graphics/win/WKCACFLayer.cpp:
    * platform/graphics/win/WKCACFLayerRenderer.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53961 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f5ace10..6f853f1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-27  Steve Falkenburg  <sfalken at apple.com>
+
+        Windows Debug_All build fix.
+
+        * platform/graphics/win/WKCACFLayer.cpp:
+        * platform/graphics/win/WKCACFLayerRenderer.cpp:
+
 2010-01-27  Evan Martin  <evan at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/platform/graphics/win/WKCACFLayer.cpp b/WebCore/platform/graphics/win/WKCACFLayer.cpp
index 9a1aabc..ad1fc85 100644
--- a/WebCore/platform/graphics/win/WKCACFLayer.cpp
+++ b/WebCore/platform/graphics/win/WKCACFLayer.cpp
@@ -37,7 +37,11 @@
 #include <QuartzCore/CARender.h>
 #include <QuartzCoreInterface/QuartzCoreInterface.h>
 
+#ifdef DEBUG_ALL
+#pragma comment(lib, "QuartzCore_debug")
+#else
 #pragma comment(lib, "QuartzCore")
+#endif
 #pragma comment(lib, "QuartzCoreInterface")
 
 namespace WebCore {
diff --git a/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp b/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
index 5e63439..3bbd4f8 100644
--- a/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
+++ b/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
@@ -43,7 +43,11 @@
 
 #pragma comment(lib, "d3d9")
 #pragma comment(lib, "d3dx9")
+#ifdef DEBUG_ALL
+#pragma comment(lib, "QuartzCore_debug")
+#else
 #pragma comment(lib, "QuartzCore")
+#endif
 
 static IDirect3D9* s_d3d = 0;
 static IDirect3D9* d3d()

-- 
WebKit Debian packaging