summaryrefslogtreecommitdiffstats
path: root/webkit/build
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-27 00:17:43 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-27 00:17:43 +0000
commitec1daeedef2231437f6a6c8dac7cfd474603e417 (patch)
tree17788ff10dec7f211b017a72a0f68e375e56126f /webkit/build
parent488bf5acd6459d69fcaead5769125e3c371098f8 (diff)
downloadchromium_src-ec1daeedef2231437f6a6c8dac7cfd474603e417.zip
chromium_src-ec1daeedef2231437f6a6c8dac7cfd474603e417.tar.gz
chromium_src-ec1daeedef2231437f6a6c8dac7cfd474603e417.tar.bz2
Start using the upstream versions of V8NodeFilter and V8XML*.
Review URL: http://codereview.chromium.org/42673 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
-rw-r--r--webkit/build/V8Bindings/SConscript14
-rw-r--r--webkit/build/V8Bindings/V8Bindings.vcproj44
2 files changed, 29 insertions, 29 deletions
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index dd6a25a..247e40c 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -342,13 +342,16 @@ inputs = [
'$WEBCORE_DIR/bindings/v8/ScriptValue.cpp',
'$WEBCORE_DIR/bindings/v8/V8AbstractEventListener.cpp',
'$WEBCORE_DIR/bindings/v8/V8LazyEventListener.cpp',
+ '$WEBCORE_DIR/bindings/v8/V8NodeFilterCondition.cpp',
'$WEBCORE_DIR/bindings/v8/V8ObjectEventListener.cpp',
'$WEBCORE_DIR/bindings/v8/V8WorkerContextEventListener.cpp',
+ '$WEBCORE_DIR/bindings/v8/V8XMLHttpRequestUtilities.cpp',
+ '$WEBCORE_DIR/bindings/v8/WorkerContextExecutionProxy.cpp',
+ '$WEBCORE_DIR/bindings/v8/WorkerScriptController.cpp',
'$PORT_DIR/bindings/v8/v8_binding.cpp',
'$PORT_DIR/bindings/v8/v8_custom.cpp',
'$PORT_DIR/bindings/v8/v8_helpers.cpp',
'$PORT_DIR/bindings/v8/v8_index.cpp',
- '$PORT_DIR/bindings/v8/v8_nodefilter.cpp',
'$PORT_DIR/bindings/v8/V8NPUtils.cpp',
'$PORT_DIR/bindings/v8/V8NPObject.cpp',
'$PORT_DIR/bindings/v8/v8_proxy.cpp',
@@ -356,12 +359,6 @@ inputs = [
'$PORT_DIR/bindings/v8/V8MessagePortCustom.cpp',
'$PORT_DIR/bindings/v8/V8WorkerContextCustom.cpp',
'$PORT_DIR/bindings/v8/V8WorkerCustom.cpp',
- '$PORT_DIR/bindings/v8/V8XMLHttpRequestConstructor.cpp',
- '$PORT_DIR/bindings/v8/V8XMLHttpRequestCustom.cpp',
- '$PORT_DIR/bindings/v8/V8XMLHttpRequestUploadCustom.cpp',
- '$PORT_DIR/bindings/v8/V8XMLHttpRequestUtilities.cpp',
- '$WEBCORE_DIR/bindings/v8/WorkerContextExecutionProxy.cpp',
- '$WEBCORE_DIR/bindings/v8/WorkerScriptController.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8ClipboardCustom.cpp',
@@ -405,6 +402,9 @@ inputs = [
'$WEBCORE_DIR/bindings/v8/custom/V8SVGMatrixCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8TreeWalkerCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp',
+ '$WEBCORE_DIR/bindings/v8/custom/V8XMLHttpRequestConstructor.cpp',
+ '$WEBCORE_DIR/bindings/v8/custom/V8XMLHttpRequestCustom.cpp',
+ '$WEBCORE_DIR/bindings/v8/custom/V8XMLHttpRequestUploadCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8XMLSerializerConstructor.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8XPathEvaluatorConstructor.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8XSLTProcessorCustom.cpp',
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index c5d1326..0379807 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -332,6 +332,18 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8XMLHttpRequestConstructor.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8XMLHttpRequestCustom.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8XMLHttpRequestUploadCustom.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8XMLSerializerConstructor.cpp"
>
</File>
@@ -2949,14 +2961,6 @@
>
</File>
<File
- RelativePath="..\..\port\bindings\v8\v8_nodefilter.cpp"
- >
- </File>
- <File
- RelativePath="..\..\port\bindings\v8\v8_nodefilter.h"
- >
- </File>
- <File
RelativePath="..\..\port\bindings\v8\v8_proxy.cpp"
>
</File>
@@ -3001,6 +3005,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8NodeFilterCondition.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8NodeFilterCondition.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8ObjectEventListener.cpp"
>
</File>
@@ -3029,23 +3041,11 @@
>
</File>
<File
- RelativePath="..\..\port\bindings\v8\V8XMLHttpRequestConstructor.cpp"
- >
- </File>
- <File
- RelativePath="..\..\port\bindings\v8\V8XMLHttpRequestCustom.cpp"
- >
- </File>
- <File
- RelativePath="..\..\port\bindings\v8\V8XMLHttpRequestUploadCustom.cpp"
- >
- </File>
- <File
- RelativePath="..\..\port\bindings\v8\V8XMLHttpRequestUtilities.cpp"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8XMLHttpRequestUtilities.cpp"
>
</File>
<File
- RelativePath="..\..\port\bindings\v8\V8XMLHttpRequestUtilities.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\V8XMLHttpRequestUtilities.h"
>
</File>
<File