https://bugs.webkit.org/show_bug.cgi?id=30456

Fixes for new Debug_All Windows build configuration.

Reviewed by Dan Bernstein.

WebCore:

* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::findCFNetworkModule): Ask for the correct library instead of guessing.
* platform/win/ScrollbarThemeSafari.cpp: Use new DEBUG_ALL preprocessor define for library naming.
* rendering/RenderMediaControls.cpp: Use new DEBUG_ALL preprocessor define for library naming.
* rendering/RenderThemeSafari.cpp: Use new DEBUG_ALL preprocessor define for library naming.

WebKit/win:

* WebKitClassFactory.cpp: Use new DEBUG_ALL preprocessor define for library naming.

WebKitLibraries:

* win/tools/vsprops/debug_all.vsprops:
Define DEBUG_ALL in Debug_All configuration.
Continue to define USE_DEBUG_SAFARI_THEME for open source SafariTheme header usage.

WebKitTools:

* DumpRenderTree/win/DumpRenderTree.cpp:
(sharedCFURLCache): Use new DEBUG_ALL preprocessor define for library naming.
* DumpRenderTree/win/DumpRenderTree.vcproj: Remove unused DEBUG_WEBKIT_HAS_SUFFIX.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@49735 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d6579a9184de0e841a2f4e1eb5cdd335a2438992..74da0c3bc90b27f52c14499043c1e15de44be2ac 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-16  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30456
+        Fixes for new Debug_All Windows build configuration.
+
+        * platform/network/cf/ResourceRequestCFNet.cpp:
+        (WebCore::findCFNetworkModule): Ask for the correct library instead of guessing.
+        * platform/win/ScrollbarThemeSafari.cpp: Use new DEBUG_ALL preprocessor define for library naming.
+        * rendering/RenderMediaControls.cpp: Use new DEBUG_ALL preprocessor define for library naming.
+        * rendering/RenderThemeSafari.cpp: Use new DEBUG_ALL preprocessor define for library naming.
+
 2009-10-16  Jon Honeycutt  <jhoneycutt@apple.com>
 
         Add SPI to determine whether a plug-in has ever been halted.

diff --git a/WebCore/platform/network/cf/ResourceRequestCFNet.cpp b/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
index bba3d3e700a0d98cb639d917ab17dea170d028d7..df586163d0d2ee33d0e9115f48f0f7122fbf3077 100644 (file)
--- a/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
+++ b/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
@@ -39,9 +39,11 @@ typedef CFArrayRef (*CFURLRequestCopyContentDispositionEncodingFallbackArrayFunc
 
 static HMODULE findCFNetworkModule()
 {
-    if (HMODULE module = GetModuleHandleA("CFNetwork"))
-        return module;
+#ifndef DEBUG_ALL
+    return GetModuleHandleA("CFNetwork");
+#else
     return GetModuleHandleA("CFNetwork_debug");
+#endif
 }
 
 static CFURLRequestSetContentDispositionEncodingFallbackArrayFunction findCFURLRequestSetContentDispositionEncodingFallbackArrayFunction()

diff --git a/WebCore/platform/win/ScrollbarThemeSafari.cpp b/WebCore/platform/win/ScrollbarThemeSafari.cpp
index 06a653364a5b2ddd93b3b2b3d3915633c89c9c68..4e979f24e2c715dcba264b2ff125d9451d2b639c 100644 (file)
--- a/WebCore/platform/win/ScrollbarThemeSafari.cpp
+++ b/WebCore/platform/win/ScrollbarThemeSafari.cpp
@@ -73,7 +73,7 @@ static int cButtonHitInset[] = { 3, 2 };
 static int cButtonLength[] = { 14, 10 };
 static int cThumbMinLength[] = { 26, 20 };
 
-#if !defined(NDEBUG) && defined(USE_DEBUG_SAFARI_THEME)
+#ifdef DEBUG_ALL
 SOFT_LINK_DEBUG_LIBRARY(SafariTheme)
 #else
 SOFT_LINK_LIBRARY(SafariTheme)

diff --git a/WebCore/rendering/RenderMediaControls.cpp b/WebCore/rendering/RenderMediaControls.cpp
index 4303aaa600776278cf8e439e9d33cabc6ba42e4f..9cc1493f5265a00722c9b116b5a691bb9420390e 100644 (file)
--- a/WebCore/rendering/RenderMediaControls.cpp
+++ b/WebCore/rendering/RenderMediaControls.cpp
@@ -37,7 +37,7 @@ using namespace std;
  
 namespace WebCore {
 
-#if !defined(NDEBUG) && defined(USE_DEBUG_SAFARI_THEME)
+#ifdef DEBUG_ALL
 SOFT_LINK_DEBUG_LIBRARY(SafariTheme)
 #else
 SOFT_LINK_LIBRARY(SafariTheme)

diff --git a/WebCore/rendering/RenderThemeSafari.cpp b/WebCore/rendering/RenderThemeSafari.cpp
index 8e53088914535a765f82bcf0be7bade3b6d171d6..2ea3b8beaf7f0a9cfdad57814d6d1e8ac9d20409 100644 (file)
--- a/WebCore/rendering/RenderThemeSafari.cpp
+++ b/WebCore/rendering/RenderThemeSafari.cpp
@@ -86,7 +86,7 @@ PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
     return safariTheme; // keep the reference of one.
 }
 
-#if !defined(NDEBUG) && defined(USE_DEBUG_SAFARI_THEME)
+#ifdef DEBUG_ALL
 SOFT_LINK_DEBUG_LIBRARY(SafariTheme)
 #else
 SOFT_LINK_LIBRARY(SafariTheme)

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 0ebc61097daf28d9535c045e027674043543f8bd..4e44f2ddc76c8de21271061774d68d13c6037d30 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-16  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30456
+        Fixes for new Debug_All Windows build configuration.
+
+        * WebKitClassFactory.cpp: Use new DEBUG_ALL preprocessor define for library naming.
+
 2009-10-16  Jon Honeycutt  <jhoneycutt@apple.com>
 
         Add SPI to determine whether a plug-in has ever been halted.

diff --git a/WebKit/win/WebKitClassFactory.cpp b/WebKit/win/WebKitClassFactory.cpp
index d1c4b72934154679929c8aa6eb41ebde63bce2fc..c2143b51db21b6bc9a871e89da7c1725bf0c723b 100644 (file)
--- a/WebKit/win/WebKitClassFactory.cpp
+++ b/WebKit/win/WebKitClassFactory.cpp
@@ -61,7 +61,7 @@
 
 // WebKitClassFactory ---------------------------------------------------------
 #if USE(SAFARI_THEME)
-#if !defined(NDEBUG) && defined(USE_DEBUG_SAFARI_THEME)
+#ifdef DEBUG_ALL
 SOFT_LINK_DEBUG_LIBRARY(SafariTheme)
 #else
 SOFT_LINK_LIBRARY(SafariTheme)

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index d283db1be843c76b3a363d8deb6caa8699738f29..cf573c69fdb254fbbc4b6c7eb70524682b418b52 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-16  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30456
+        Fixes for new Debug_All Windows build configuration.
+
+        * win/tools/vsprops/debug_all.vsprops:
+        Define DEBUG_ALL in Debug_All configuration.
+        Continue to define USE_DEBUG_SAFARI_THEME for open source SafariTheme header usage.
+
 2009-10-16  Steve Falkenburg  <sfalken@apple.com>
 
         Reviewed by Adam Roben.

diff --git a/WebKitLibraries/win/tools/vsprops/debug_all.vsprops b/WebKitLibraries/win/tools/vsprops/debug_all.vsprops
index 4b7f5112641694ddfefa89ce1bad89167493f25b..63c462777a2ecfe491900084957927e71c621b9a 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/debug_all.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/debug_all.vsprops
@@ -6,7 +6,7 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="USE_DEBUG_SAFARI_THEME;DEBUG_INTERNAL"
+               PreprocessorDefinitions="USE_DEBUG_SAFARI_THEME;DEBUG_INTERNAL;DEBUG_ALL"
                RuntimeLibrary="3"
        />
        <UserMacro

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d6faf4c088c1e015788b4b92a5b0531e5a056fb1..6ff2f5ceab834e96fe003d1189e778ef1957dc50 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-16  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30456
+        Fixes for new Debug_All Windows build configuration.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (sharedCFURLCache): Use new DEBUG_ALL preprocessor define for library naming.
+        * DumpRenderTree/win/DumpRenderTree.vcproj: Remove unused DEBUG_WEBKIT_HAS_SUFFIX.
+
 2009-10-16  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Adam Barth.

diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index 76ddb2dfff6108a55ca768da7de55aff7c7838f0..5b23413059efe6cfb58e36397e3a470a74f561a8 100644 (file)
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -201,7 +201,7 @@ static const wstring& fontsPath()
     return path;
 }
 
-#ifdef DEBUG_WEBKIT_HAS_SUFFIX
+#ifdef DEBUG_ALL
 #define WEBKITDLL TEXT("WebKit_debug.dll")
 #else
 #define WEBKITDLL TEXT("WebKit.dll")
@@ -1112,9 +1112,11 @@ IWebView* createWebViewAndOffscreenWindow(HWND* webViewWindow)
 #if USE(CFNETWORK)
 RetainPtr<CFURLCacheRef> sharedCFURLCache()
 {
+#ifndef DEBUG_ALL
+    HMODULE module = GetModuleHandle(TEXT("CFNetwork.dll"));
+#else
     HMODULE module = GetModuleHandle(TEXT("CFNetwork_debug.dll"));
-    if (!module)
-        module = GetModuleHandle(TEXT("CFNetwork.dll"));
+#endif
     if (!module)
         return 0;
 

diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj b/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
index f6002871232858f3eb5ec4bee65af17f88d0b7f2..ba3640c279b65dd8ff3e38e6bd0d919e9c57a1b5 100644 (file)
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
@@ -185,7 +185,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="&quot;$(ProjectDir)\.&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\cg&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\private&quot;;&quot;$(WebKitOutputDir)\Include\DumpRenderTree\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\Include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\Include\private&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitOutputDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;"\r
-                               PreprocessorDefinitions="_CONSOLE;DEBUG_WEBKIT_HAS_SUFFIX"\r
+                               PreprocessorDefinitions="_CONSOLE"\r
                                DisableSpecificWarnings="4146"\r
                                ForcedIncludeFiles="DumpRenderTreePrefix.h"\r
                        />\r
@@ -401,7 +401,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="&quot;$(ProjectDir)\.&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\cg&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\private&quot;;&quot;$(WebKitOutputDir)\Include\DumpRenderTree\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\Include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\Include\private&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitOutputDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;"\r
-                               PreprocessorDefinitions="_CONSOLE;DEBUG_WEBKIT_HAS_SUFFIX"\r
+                               PreprocessorDefinitions="_CONSOLE"\r
                                DisableSpecificWarnings="4146"\r
                                ForcedIncludeFiles="DumpRenderTreePrefix.h"\r
                        />\r