diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 19:41:20 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 19:41:20 +0000 |
| commit | 3a844ba98584660c3941a95cd649a68edeba90e6 (patch) | |
| tree | ac16884207509b00971d27de71a7baaf5e5c1779 /webkit/build | |
| parent | 4783d98d6dc19b5f3d99b1563a789ee36426c8b0 (diff) | |
| download | chromium_src-3a844ba98584660c3941a95cd649a68edeba90e6.zip chromium_src-3a844ba98584660c3941a95cd649a68edeba90e6.tar.gz chromium_src-3a844ba98584660c3941a95cd649a68edeba90e6.tar.bz2 | |
Webkit merge 39050:39100 (CL 5 of 5).
Review URL: http://codereview.chromium.org/13740
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/KJSBindings/KJSBindings.vcproj | 8 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/SConscript | 2 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/V8Bindings.vcproj | 8 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/copy_files.bat | 2 | ||||
| -rw-r--r-- | webkit/build/port/SConscript | 5 |
5 files changed, 2 insertions, 23 deletions
diff --git a/webkit/build/KJSBindings/KJSBindings.vcproj b/webkit/build/KJSBindings/KJSBindings.vcproj index 15c4936..be8ba3a9 100644 --- a/webkit/build/KJSBindings/KJSBindings.vcproj +++ b/webkit/build/KJSBindings/KJSBindings.vcproj @@ -3286,14 +3286,6 @@ >
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\PausedTimeouts.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\PausedTimeouts.h"
- >
- </File>
- <File
RelativePath="..\precompiled_webkit.cc"
>
<FileConfiguration
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index 45ea1bf..af3b92a 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -37,8 +37,6 @@ else: ) inputs = [ - '$SHARED_DIR/PausedTimeouts.cpp', - '$DERIVED_DIR/CSSGrammar.cpp', '$DERIVED_DIR/HTMLNames.cpp', '$DERIVED_DIR/SVGElementFactory.cpp', diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj index c3231cc..4ef3c7b 100644 --- a/webkit/build/V8Bindings/V8Bindings.vcproj +++ b/webkit/build/V8Bindings/V8Bindings.vcproj @@ -2379,14 +2379,6 @@ <Filter
Name="SharedSources"
>
- <File
- RelativePath="$(IntDir)\SharedSources\PausedTimeouts.cpp"
- >
- </File>
- <File
- RelativePath="$(IntDir)\SharedSources\PausedTimeouts.h"
- >
- </File>
</Filter>
<Filter
Name="c_binding"
diff --git a/webkit/build/V8Bindings/copy_files.bat b/webkit/build/V8Bindings/copy_files.bat index c0e0172..effcfbb 100644 --- a/webkit/build/V8Bindings/copy_files.bat +++ b/webkit/build/V8Bindings/copy_files.bat @@ -11,8 +11,6 @@ set KJS_BINDINGS_DIR="..\..\..\third_party\WebKit\WebCore\bindings\js" setlocal mkdir 2>NUL %DIR% -xcopy /y /d "%KJS_BINDINGS_DIR%\PausedTimeouts.h" %DIR% -xcopy /y /d "%KJS_BINDINGS_DIR%\PausedTimeouts.cpp" %DIR% endlocal diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index ae87fb5..b5a106e 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -479,9 +479,8 @@ for name in idl_files: # copy over some files -i = env.Install('$SHARED_DIR', - ['$PORT_DIR/bindings/js/PausedTimeouts.h', - '$PORT_DIR/bindings/js/PausedTimeouts.cpp']) +# TODO(eroman): can probably get rid of this. +i = env.Install('$SHARED_DIR', []) env.Alias('webkit', i) # HTML tag and attribute names |