summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/message_loop.h1
-rw-r--r--chrome/installer/util/prebuild/util_prebuild.vcproj96
-rw-r--r--chrome/test/activex_test_control/chrome_test_control.h10
-rw-r--r--webkit/build/JSConfig/V8Config.vcproj92
-rw-r--r--webkit/build/V8Bindings/V8Bindings_prebuild.vcproj112
5 files changed, 48 insertions, 263 deletions
diff --git a/base/message_loop.h b/base/message_loop.h
index 6bb7395..9fdbbc0 100644
--- a/base/message_loop.h
+++ b/base/message_loop.h
@@ -411,7 +411,6 @@ class MessageLoop {
void Push(Task* task);
Task* Pop(); // Extract the next Task from the queue, and return it.
bool Empty() const { return !first_; }
- friend void std::swap<TaskQueue>(TaskQueue&, TaskQueue&);
private:
Task* first_;
Task* last_;
diff --git a/chrome/installer/util/prebuild/util_prebuild.vcproj b/chrome/installer/util/prebuild/util_prebuild.vcproj
index 1269dde..d3efe6d 100644
--- a/chrome/installer/util/prebuild/util_prebuild.vcproj
+++ b/chrome/installer/util/prebuild/util_prebuild.vcproj
@@ -16,7 +16,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- ConfigurationType="1"
+ ConfigurationType="10"
InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops"
>
<Tool
@@ -29,57 +29,15 @@
Outputs="$(IntDir)\setup_strings.rc;$(IntDir)\setup_strings.h"
/>
<Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
Name="VCMIDLTool"
/>
<Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
- ConfigurationType="1"
+ ConfigurationType="10"
InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops"
>
<Tool
@@ -92,51 +50,9 @@
Outputs="$(IntDir)\setup_strings.rc;$(IntDir)\setup_strings.h"
/>
<Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
Name="VCMIDLTool"
/>
<Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -144,6 +60,14 @@
<References>
</References>
<Files>
+ <File
+ RelativePath=".\create_string_rc.bat"
+ >
+ </File>
+ <File
+ RelativePath=".\create_string_rc.py"
+ >
+ </File>
</Files>
<Globals>
</Globals>
diff --git a/chrome/test/activex_test_control/chrome_test_control.h b/chrome/test/activex_test_control/chrome_test_control.h
index e923307..f63897d 100644
--- a/chrome/test/activex_test_control/chrome_test_control.h
+++ b/chrome/test/activex_test_control/chrome_test_control.h
@@ -107,10 +107,12 @@ END_COM_MAP()
BEGIN_PROP_MAP(ChromeTestControl)
PROP_DATA_ENTRY("_cx", m_sizeExtent.cx, VT_UI4)
PROP_DATA_ENTRY("_cy", m_sizeExtent.cy, VT_UI4)
- PROP_ENTRY("BackColor", DISPID_BACKCOLOR, CLSID_StockColorPage)
- PROP_ENTRY("BorderColor", DISPID_BORDERCOLOR, CLSID_StockColorPage)
- PROP_ENTRY("Caption", DISPID_CAPTION, CLSID_NULL)
- PROP_ENTRY("ForeColor", DISPID_FORECOLOR, CLSID_StockColorPage)
+ PROP_ENTRY_TYPE("BackColor", DISPID_BACKCOLOR, CLSID_StockColorPage,
+ VT_COLOR)
+ PROP_ENTRY_TYPE("BorderColor", DISPID_BORDERCOLOR, CLSID_StockColorPage,
+ VT_COLOR)
+ PROP_ENTRY_TYPE("Caption", DISPID_CAPTION, CLSID_NULL, VT_BSTR)
+ PROP_ENTRY_TYPE("ForeColor", DISPID_FORECOLOR, CLSID_StockColorPage, VT_COLOR)
// Example entries
// PROP_ENTRY("Property Description", dispid, clsid)
// PROP_PAGE(CLSID_StockColorPage)
diff --git a/webkit/build/JSConfig/V8Config.vcproj b/webkit/build/JSConfig/V8Config.vcproj
index 4451f23..b0d3f9f 100644
--- a/webkit/build/JSConfig/V8Config.vcproj
+++ b/webkit/build/JSConfig/V8Config.vcproj
@@ -16,7 +16,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- ConfigurationType="1"
+ ConfigurationType="10"
InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops"
>
<Tool
@@ -29,57 +29,15 @@
Outputs="$(OutDir)\obj\WebCore\config.h"
/>
<Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
Name="VCMIDLTool"
/>
<Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
- ConfigurationType="1"
+ ConfigurationType="10"
InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops"
>
<Tool
@@ -92,51 +50,9 @@
Outputs="$(OutDir)\obj\WebCore\config.h"
/>
<Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
Name="VCMIDLTool"
/>
<Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -144,6 +60,10 @@
<References>
</References>
<Files>
+ <File
+ RelativePath=".\prebuild.bat"
+ >
+ </File>
</Files>
<Globals>
</Globals>
diff --git a/webkit/build/V8Bindings/V8Bindings_prebuild.vcproj b/webkit/build/V8Bindings/V8Bindings_prebuild.vcproj
index 2cdbf7b..598d4ae 100644
--- a/webkit/build/V8Bindings/V8Bindings_prebuild.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings_prebuild.vcproj
@@ -16,7 +16,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- ConfigurationType="1"
+ ConfigurationType="10"
InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops"
>
<Tool
@@ -29,57 +29,15 @@
Outputs="$(OutDir)\obj\V8Bindings\DerivedSources\HTMLNames.cpp"
/>
<Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
Name="VCMIDLTool"
/>
<Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
- ConfigurationType="1"
+ ConfigurationType="10"
InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops"
>
<Tool
@@ -92,51 +50,9 @@
Outputs="$(OutDir)\obj\V8Bindings\DerivedSources\HTMLNames.cpp"
/>
<Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
Name="VCMIDLTool"
/>
<Tool
- Name="VCCLCompilerTool"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -144,6 +60,30 @@
<References>
</References>
<Files>
+ <File
+ RelativePath=".\build-generated-files.sh"
+ >
+ </File>
+ <File
+ RelativePath="..\..\port\bindings\scripts\CodeGeneratorV8.pm"
+ >
+ </File>
+ <File
+ RelativePath=".\copy_files.bat"
+ >
+ </File>
+ <File
+ RelativePath="..\..\port\DerivedSources.make"
+ >
+ </File>
+ <File
+ RelativePath="..\..\port\bindings\scripts\generate-bindings.pl"
+ >
+ </File>
+ <File
+ RelativePath=".\prebuild.bat"
+ >
+ </File>
</Files>
<Globals>
</Globals>
generated by cgit v1.1 at 2025-01-18 04:00:02 +0000