diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebCore/WebCore.vcproj | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebCore/WebCore.vcproj')
| -rw-r--r-- | WebCore/WebCore.vcproj/WebCore.vcproj | 518 |
1 files changed, 113 insertions, 405 deletions
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj index 0c624c2..eeb9d7f 100644 --- a/WebCore/WebCore.vcproj/WebCore.vcproj +++ b/WebCore/WebCore.vcproj/WebCore.vcproj @@ -3693,6 +3693,14 @@ >
</File>
<File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileError.cpp"
+ >
+ </File>
+ <File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileError.h"
+ >
+ </File>
+ <File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSFileList.cpp"
>
<FileConfiguration
@@ -8141,7 +8149,7 @@ >
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMedia.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSStyleMedia.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -8193,7 +8201,7 @@ </FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMedia.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSStyleMedia.h"
>
</File>
<File
@@ -22862,10 +22870,6 @@ >
</File>
<File
- RelativePath="..\platform\graphics\GlyphMetricsMap.cpp"
- >
- </File>
- <File
RelativePath="..\platform\graphics\GlyphMetricsMap.h"
>
</File>
@@ -23505,7 +23509,7 @@ >
</File>
<File
- RelativePath="..\platform\graphics\win\RefCountedHFONT.h"
+ RelativePath="..\platform\graphics\win\RefCountedGDIHandle.h"
>
</File>
<File
@@ -27171,11 +27175,11 @@ >
</File>
<File
- RelativePath="..\css\Media.cpp"
+ RelativePath="..\css\StyleMedia.cpp"
>
</File>
<File
- RelativePath="..\css\Media.h"
+ RelativePath="..\css\StyleMedia.h"
>
</File>
<File
@@ -27939,6 +27943,10 @@ >
</File>
<File
+ RelativePath="..\rendering\RenderSVGResource.cpp"
+ >
+ </File>
+ <File
RelativePath="..\rendering\RenderSVGResource.h"
>
</File>
@@ -27959,6 +27967,22 @@ >
</File>
<File
+ RelativePath="..\rendering\RenderSVGResourceGradient.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\RenderSVGResourceGradient.h"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\RenderSVGResourceLinearGradient.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\RenderSVGResourceLinearGradient.h"
+ >
+ </File>
+ <File
RelativePath="..\rendering\RenderSVGResourceMarker.cpp"
>
</File>
@@ -27975,6 +27999,30 @@ >
</File>
<File
+ RelativePath="..\rendering\RenderSVGResourcePattern.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\RenderSVGResourcePattern.h"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\RenderSVGResourceRadialGradient.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\RenderSVGResourceRadialGradient.h"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\RenderSVGResourceSolidColor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\RenderSVGResourceSolidColor.h"
+ >
+ </File>
+ <File
RelativePath="..\rendering\RenderSVGRoot.cpp"
>
</File>
@@ -28261,6 +28309,14 @@ >
</File>
<File
+ RelativePath="..\rendering\SVGCharacterData.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\SVGCharacterData.h"
+ >
+ </File>
+ <File
RelativePath="..\rendering\SVGCharacterLayoutInfo.cpp"
>
</File>
@@ -28329,6 +28385,10 @@ >
</File>
<File
+ RelativePath="..\rendering\SVGTextChunkLayoutInfo.h"
+ >
+ </File>
+ <File
RelativePath="..\rendering\TableLayout.h"
>
</File>
@@ -29555,6 +29615,10 @@ >
</File>
<File
+ RelativePath="..\dom\TreeDepthLimit.h"
+ >
+ </File>
+ <File
RelativePath="..\dom\TreeWalker.cpp"
>
</File>
@@ -30331,6 +30395,10 @@ >
</File>
<File
+ RelativePath="..\html\FileError.h"
+ >
+ </File>
+ <File
RelativePath="..\html\FileList.cpp"
>
</File>
@@ -30339,6 +30407,14 @@ >
</File>
<File
+ RelativePath="..\html\FileReader.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\html\FileReader.h"
+ >
+ </File>
+ <File
RelativePath="..\html\FileStream.cpp"
>
</File>
@@ -34731,58 +34807,6 @@ >
</File>
<File
- RelativePath="..\bindings\js\JSAbstractWorkerCustom.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\bindings\js\JSAttrCustom.cpp"
>
<FileConfiguration
@@ -35479,62 +35503,6 @@ >
</File>
<File
- RelativePath="..\bindings\js\JSCustomSQLStatementCallback.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\bindings\js\JSCustomSQLStatementCallback.h"
- >
- </File>
- <File
RelativePath="..\bindings\js\JSCustomSQLStatementErrorCallback.cpp"
>
<FileConfiguration
@@ -35587,122 +35555,6 @@ </FileConfiguration>
</File>
<File
- RelativePath="..\bindings\js\JSCustomSQLStatementErrorCallback.h"
- >
- </File>
- <File
- RelativePath="..\bindings\js\JSCustomSQLTransactionCallback.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\bindings\js\JSCustomSQLTransactionCallback.h"
- >
- </File>
- <File
- RelativePath="..\bindings\js\JSCustomSQLTransactionErrorCallback.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\bindings\js\JSCustomSQLTransactionErrorCallback.h"
- >
- </File>
- <File
RelativePath="..\bindings\js\JSCustomVoidCallback.cpp"
>
<FileConfiguration
@@ -35815,14 +35667,6 @@ >
</File>
<File
- RelativePath="..\bindings\js\JSDatabaseCallback.cpp"
- >
- </File>
- <File
- RelativePath="..\bindings\js\JSDatabaseCallback.h"
- >
- </File>
- <File
RelativePath="..\bindings\js\JSDatabaseCustom.cpp"
>
<FileConfiguration
@@ -36143,58 +35987,6 @@ </FileConfiguration>
</File>
<File
- RelativePath="..\bindings\js\JSDocumentFragmentCustom.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\bindings\js\JSDOMApplicationCacheCustom.cpp"
>
<FileConfiguration
@@ -36755,58 +36547,6 @@ >
</File>
<File
- RelativePath="..\bindings\js\JSEventSourceCustom.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\bindings\js\JSEventTarget.cpp"
>
<FileConfiguration
@@ -42329,66 +42069,6 @@ RelativePath="..\svg\graphics\SVGImage.h"
>
</File>
- <File
- RelativePath="..\svg\graphics\SVGPaintServer.cpp"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGPaintServer.h"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGPaintServerGradient.cpp"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGPaintServerGradient.h"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGPaintServerLinearGradient.cpp"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGPaintServerLinearGradient.h"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGPaintServerPattern.cpp"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGPaintServerPattern.h"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGPaintServerRadialGradient.cpp"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGPaintServerRadialGradient.h"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGPaintServerSolid.cpp"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGPaintServerSolid.h"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGResource.cpp"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGResource.h"
- >
- </File>
- <File
- RelativePath="..\svg\graphics\SVGResourceListener.h"
- >
- </File>
<Filter
Name="filters"
>
@@ -42871,6 +42551,14 @@ >
</File>
<File
+ RelativePath="..\storage\DatabaseSync.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\storage\DatabaseSync.h"
+ >
+ </File>
+ <File
RelativePath="..\storage\DatabaseTask.h"
>
</File>
@@ -42995,6 +42683,18 @@ >
</File>
<File
+ RelativePath="..\storage\SQLTransactionSync.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\storage\SQLTransactionSync.h"
+ >
+ </File>
+ <File
+ RelativePath="..\storage\SQLTransactionSyncCallback.h"
+ >
+ </File>
+ <File
RelativePath="..\storage\Storage.cpp"
>
</File>
@@ -43239,6 +42939,14 @@ >
</File>
<File
+ RelativePath="..\inspector\InspectorCSSStore.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\inspector\InspectorCSSStore.h"
+ >
+ </File>
+ <File
RelativePath="..\inspector\InspectorClient.h"
>
</File>
|