diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-21 18:21:58 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-21 18:21:58 +0000 |
| commit | f146e310e20b8ba18787fad990d30ccc9f537168 (patch) | |
| tree | 45d2d0b0c78b4b52909ac95d3272f639df88a297 /webkit/build | |
| parent | 4e8a5ad81d4ab7b6db935367fbefaef7817959e7 (diff) | |
| download | chromium_src-f146e310e20b8ba18787fad990d30ccc9f537168.zip chromium_src-f146e310e20b8ba18787fad990d30ccc9f537168.tar.gz chromium_src-f146e310e20b8ba18787fad990d30ccc9f537168.tar.bz2 | |
WebKit Merge 39972:40057, Chromium side.
R=jeremy
Review URL: http://codereview.chromium.org/18608
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8370 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 2 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/WTF.vcproj | 4 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/v8bindings.vsprops | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 8 |
5 files changed, 13 insertions, 4 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index e691d31..16b228d 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -146,7 +146,7 @@ if env.Bit('windows'): ) wtf_inputs = [ - '$JAVASCRIPTCORE_DIR/runtime/ByteArray.cpp', + '$WTF_DIR/ByteArray.cpp', '$WTF_DIR/Assertions.cpp', '$WTF_DIR/CurrentTime.cpp', '$WTF_DIR/dtoa.cpp', diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index baf5d8c..7515ad7 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -138,11 +138,11 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ByteArray.cpp" + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ByteArray.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ByteArray.h" + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ByteArray.h" > </File> <File diff --git a/webkit/build/V8Bindings/v8bindings.vsprops b/webkit/build/V8Bindings/v8bindings.vsprops index 702f21b..8943495 100644 --- a/webkit/build/V8Bindings/v8bindings.vsprops +++ b/webkit/build/V8Bindings/v8bindings.vsprops @@ -7,7 +7,7 @@ > <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="NOGDI;WIN32_LEAN_AND_MEAN" + PreprocessorDefinitions="WIN32_LEAN_AND_MEAN" DisableSpecificWarnings="4291,4099,4996,4521,4244" /> </VisualStudioPropertySheet> diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index a9d1b96..6b04f6a 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -62,6 +62,7 @@ input_files = [ '$WEBCORE_DIR/css/CSSParserValues.cpp', '$WEBCORE_DIR/css/CSSPrimitiveValue.cpp', '$WEBCORE_DIR/css/CSSProperty.cpp', + '$WEBCORE_DIR/css/CSSPropertyLonghand.cpp', '$WEBCORE_DIR/css/CSSReflectValue.cpp', '$WEBCORE_DIR/css/CSSRule.cpp', '$WEBCORE_DIR/css/CSSRuleList.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 5f8c1a5..39f11fd 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -2655,6 +2655,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\css\CSSPropertyLonghand.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\css\CSSPropertyLonghand.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\css\CSSPropertyNames.in" > </File> |