Standardize WinCairo conditionalized code under PLATFORM macro.
authorbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Jul 2011 19:31:52 +0000 (19:31 +0000)
committerbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Jul 2011 19:31:52 +0000 (19:31 +0000)
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

14 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/wtf/Platform.h
Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcproj/WebCoreCairo.vsprops
Source/WebCore/WebCore.vcproj/WebCoreDebugCairoCFLite.vsprops
Source/WebCore/WebCorePrefix.h
Source/WebCore/config.h
Source/WebKit2/win/WebKit2CFLite.def
Tools/ChangeLog
Tools/DumpRenderTree/config.h
Tools/DumpRenderTree/win/DumpRenderTreeCairo.vsprops
Tools/DumpRenderTree/win/DumpRenderTreeDebugCairoCFLite.vsprops
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/WinCairo.vsprops

index dfaf41a..c66df64 100644 (file)
@@ -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.
index 888b31d..549085d 100644 (file)
 #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
 
 #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
 
 #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
 
index a29a3f1..8f56e7a 100644 (file)
@@ -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
index 3423dd8..900b524 100644 (file)
@@ -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>
index 588694a..48a3690 100644 (file)
@@ -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"
index 2b8c165..ef8bd1d 100644 (file)
 
 #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>
index 30aa081..c78b365 100644 (file)
 #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
index a1876dd..0a3559e 100644 (file)
@@ -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
index 44e43fa..fabf18c 100644 (file)
@@ -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.
index f477532..e603afc 100644 (file)
@@ -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
index 7d17544..6d44dec 100644 (file)
@@ -7,7 +7,6 @@
        <Tool
                Name="VCCLCompilerTool"
                AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\cairo&quot;;"
-               PreprocessorDefinitions="WIN_CAIRO=1"
        />
        <Tool
                Name="VCLinkerTool"
index b0985b0..b857b4d 100644 (file)
@@ -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>
index c58e8e7..54ad496 100644 (file)
@@ -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.
index 1cd1408..e15b2d4 100644 (file)
@@ -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"