Standardize WinCairo conditionalized code under PLATFORM macro.

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

Reviewed by Maciej Stachowiak.

Source/JavaScriptCore:

* wtf/Platform.h: Update to use PLATFORM(WIN_CAIRO) for tests.

Source/WebCore:

Update compile-time conditions that had previously used #ifdef
of WIN_CAIRO to consistently use PLATFORM(WIN_CAIRO).

* WebCore.vcproj/WebCoreCairo.vsprops: Remove redundant declaration
  of WIN_CAIRO.
* WebCore.vcproj/WebCoreDebugCairoCFLite.vsprops: Update to use
  the existing WinCairo.vsprops file.
* WebCorePrefix.h: Update for new WTF_PLATFORM_WIN_CAIRO define.
* config.h: Update to use PLATFORM(WIN_CAIRO).

Tools:

Update compile-time conditions that had previously used #ifdef
of WIN_CAIRO to consistently use PLATFORM(WIN_CAIRO).

* DumpRenderTree/config.h: Switch to PLATFORM(WIN_CAIRO)
* DumpRenderTree/win/DumpRenderTreeCairo.vsprops: Remove redundant
  define of WIN_CAIRO=1.
* DumpRenderTree/win/DumpRenderTreeDebugCairoCFLite.vsprops: Add
  WinCairo.vsprops to set (to match Release build).

WebKitLibraries:

* win/tools/vsprops/WinCairo.vsprops: Update to comply with PLATFORM
  macro definition (WTF_PLATFORM_WIN_CAIRO)

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index dfaf41a74151485debc8155a3be7ed4983d5c378..c66df64b6305eed24b21520c25369298ec14478d 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-12  Brent Fulgham  <bfulgham@webkit.org>
+
+        Standardize WinCairo conditionalized code under PLATFORM macro.
+        https://bugs.webkit.org/show_bug.cgi?id=64377
+
+        Reviewed by Maciej Stachowiak.
+
+        * wtf/Platform.h: Update to use PLATFORM(WIN_CAIRO) for tests.
+
 2011-07-13  David Levin  <levin@chromium.org>
 
         Possible race condition in ThreadIdentifierData::initializeKeyOnce and shouldCallRealDebugger.

diff --git a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h
index 888b31db7b31b11278604ad99adea9b10c35d462..549085dc81bc089cd0079fdb6096f9875e57b74d 100644 (file)
--- a/Source/JavaScriptCore/wtf/Platform.h
+++ b/Source/JavaScriptCore/wtf/Platform.h
@@ -700,7 +700,7 @@
 #define WTF_USE_PTHREADS 0
 #endif
 
-#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(CHROMIUM) && !defined(WIN_CAIRO)
+#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(CHROMIUM) && !PLATFORM(WIN_CAIRO)
 #define WTF_USE_CFNETWORK 1
 #endif
 
@@ -713,7 +713,7 @@
 #define ENABLE_WEB_ARCHIVE 1
 #endif
 
-#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(CHROMIUM) && !defined(WIN_CAIRO) && !PLATFORM(QT)
+#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(CHROMIUM) && !PLATFORM(WIN_CAIRO) && !PLATFORM(QT)
 #define ENABLE_FULLSCREEN_API 1
 #endif
 
@@ -1140,7 +1140,7 @@
 #endif
 
 /* Accelerated compositing */
-#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) &&!defined(WIN_CAIRO)) || PLATFORM(EFL)
+#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO)) || PLATFORM(EFL)
 #define WTF_USE_ACCELERATED_COMPOSITING 1
 #endif
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a29a3f1a640085b0432a816b3f200e2224c74d50..8f56e7a48a018f5435d43d6d3b77cbe3a21070b6 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2011-07-12  Brent Fulgham  <bfulgham@webkit.org>
+
+        Standardize WinCairo conditionalized code under PLATFORM macro.
+        https://bugs.webkit.org/show_bug.cgi?id=64377
+
+        Reviewed by Maciej Stachowiak.
+
+        Update compile-time conditions that had previously used #ifdef
+        of WIN_CAIRO to consistently use PLATFORM(WIN_CAIRO).
+
+        * WebCore.vcproj/WebCoreCairo.vsprops: Remove redundant declaration
+          of WIN_CAIRO.
+        * WebCore.vcproj/WebCoreDebugCairoCFLite.vsprops: Update to use
+          the existing WinCairo.vsprops file.
+        * WebCorePrefix.h: Update for new WTF_PLATFORM_WIN_CAIRO define.
+        * config.h: Update to use PLATFORM(WIN_CAIRO).
+
 2011-07-13  Alexandru Chiculita  <achicu@adobe.com>
 
         [CSS Exclusions] Fix for comment #23 on wrap-shape parsing bug 61726

diff --git a/Source/WebCore/WebCore.vcproj/WebCoreCairo.vsprops b/Source/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
index 3423dd8030ec1b14977295fe7619e7107c2df56b..900b5248b5ab0e0c9c82298ad2ac8f9f52b539d4 100644 (file)
--- a/Source/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
+++ b/Source/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
@@ -7,6 +7,5 @@
        <Tool
                Name="VCCLCompilerTool"
                AdditionalIncludeDirectories="&quot;$(ProjectDir)..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)..\platform\graphics\win\cairo&quot;;&quot;$(ProjectDir)..\svg\graphics\cairo&quot;;&quot;$(ProjectDir)..\platform\image-decoders&quot;;&quot;$(ProjectDir)..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)..\platform\image-decoders\cairo&quot;;&quot;$(ProjectDir)..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)..\platform\image-decoders\webp&quot;;&quot;$(WebKitLibrariesDir)\include\cairo&quot;"
-               PreprocessorDefinitions="WIN_CAIRO"
        />
 </VisualStudioPropertySheet>

diff --git a/Source/WebCore/WebCore.vcproj/WebCoreDebugCairoCFLite.vsprops b/Source/WebCore/WebCore.vcproj/WebCoreDebugCairoCFLite.vsprops
index 588694ae427b3c69c54ab574e2186e62b5d091f1..48a3690d10cf005317e76f3c4e020553e9584097 100644 (file)
--- a/Source/WebCore/WebCore.vcproj/WebCoreDebugCairoCFLite.vsprops
+++ b/Source/WebCore/WebCore.vcproj/WebCoreDebugCairoCFLite.vsprops
@@ -8,6 +8,7 @@
       $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
       $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;
       $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;
       .\WebCoreCommon.vsprops;
       .\WebCoreCairo.vsprops;
       .\WebCoreCURL.vsprops"

diff --git a/Source/WebCore/WebCorePrefix.h b/Source/WebCore/WebCorePrefix.h
index 2b8c165ec127b272030159189293e4c6f0fa30b6..ef8bd1dfed4add1b072150e1d8ca27b43107865d 100644 (file)
--- a/Source/WebCore/WebCorePrefix.h
+++ b/Source/WebCore/WebCorePrefix.h
@@ -115,7 +115,7 @@
 
 #if !defined(BUILDING_WX__) && !defined(ANDROID) && !defined(BUILDING_BREWMP__)
 #include <CoreFoundation/CoreFoundation.h>
-#ifdef WIN_CAIRO
+#ifdef WTF_PLATFORM_WIN_CAIRO
 #include <ConditionalMacros.h>
 #include <windows.h>
 #include <stdio.h>

diff --git a/Source/WebCore/config.h b/Source/WebCore/config.h
index 30aa0816b2b7280f8ad54fedc77e4e9b80e4e613..c78b36515140c1e06f1614baba60ea0b46fe351e 100644 (file)
--- a/Source/WebCore/config.h
+++ b/Source/WebCore/config.h
@@ -141,7 +141,7 @@
 #endif
 
 #if PLATFORM(WIN)
-#if defined(WIN_CAIRO)
+#if PLATFORM(WIN_CAIRO)
 #undef WTF_USE_CG
 #define WTF_USE_CAIRO 1
 #define WTF_USE_CURL 1

diff --git a/Source/WebKit2/win/WebKit2CFLite.def b/Source/WebKit2/win/WebKit2CFLite.def
index a1876dd77cb744f4803817219fe75cb9fbd5143d..0a3559e62504ea345769d28ecef9ecddd91f797d 100644 (file)
--- a/Source/WebKit2/win/WebKit2CFLite.def
+++ b/Source/WebKit2/win/WebKit2CFLite.def
@@ -127,7 +127,10 @@ EXPORTS
         ?waitForThreadCompletion@WTF@@YAHIPAPAX@Z
         ?createThread@WTF@@YAIP6APAXPAX@Z0@Z
 
-        ; Re-exports from WebCore for WebCoreTestSupport
+        ; Re-exports from WebCore for test harnesses
+        ??0String@WTF@@QAE@PBD@Z
+        ??0String@WTF@@QAE@PB_W@Z
+        ?add@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PBD@Z
         ?addSlowCase@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PAVStringImpl@2@@Z
         ?cacheDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PAV23@PBUClassInfo@3@@Z
         ?create@ShadowContentElement@WebCore@@SA?AV?$PassRefPtr@VShadowContentElement@WebCore@@@WTF@@PAVDocument@2@@Z

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 44e43fa96a0855d33d8a3d0ee7880532d8dafa8d..fabf18c48164f70efee142e7977c26539637569f 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2011-07-12  Brent Fulgham  <bfulgham@webkit.org>
+
+        Standardize WinCairo conditionalized code under PLATFORM macro.
+        https://bugs.webkit.org/show_bug.cgi?id=64377
+
+        Reviewed by Maciej Stachowiak.
+
+        Update compile-time conditions that had previously used #ifdef
+        of WIN_CAIRO to consistently use PLATFORM(WIN_CAIRO).
+
+        * DumpRenderTree/config.h: Switch to PLATFORM(WIN_CAIRO)
+        * DumpRenderTree/win/DumpRenderTreeCairo.vsprops: Remove redundant
+          define of WIN_CAIRO=1.
+        * DumpRenderTree/win/DumpRenderTreeDebugCairoCFLite.vsprops: Add
+          WinCairo.vsprops to set (to match Release build).
+
 2011-07-13  Dimitri Glazkov  <dglazkov@chromium.org>
 
         Eliminate TestExpectationsFile.

diff --git a/Tools/DumpRenderTree/config.h b/Tools/DumpRenderTree/config.h
index f477532b9bf34057e11d639132701feff4b3dfa8..e603afc60a390bbc2bc203a1f09e419d274ace23 100644 (file)
--- a/Tools/DumpRenderTree/config.h
+++ b/Tools/DumpRenderTree/config.h
@@ -71,7 +71,7 @@
 
 #if PLATFORM(WIN)
 #define WTF_USE_CF 1 
-#if defined(WIN_CAIRO)
+#if PLATFORM(WIN_CAIRO)
 #define WTF_USE_CAIRO 1
 #define WTF_USE_CURL 1
 #else

diff --git a/Tools/DumpRenderTree/win/DumpRenderTreeCairo.vsprops b/Tools/DumpRenderTree/win/DumpRenderTreeCairo.vsprops
index 7d17544678d737706faf64838a6a468cc2b37be6..6d44dec4a941aade7270ad77e6e6b452a16be11e 100644 (file)
--- a/Tools/DumpRenderTree/win/DumpRenderTreeCairo.vsprops
+++ b/Tools/DumpRenderTree/win/DumpRenderTreeCairo.vsprops
@@ -7,7 +7,6 @@
        <Tool
                Name="VCCLCompilerTool"
                AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\cairo&quot;;"
-               PreprocessorDefinitions="WIN_CAIRO=1"
        />
        <Tool
                Name="VCLinkerTool"

diff --git a/Tools/DumpRenderTree/win/DumpRenderTreeDebugCairoCFLite.vsprops b/Tools/DumpRenderTree/win/DumpRenderTreeDebugCairoCFLite.vsprops
index b0985b096db2c1257c1e219deae0862d610b887e..b857b4d2fe91de419f0bb742c9c8a5247d1cce10 100644 (file)
--- a/Tools/DumpRenderTree/win/DumpRenderTreeDebugCairoCFLite.vsprops
+++ b/Tools/DumpRenderTree/win/DumpRenderTreeDebugCairoCFLite.vsprops
@@ -4,6 +4,6 @@
        Version="8.00"
        Name="DumpRenderTreeDebugCairoCFLite"
        InheritedPropertySheets="
-      $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;.\DumpRenderTreeCommon.vsprops;.\DumpRenderTreeCairo.vsprops;.\DumpRenderTreeCFLite.vsprops"
+      $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;.\DumpRenderTreeCommon.vsprops;.\DumpRenderTreeCairo.vsprops;.\DumpRenderTreeCFLite.vsprops"
        >
 </VisualStudioPropertySheet>

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index c58e8e74f804694eb9a56a622718798dc1c292d8..54ad4963ced968314a93910ec0fb442f72967c81 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-12  Brent Fulgham  <bfulgham@webkit.org>
+
+        Standardize WinCairo conditionalized code under PLATFORM macro.
+        https://bugs.webkit.org/show_bug.cgi?id=64377
+
+        Reviewed by Maciej Stachowiak.
+
+        * win/tools/vsprops/WinCairo.vsprops: Update to comply with PLATFORM
+          macro definition (WTF_PLATFORM_WIN_CAIRO)
+
 2011-07-02  Mark Rowe  <mrowe@apple.com>
 
         Update the header file too.

diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
index 1cd140878c5ce7ef6dd07ed87a483329bdb018df..e15b2d4714385de1451742b2e9c81ea37e849634 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
@@ -7,7 +7,7 @@
        <Tool
                Name="VCCLCompilerTool"
                AdditionalIncludeDirectories="&quot;$(WebKitLibrariesDir)\include\cairo&quot;;&quot;$(SolutionDir)\..\..\..\JavaScriptCore\os-win32&quot;"
-               PreprocessorDefinitions="WIN_CAIRO=1"
+               PreprocessorDefinitions="WTF_PLATFORM_WIN_CAIRO=1"
        />
        <Tool
                Name="VCLinkerTool"