third_party/WebKit/WebCore/WebCore.vcproj/WebCore.vcproj - Issue 20076: WebKit merge 40500:40539 [WebKit side]

Unified Diff: third_party/WebKit/WebCore/WebCore.vcproj/WebCore.vcproj

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: third_party/WebKit/WebCore/WebCore.vcproj/WebCore.vcproj

===================================================================

--- third_party/WebKit/WebCore/WebCore.vcproj/WebCore.vcproj (revision 9118)

+++ third_party/WebKit/WebCore/WebCore.vcproj/WebCore.vcproj (working copy)

@@ -24,7 +24,7 @@

<Tool

Name="VCPreBuildEventTool"

- CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

touch "$(WebKitOutputDir)\tmp.cpp"
cl /analyze /nologo /c "$(WebKitOutputDir)\tmp.cpp" 2>&1 | findstr D9040
if ERRORLEVEL 0 set EnablePREfast="false" else set EnablePREfast="true"
if ERRORLEVEL 0 set AnalyzeWithLargeStack="" AnalyzeWithLargeStack="/analyze:65536"
exit /b
"

+ CommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

touch "$(WebKitOutputDir)\tmp.cpp"
cl /analyze /nologo /c "$(WebKitOutputDir)\tmp.cpp" 2>&1 | findstr D9040
if ERRORLEVEL 1 (set EnablePREfast="true") else (set EnablePREfast="false")
if ERRORLEVEL 1 (set AnalyzeWithLargeStack="/analyze:65536") else (set AnalyzeWithLargeStack="")
exit /b
"

<Tool

Name="VCCustomBuildTool"

@@ -85,7 +85,7 @@

<Tool

Name="VCPreBuildEventTool"

<Tool

Name="VCCustomBuildTool"

@@ -145,7 +145,7 @@

<Tool

Name="VCPreBuildEventTool"

<Tool

Name="VCCustomBuildTool"

@@ -206,7 +206,7 @@

<Tool

Name="VCPreBuildEventTool"

<Tool

Name="VCCustomBuildTool"

@@ -268,7 +268,7 @@

<Tool

Name="VCPreBuildEventTool"

<Tool

Name="VCCustomBuildTool"

@@ -329,7 +329,7 @@

<Tool

Name="VCPreBuildEventTool"

<Tool

Name="VCCustomBuildTool"

@@ -2939,6 +2939,14 @@

RelativePath="..\loader\ThreadableLoaderClient.h"

</File>

+ <File

+ RelativePath="..\loader\WorkerThreadableLoader.cpp"

+ >

+ </File>

+ <File

+ RelativePath="..\loader\WorkerThreadableLoader.h"

+ >

+ </File>

<Filter

Name="icon"

@@ -9225,7 +9233,7 @@

RelativePath="..\rendering\RenderLegend.h"

</File>

- <File

+ <File

RelativePath="..\rendering\RenderLineBoxList.cpp"

<FileConfiguration

@@ -9353,7 +9361,7 @@

RelativePath="..\rendering\RenderObject.h"

</File>

- <File

+ <File

RelativePath="..\rendering\RenderObjectChildList.cpp"

<FileConfiguration

@@ -11122,6 +11130,22 @@

</File>

<File

+ RelativePath="..\dom\CrossThreadCopier.cpp"

+ >

+ <FileConfiguration

+ Name="Release_PGO|Win32"

+ >

+ <Tool

+ Name="VCCLCompilerTool"

+ WholeProgramOptimization="true"

+ />

+ </FileConfiguration>

+ </File>

+ <File

+ RelativePath="..\dom\CrossThreadCopier.h"

+ >

+ </File>

+ <File

RelativePath="..\dom\CSSMappedAttributeDeclaration.cpp"

<FileConfiguration

@@ -11414,7 +11438,7 @@

</File>

<File

- RelativePath="..\dom\FormControlElementWithState.cpp"

+ RelativePath="..\dom\FormControlElement.cpp"

<FileConfiguration

Name="Release_PGO|Win32"

@@ -11426,11 +11450,11 @@

</FileConfiguration>

</File>

<File

- RelativePath="..\dom\FormControlElementWithState.h"

+ RelativePath="..\dom\FormControlElement.h"

</File>

<File

- RelativePath="..\dom\FormControlElement.cpp"

+ RelativePath="..\dom\FormControlElementWithState.cpp"

<FileConfiguration

Name="Release_PGO|Win32"

@@ -11442,7 +11466,7 @@

</FileConfiguration>

</File>

<File

- RelativePath="..\dom\FormControlElement.h"

+ RelativePath="..\dom\FormControlElementWithState.h"

</File>

<File

@@ -11714,7 +11738,7 @@

</File>

<File

- RelativePath="..\dom\OptionGroupElement.cpp"

+ RelativePath="..\dom\OptionElement.cpp"

<FileConfiguration

Name="Release_PGO|Win32"

@@ -11726,11 +11750,11 @@

</FileConfiguration>

</File>

<File

- RelativePath="..\dom\OptionGroupElement.h"

+ RelativePath="..\dom\OptionElement.h"

</File>

<File

- RelativePath="..\dom\OptionElement.cpp"

+ RelativePath="..\dom\OptionGroupElement.cpp"

<FileConfiguration

Name="Release_PGO|Win32"

@@ -11742,7 +11766,7 @@

</FileConfiguration>

</File>

<File

- RelativePath="..\dom\OptionElement.h"

+ RelativePath="..\dom\OptionGroupElement.h"

</File>

<File

@@ -12198,14 +12222,6 @@

</File>

<File

- RelativePath="..\dom\WorkerTask.cpp"

- >

- </File>

- <File

- RelativePath="..\dom\WorkerTask.h"

- >

- </File>

- <File

RelativePath="..\dom\WorkerThread.cpp"

</File>

@@ -16366,31 +16382,31 @@

</File>

<File

- RelativePath="..\bridge\NP_jsobject.cpp"

+ RelativePath="..\bridge\IdentifierRep.cpp"

</File>

<File

- RelativePath="..\bridge\NP_jsobject.h"

+ RelativePath="..\bridge\IdentifierRep.h"

</File>

<File

- RelativePath="..\bridge\npapi.h"

+ RelativePath="..\bridge\NP_jsobject.cpp"

</File>

<File

- RelativePath="..\bridge\npruntime.cpp"

+ RelativePath="..\bridge\NP_jsobject.h"

</File>

<File

- RelativePath="..\bridge\npruntime.h"

+ RelativePath="..\bridge\npapi.h"

</File>

<File

- RelativePath="..\bridge\IdentifierRep.cpp"

+ RelativePath="..\bridge\npruntime.cpp"

</File>

<File

- RelativePath="..\bridge\IdentifierRep.h"

+ RelativePath="..\bridge\npruntime.h"

</File>

<File

@@ -16766,19 +16782,19 @@

</File>

<File

- RelativePath="..\wml\WMLFormControlElement.cpp"

+ RelativePath="..\wml\WMLFieldSetElement.cpp"

</File>

<File

- RelativePath="..\wml\WMLFormControlElement.h"

+ RelativePath="..\wml\WMLFieldSetElement.h"

</File>

<File

- RelativePath="..\wml\WMLFieldSetElement.cpp"

+ RelativePath="..\wml\WMLFormControlElement.cpp"

</File>

<File

- RelativePath="..\wml\WMLFieldSetElement.h"

+ RelativePath="..\wml\WMLFormControlElement.h"

</File>

<File

« no previous file with comments | « third_party/WebKit/WebCore/WebCore.base.exp ('k') | third_party/WebKit/WebCore/WebCore.xcodeproj/project.pbxproj » ('j') | no next file with comments »