Modified: trunk/Source/WebCore/ChangeLog (93214 => 93215)
--- trunk/Source/WebCore/ChangeLog 2011-08-17 17:16:20 UTC (rev 93214)
+++ trunk/Source/WebCore/ChangeLog 2011-08-17 17:16:31 UTC (rev 93215)
@@ -1,3 +1,9 @@
+2011-08-17 Jeff Miller <[email protected]>
+
+ Re-sort the WebCore project with Visual Studio after recent changes that I assume were done by manually editing the XML.
+
+ * WebCore.vcproj/WebCore.vcproj:
+
2011-08-17 Sailesh Agrawal <[email protected]>
Chromium Mac: Fix implementation of wkScrollbarMinimumTotalLengthNeededForThumb to match WebKitSystemInterface
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (93214 => 93215)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-08-17 17:16:20 UTC (rev 93214)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2011-08-17 17:16:31 UTC (rev 93215)
@@ -558,14 +558,6 @@
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\WebKitFontFamilyNames.cpp"
- >
- </File>
- <File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\WebKitFontFamilyNames.h"
- >
- </File>
- <File
RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\InjectedScriptSource.h"
>
</File>
@@ -6666,66 +6658,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLUnknownElement.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="Production|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLElement.h"
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLUnknownElement.h"
- >
- </File>
- <File
RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLElementWrapperFactory.cpp"
>
<FileConfiguration
@@ -6778,10 +6714,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLUnknownElement.h"
- >
- </File>
- <File
RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLElementWrapperFactory.h"
>
</File>
@@ -9530,6 +9462,66 @@
>
</File>
<File
+ RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLUnknownElement.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="Production|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLUnknownElement.h"
+ >
+ </File>
+ <File
+ RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLUnknownElement.h"
+ >
+ </File>
+ <File
RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSHTMLVideoElement.cpp"
>
<FileConfiguration
@@ -24082,6 +24074,14 @@
</FileConfiguration>
</File>
<File
+ RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\WebKitFontFamilyNames.cpp"
+ >
+ </File>
+ <File
+ RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\WebKitFontFamilyNames.h"
+ >
+ </File>
+ <File
RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\XLinkNames.cpp"
>
</File>
@@ -27777,15 +27777,15 @@
>
</File>
<File
- RelativePath="..\platform\graphics\FontFeatureSettings.cpp"
+ RelativePath="..\platform\graphics\FontFastPath.cpp"
>
</File>
<File
- RelativePath="..\platform\graphics\FontFeatureSettings.h"
+ RelativePath="..\platform\graphics\FontFeatureSettings.cpp"
>
</File>
<File
- RelativePath="..\platform\graphics\FontFastPath.cpp"
+ RelativePath="..\platform\graphics\FontFeatureSettings.h"
>
</File>
<File
@@ -31589,11 +31589,11 @@
>
</File>
<File
- RelativePath="..\platform\text\LocaleToScriptMappingDefault.cpp"
+ RelativePath="..\platform\text\LocaleToScriptMapping.h"
>
</File>
<File
- RelativePath="..\platform\text\LocaleToScriptMapping.h"
+ RelativePath="..\platform\text\LocaleToScriptMappingDefault.cpp"
>
</File>
<File
@@ -42813,11 +42813,11 @@
>
</File>
<File
- RelativePath="..\xml\parser\NewXMLDocumentParser.h"
+ RelativePath="..\xml\parser\NewXMLDocumentParser.cpp"
>
</File>
<File
- RelativePath="..\xml\parser\NewXMLDocumentParser.cpp"
+ RelativePath="..\xml\parser\NewXMLDocumentParser.h"
>
</File>
<File
@@ -42945,11 +42945,11 @@
>
</File>
<File
- RelativePath="..\xml\parser\XMLTreeBuilder.h"
+ RelativePath="..\xml\parser\XMLTreeBuilder.cpp"
>
</File>
<File
- RelativePath="..\xml\parser\XMLTreeBuilder.cpp"
+ RelativePath="..\xml\parser\XMLTreeBuilder.h"
>
</File>
</Filter>
@@ -44778,12 +44778,8 @@
>
</File>
<File
- RelativePath="..\dom\DocumentMarker.h"
+ RelativePath="..\dom\DocumentMarker.cpp"
>
- </File>
- <File
- RelativePath="..\dom\DocumentMarkerController.cpp"
- >
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
@@ -44834,11 +44830,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\dom\DocumentMarkerController.h"
+ RelativePath="..\dom\DocumentMarker.h"
>
</File>
<File
- RelativePath="..\dom\DocumentMarker.cpp"
+ RelativePath="..\dom\DocumentMarkerController.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -44890,6 +44886,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\dom\DocumentMarkerController.h"
+ >
+ </File>
+ <File
RelativePath="..\dom\DocumentOrderedMap.cpp"
>
<FileConfiguration
@@ -68905,11 +68905,11 @@
>
</File>
<File
- RelativePath="..\inspector\front-end\_javascript_Formatter.js"
+ RelativePath="..\inspector\front-end\UglifyJS\_javascript_Formatter.js"
>
</File>
<File
- RelativePath="..\inspector\front-end\UglifyJS\_javascript_Formatter.js"
+ RelativePath="..\inspector\front-end\_javascript_Formatter.js"
>
</File>
<File