Changeset 70540 in webkit

Timestamp:

Oct 26, 2010 11:04:55 AM (14 years ago)

Author:

Adam Roben

Message:

Pull in the FeatureDefines*.vsprops files when building DRT

This ensures that various ENABLE() macros will get set correctly.
(Prior to r70320 we were picking up the ENABLE(3D_RENDERING) flag
through wtf/Platform.h.)

Fixes <​http://webkit.org/b/48343> REGRESSION (r70320): DumpRenderTree
says 3D_RENDERING is disabled even when it is enabled

Reviewed by Ada Chan.

• DumpRenderTree/win/DumpRenderTree.vcproj: Added

FeaturesDefines*.vsprops to all configurations.

• DumpRenderTree/win/DumpRenderTreeWin.h: Touched to force a rebuild.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/win/DumpRenderTree.vcproj (modified) (6 diffs)
• DumpRenderTree/win/DumpRenderTreeWin.h (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-26  Adam Roben  <aroben@apple.com>
+
+        Pull in the FeatureDefines*.vsprops files when building DRT
+
+        This ensures that various ENABLE() macros will get set correctly.
+        (Prior to r70320 we were picking up the ENABLE(3D_RENDERING) flag
+        through wtf/Platform.h.)
+
+        Fixes <http://webkit.org/b/48343> REGRESSION (r70320): DumpRenderTree
+        says 3D_RENDERING is disabled even when it is enabled
+
+        Reviewed by Ada Chan.
+
+        * DumpRenderTree/win/DumpRenderTree.vcproj: Added
+        FeaturesDefines*.vsprops to all configurations.
+
+        * DumpRenderTree/win/DumpRenderTreeWin.h: Touched to force a rebuild.
+
 2010-10-26  Søren Gjesse  <sgjesse@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj

@@ -19 +19 @@
                         Name="Debug|Win32"
                         ConfigurationType="1"
-                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"
+                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops"
                         CharacterSet="1"
                         >
@@ -92 +92 @@
                         Name="Release|Win32"
                         ConfigurationType="1"
-                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"
+                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
@@ -166 +166 @@
                         Name="Debug_Internal|Win32"
                         ConfigurationType="1"
-                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"
+                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops"
                         CharacterSet="1"
                         >
@@ -238 +238 @@
                         Name="Debug_Cairo|Win32"
                         ConfigurationType="1"
-                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_wincairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops"
+                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_wincairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops"
                         CharacterSet="1"
                         >
@@ -311 +311 @@
                         Name="Release_Cairo|Win32"
                         ConfigurationType="1"
-                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops"
+                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\release.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops"
                         CharacterSet="1"
                         WholeProgramOptimization="1"
@@ -385 +385 @@
                         Name="Debug_All|Win32"
                         ConfigurationType="1"
-                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_all.vsprops"
+                        InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_internal.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_all.vsprops"
                         CharacterSet="1"
                         >

trunk/WebKitTools/DumpRenderTree/win/DumpRenderTreeWin.h

@@ -13 +13 @@
  * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
+ *     from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY