diff options
author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/WebCore.vcproj | |
parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/WebCore.vcproj')
-rwxr-xr-x | Source/WebCore/WebCore.vcproj/WebCore.vcproj | 586 | ||||
-rw-r--r-- | Source/WebCore/WebCore.vcproj/WebCoreQuartzCore.vsprops | 2 | ||||
-rwxr-xr-x | Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd | 1 |
3 files changed, 343 insertions, 246 deletions
diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj index 39671a0..f1da922 100755 --- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj +++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj @@ -558,6 +558,10 @@ > </File> <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\InjectedScriptSource.h" + > + </File> + <File RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\InspectorBackendDispatcher.cpp" > </File> @@ -574,10 +578,6 @@ > </File> <File - RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\InjectedScriptSource.h" - > - </File> - <File RelativePath="$(ConfigurationBuildDir)\obj\WebCore\DerivedSources\JSAbstractWorker.cpp" > <FileConfiguration @@ -7726,6 +7726,62 @@ > </File> <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLKeygenElement.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_LTCG|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLKeygenElement.h" + > + </File> + <File RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLLabelElement.cpp" > <FileConfiguration @@ -24842,10 +24898,6 @@ Name="loader" > <File - RelativePath="..\loader\ResourceLoadScheduler.h" - > - </File> - <File RelativePath="..\loader\CrossOriginAccessControl.cpp" > </File> @@ -25074,6 +25126,10 @@ > </File> <File + RelativePath="..\loader\ResourceLoadScheduler.h" + > + </File> + <File RelativePath="..\loader\SinkDocument.cpp" > </File> @@ -25421,7 +25477,7 @@ RelativePath="..\platform\ContentType.h" > </File> - <File + <File RelativePath="..\platform\ContextMenu.cpp" > </File> @@ -25429,7 +25485,7 @@ RelativePath="..\platform\ContextMenu.h" > </File> - <File + <File RelativePath="..\platform\ContextMenuItem.cpp" > </File> @@ -25698,19 +25754,19 @@ > </File> <File - RelativePath="..\platform\Scrollbar.cpp" + RelativePath="..\platform\ScrollableArea.cpp" > </File> <File - RelativePath="..\platform\Scrollbar.h" + RelativePath="..\platform\ScrollableArea.h" > </File> <File - RelativePath="..\platform\ScrollbarClient.cpp" + RelativePath="..\platform\Scrollbar.cpp" > </File> <File - RelativePath="..\platform\ScrollbarClient.h" + RelativePath="..\platform\Scrollbar.h" > </File> <File @@ -26693,6 +26749,14 @@ > </File> <File + RelativePath="..\platform\graphics\RoundedIntRect.cpp" + > + </File> + <File + RelativePath="..\platform\graphics\RoundedIntRect.h" + > + </File> + <File RelativePath="..\platform\graphics\SegmentedFontData.cpp" > </File> @@ -27332,86 +27396,6 @@ > </File> <File - RelativePath="..\platform\graphics\win\WKCACFContextFlusher.cpp" - > - <FileConfiguration - Name="Debug_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\platform\graphics\win\WKCACFContextFlusher.h" - > - <FileConfiguration - Name="Debug_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\platform\graphics\win\WKCACFLayerRenderer.cpp" - > - <FileConfiguration - Name="Debug_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\platform\graphics\win\WKCACFLayerRenderer.h" - > - <FileConfiguration - Name="Debug_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File RelativePath="..\platform\graphics\win\WKCAImageQueue.cpp" > <FileConfiguration @@ -28871,6 +28855,86 @@ Name="win" > <File + RelativePath="..\platform\graphics\ca\win\CACFLayerTreeHost.cpp" + > + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\platform\graphics\ca\win\CACFLayerTreeHost.h" + > + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\platform\graphics\ca\win\LayerChangesFlusher.cpp" + > + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\platform\graphics\ca\win\LayerChangesFlusher.h" + > + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + </File> + <File RelativePath="..\platform\graphics\ca\win\PlatformCAAnimationWin.cpp" > </File> @@ -28888,7 +28952,7 @@ </File> </Filter> </Filter> - </Filter> + </Filter> <Filter Name="network" > @@ -38464,88 +38528,88 @@ > </File> <Filter - Name="mathml" - > - <File - RelativePath="..\rendering\mathml\RenderMathMLBlock.cpp" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLBlock.h" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLFenced.cpp" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLFenced.h" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLFraction.cpp" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLFraction.h" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLMath.cpp" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLMath.h" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLOperator.cpp" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLOperator.h" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLRoot.cpp" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLRoot.h" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLRow.cpp" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLRow.h" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLSquareRoot.cpp" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLSquareRoot.h" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLSubSup.cpp" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLSubSup.h" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLUnderOver.cpp" - > - </File> - <File - RelativePath="..\rendering\mathml\RenderMathMLUnderOver.h" - > - </File> + Name="mathml" + > + <File + RelativePath="..\rendering\mathml\RenderMathMLBlock.cpp" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLBlock.h" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLFenced.cpp" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLFenced.h" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLFraction.cpp" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLFraction.h" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLMath.cpp" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLMath.h" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLOperator.cpp" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLOperator.h" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLRoot.cpp" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLRoot.h" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLRow.cpp" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLRow.h" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLSquareRoot.cpp" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLSquareRoot.h" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLSubSup.cpp" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLSubSup.h" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLUnderOver.cpp" + > + </File> + <File + RelativePath="..\rendering\mathml\RenderMathMLUnderOver.h" + > + </File> </Filter> <Filter Name="style" @@ -43633,7 +43697,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug_Cairo_CFLite|Win32" + Name="Debug_All|Win32" ExcludedFromBuild="true" > <Tool @@ -43641,7 +43705,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release_Cairo_CFLite|Win32" + Name="Debug_Cairo_CFLite|Win32" ExcludedFromBuild="true" > <Tool @@ -43649,7 +43713,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug_All|Win32" + Name="Release_Cairo_CFLite|Win32" ExcludedFromBuild="true" > <Tool @@ -43657,7 +43721,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release_LTCG|Win32" + Name="Debug_All|Win32" ExcludedFromBuild="true" > <Tool @@ -43670,7 +43734,7 @@ > </File> <File - RelativePath="..\dom\EventTarget.cpp" + RelativePath="..\dom\EventQueue.cpp" > <FileConfiguration Name="Debug|Win32" @@ -43705,7 +43769,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug_All|Win32" + Name="Release_LTCG|Win32" ExcludedFromBuild="true" > <Tool @@ -43725,8 +43789,8 @@ RelativePath="..\dom\EventTarget.h" > </File> - <File - RelativePath="..\dom\EventQueue.cpp" + <File + RelativePath="..\dom\EventTarget.cpp" > <FileConfiguration Name="Debug|Win32" @@ -46186,6 +46250,10 @@ > </File> <File + RelativePath="..\dom\TextEventInputType.h" + > + </File> + <File RelativePath="..\dom\TransformSource.h" > </File> @@ -58133,6 +58201,62 @@ > </File> <File + RelativePath="..\bindings\js\JSErrorHandler.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_LTCG|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\bindings\js\JSErrorHandler.h" + > + </File> + <File RelativePath="..\bindings\js\JSEventCustom.cpp" > <FileConfiguration @@ -61649,62 +61773,6 @@ </FileConfiguration> </File> <File - RelativePath="..\bindings\js\JSWorkerContextErrorHandler.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_All|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_LTCG|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\bindings\js\JSWorkerContextErrorHandler.h" - > - </File> - <File RelativePath="..\bindings\js\JSWorkerCustom.cpp" > <FileConfiguration @@ -65150,6 +65218,14 @@ > </File> <File + RelativePath="..\inspector\InspectorRuntimeAgent.cpp" + > + </File> + <File + RelativePath="..\inspector\InspectorRuntimeAgent.h" + > + </File> + <File RelativePath="..\inspector\InspectorSettings.cpp" > </File> @@ -65333,6 +65409,14 @@ > </File> <File + RelativePath="..\inspector\front-end\CSSCompletions.js" + > + </File> + <File + RelativePath="..\inspector\front-end\CSSKeywordCompletions.js" + > + </File> + <File RelativePath="..\inspector\front-end\CSSStyleModel.js" > </File> @@ -65457,10 +65541,6 @@ > </File> <File - RelativePath="..\inspector\front-end\InjectedScriptAccess.js" - > - </File> - <File RelativePath="..\inspector\front-end\inspector.css" > </File> @@ -65589,6 +65669,14 @@ > </File> <File + RelativePath="..\inspector\front-end\ScriptFormatter.js" + > + </File> + <File + RelativePath="..\inspector\front-end\scriptFormatterWorker.js" + > + </File> + <File RelativePath="..\inspector\front-end\ScriptsPanel.js" > </File> @@ -65724,6 +65812,14 @@ RelativePath="..\inspector\front-end\WorkersSidebarPane.js" > </File> + <File + RelativePath="..\inspector\front-end\UglifyJS\parse-js.js" + > + </File> + <File + RelativePath="..\inspector\front-end\UglifyJS\process.js" + > + </File> </Filter> </Filter> <Filter diff --git a/Source/WebCore/WebCore.vcproj/WebCoreQuartzCore.vsprops b/Source/WebCore/WebCore.vcproj/WebCoreQuartzCore.vsprops index a9866d9..48328c9 100644 --- a/Source/WebCore/WebCore.vcproj/WebCoreQuartzCore.vsprops +++ b/Source/WebCore/WebCore.vcproj/WebCoreQuartzCore.vsprops @@ -6,7 +6,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(DXSDK_DIR)\Include"" + AdditionalIncludeDirectories=""$(ProjectDir)\..\platform\graphics\ca\win";"$(DXSDK_DIR)\Include"" PreprocessorDefinitions="QUARTZCORE_DLL" /> </VisualStudioPropertySheet> diff --git a/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd b/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd index 7393d34..b3f19c6 100755 --- a/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd +++ b/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd @@ -39,6 +39,7 @@ xcopy /y /d "%ProjectDir%..\platform\graphics\*.h" "%CONFIGURATIONBUILDDIR%\incl xcopy /y /d "%ProjectDir%..\platform\graphics\%1\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" xcopy /y /d "%ProjectDir%..\platform\graphics\transforms\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" xcopy /y /d "%ProjectDir%..\platform\graphics\ca\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" +xcopy /y /d "%ProjectDir%..\platform\graphics\ca\win\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" xcopy /y /d "%ProjectDir%..\platform\graphics\win\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" xcopy /y /d "%ProjectDir%..\platform\graphics\win\%1\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" xcopy /y /d "%ProjectDir%..\platform\graphics\opentype\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore" |