summaryrefslogtreecommitdiffstats
path: root/webkit/build
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-01 23:52:55 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-01 23:52:55 +0000
commitbac0eb59f9ca057ff2b7eab7dab3664a37f0f2a5 (patch)
tree3a06712465407da8111c4477f23192f3840b0cb2 /webkit/build
parentdc90da2c3f8c87baa8dcea7fbf0272001d771ecf (diff)
downloadchromium_src-bac0eb59f9ca057ff2b7eab7dab3664a37f0f2a5.zip
chromium_src-bac0eb59f9ca057ff2b7eab7dab3664a37f0f2a5.tar.gz
chromium_src-bac0eb59f9ca057ff2b7eab7dab3664a37f0f2a5.tar.bz2
src/webkit side of webkit merge 38729:38760
Review URL: http://codereview.chromium.org/13028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
-rw-r--r--webkit/build/WebCore/WebCore.vcproj30
1 files changed, 21 insertions, 9 deletions
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 000139a..2cc81e7 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -252,6 +252,14 @@
<File
RelativePath="..\..\..\third_party\WebKit\WebCore\page\Console.cpp"
>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ GeneratePreprocessedFile="0"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\third_party\WebKit\WebCore\page\Console.h"
@@ -958,23 +966,23 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphBuffer.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GeolocationService.cpp"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphPageTreeNode.cpp"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GeolocationService.h"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphPageTreeNode.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphBuffer.h"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GeolocationService.cpp"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphPageTreeNode.cpp"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GeolocationService.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphPageTreeNode.h"
>
</File>
<File
@@ -1009,7 +1017,7 @@
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\LengthSize.h"
>
</File>
- <File
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\LinkHash.cpp"
>
</File>
@@ -1082,6 +1090,10 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\PurgeableBuffer.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ScrollBar.cpp"
>
</File>
@@ -1154,15 +1166,15 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Threading.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Theme.h"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Theme.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThemeTypes.h"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThemeTypes.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Threading.h"
>
</File>
<File