diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 22:29:46 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 22:29:46 +0000 |
| commit | d211bb91ddb9f4bfef451fabcc6f2f7438009b5a (patch) | |
| tree | 31824344590179d08f19911fd6c03606a91d672c /webkit/build | |
| parent | fdec9369f6856002db6bccdf1ebcebf7adbb89af (diff) | |
| download | chromium_src-d211bb91ddb9f4bfef451fabcc6f2f7438009b5a.zip chromium_src-d211bb91ddb9f4bfef451fabcc6f2f7438009b5a.tar.gz chromium_src-d211bb91ddb9f4bfef451fabcc6f2f7438009b5a.tar.bz2 | |
WebKit merge 39660:39711, part 2. Covers webkit/ changes.
R=ojan
Review URL: http://codereview.chromium.org/17284
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/JavaScriptCore/WTF.vcproj | 4 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/V8Bindings.vcproj | 8 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 |
4 files changed, 14 insertions, 0 deletions
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index 4304610..fcdb697 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -334,6 +334,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ThreadSpecificWin.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\Unicode.h" > </File> diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index e41ed63..c5b329d 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -82,6 +82,7 @@ inputs = [ '$DERIVED_DIR/V8DOMImplementation.cpp', '$DERIVED_DIR/V8DOMParser.cpp', '$DERIVED_DIR/V8DOMSelection.cpp', + '$DERIVED_DIR/V8DOMStringList.cpp', '$DERIVED_DIR/V8DOMWindow.cpp', '$DERIVED_DIR/V8Element.cpp', '$DERIVED_DIR/V8Entity.cpp', diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj index 496f3dd..09c414a 100644 --- a/webkit/build/V8Bindings/V8Bindings.vcproj +++ b/webkit/build/V8Bindings/V8Bindings.vcproj @@ -432,6 +432,14 @@ > </File> <File + RelativePath="$(IntDir)\DerivedSources\V8DOMStringList.cpp" + > + </File> + <File + RelativePath="$(IntDir)\DerivedSources\V8DOMStringList.h" + > + </File> + <File RelativePath="$(IntDir)\DerivedSources\V8DOMWindow.cpp" > </File> diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index e75f645..6dd25dd 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -372,6 +372,7 @@ input_files = [ '$WEBCORE_DIR/page/Console.cpp', '$WEBCORE_DIR/page/ContextMenuController.cpp', '$WEBCORE_DIR/page/DOMSelection.cpp', + '$WEBCORE_DIR/page/DOMStringList.cpp', '$WEBCORE_DIR/page/DOMWindow.cpp', '$WEBCORE_DIR/page/DragController.cpp', '$WEBCORE_DIR/page/EventHandler.cpp', |