Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (90939 => 90940)
--- trunk/Source/_javascript_Core/ChangeLog 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-07-13 19:31:52 UTC (rev 90940)
@@ -1,3 +1,12 @@
+2011-07-12 Brent Fulgham <[email protected]>
+
+ 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 <[email protected]>
Possible race condition in ThreadIdentifierData::initializeKeyOnce and shouldCallRealDebugger.
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (90939 => 90940)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2011-07-13 19:31:52 UTC (rev 90940)
@@ -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
Modified: trunk/Source/WebCore/ChangeLog (90939 => 90940)
--- trunk/Source/WebCore/ChangeLog 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/Source/WebCore/ChangeLog 2011-07-13 19:31:52 UTC (rev 90940)
@@ -1,3 +1,20 @@
+2011-07-12 Brent Fulgham <[email protected]>
+
+ 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 <[email protected]>
[CSS Exclusions] Fix for comment #23 on wrap-shape parsing bug 61726
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCoreCairo.vsprops (90939 => 90940)
--- trunk/Source/WebCore/WebCore.vcproj/WebCoreCairo.vsprops 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCoreCairo.vsprops 2011-07-13 19:31:52 UTC (rev 90940)
@@ -7,6 +7,5 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(ProjectDir)..\platform\graphics\cairo";"$(ProjectDir)..\platform\graphics\win\cairo";"$(ProjectDir)..\svg\graphics\cairo";"$(ProjectDir)..\platform\image-decoders";"$(ProjectDir)..\platform\image-decoders\bmp";"$(ProjectDir)..\platform\image-decoders\cairo";"$(ProjectDir)..\platform\image-decoders\gif";"$(ProjectDir)..\platform\image-decoders\ico";"$(ProjectDir)..\platform\image-decoders\jpeg";"$(ProjectDir)..\platform\image-decoders\png";"$(ProjectDir)..\platform\image-decoders\webp";"$(WebKitLibrariesDir)\include\cairo""
- PreprocessorDefinitions="WIN_CAIRO"
/>
</VisualStudioPropertySheet>
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCoreDebugCairoCFLite.vsprops (90939 => 90940)
--- trunk/Source/WebCore/WebCore.vcproj/WebCoreDebugCairoCFLite.vsprops 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCoreDebugCairoCFLite.vsprops 2011-07-13 19:31:52 UTC (rev 90940)
@@ -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"
Modified: trunk/Source/WebCore/WebCorePrefix.h (90939 => 90940)
--- trunk/Source/WebCore/WebCorePrefix.h 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/Source/WebCore/WebCorePrefix.h 2011-07-13 19:31:52 UTC (rev 90940)
@@ -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>
Modified: trunk/Source/WebCore/config.h (90939 => 90940)
--- trunk/Source/WebCore/config.h 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/Source/WebCore/config.h 2011-07-13 19:31:52 UTC (rev 90940)
@@ -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
Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (90939 => 90940)
--- trunk/Source/WebKit2/win/WebKit2CFLite.def 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def 2011-07-13 19:31:52 UTC (rev 90940)
@@ -127,7 +127,10 @@
?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
Modified: trunk/Tools/ChangeLog (90939 => 90940)
--- trunk/Tools/ChangeLog 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/Tools/ChangeLog 2011-07-13 19:31:52 UTC (rev 90940)
@@ -1,3 +1,19 @@
+2011-07-12 Brent Fulgham <[email protected]>
+
+ 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 <[email protected]>
Eliminate TestExpectationsFile.
Modified: trunk/Tools/DumpRenderTree/config.h (90939 => 90940)
--- trunk/Tools/DumpRenderTree/config.h 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/Tools/DumpRenderTree/config.h 2011-07-13 19:31:52 UTC (rev 90940)
@@ -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
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTreeCairo.vsprops (90939 => 90940)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTreeCairo.vsprops 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTreeCairo.vsprops 2011-07-13 19:31:52 UTC (rev 90940)
@@ -7,7 +7,6 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(ProjectDir)\..\cairo";"
- PreprocessorDefinitions="WIN_CAIRO=1"
/>
<Tool
Name="VCLinkerTool"
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTreeDebugCairoCFLite.vsprops (90939 => 90940)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTreeDebugCairoCFLite.vsprops 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTreeDebugCairoCFLite.vsprops 2011-07-13 19:31:52 UTC (rev 90940)
@@ -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>
Modified: trunk/WebKitLibraries/ChangeLog (90939 => 90940)
--- trunk/WebKitLibraries/ChangeLog 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/WebKitLibraries/ChangeLog 2011-07-13 19:31:52 UTC (rev 90940)
@@ -1,3 +1,13 @@
+2011-07-12 Brent Fulgham <[email protected]>
+
+ 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 <[email protected]>
Update the header file too.
Modified: trunk/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops (90939 => 90940)
--- trunk/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops 2011-07-13 19:19:23 UTC (rev 90939)
+++ trunk/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops 2011-07-13 19:31:52 UTC (rev 90940)
@@ -7,7 +7,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo";"$(SolutionDir)\..\..\..\_javascript_Core\os-win32""
- PreprocessorDefinitions="WIN_CAIRO=1"
+ PreprocessorDefinitions="WTF_PLATFORM_WIN_CAIRO=1"
/>
<Tool
Name="VCLinkerTool"
