summaryrefslogtreecommitdiffstats
path: root/webkit/build/V8Bindings
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-13 00:58:31 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-13 00:58:31 +0000
commit4b706713acf8483673ca6a2ec543521dd2bd8d16 (patch)
tree798405f55dd119b7500149348b674e254222859f /webkit/build/V8Bindings
parent6b6734719b15274966e0f4aa0c014ee96b2c8466 (diff)
downloadchromium_src-4b706713acf8483673ca6a2ec543521dd2bd8d16.zip
chromium_src-4b706713acf8483673ca6a2ec543521dd2bd8d16.tar.gz
chromium_src-4b706713acf8483673ca6a2ec543521dd2bd8d16.tar.bz2
WebKit merge 41588:41613 (Chromium side).
webkit\port\bindings\v8, webkit\build files These are all adjustments to use the recently upstreamed V8Events files. percent-top-value-with-relative-position-expected This is a new test that has the same result in chromium but uses a slightly different font to display it, so pixels and coordinates were also different. search-field-cancel-expected This is a new test that verifies the visual aspects of the search field. Since chromium doesn't implement this field in a special way, chromium's results are expected to be different. Review URL: http://codereview.chromium.org/42163 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/V8Bindings')
-rw-r--r--webkit/build/V8Bindings/SConscript6
-rw-r--r--webkit/build/V8Bindings/V8Bindings.vcproj44
2 files changed, 41 insertions, 9 deletions
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index 46417a7..c6acdca 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -336,7 +336,6 @@ inputs = [
'$WEBCORE_DIR/bindings/v8/ScriptInstance.cpp',
'$WEBCORE_DIR/bindings/v8/ScriptValue.cpp',
'$PORT_DIR/bindings/v8/v8_custom.cpp',
- '$PORT_DIR/bindings/v8/v8_events.cpp',
'$PORT_DIR/bindings/v8/v8_helpers.cpp',
'$PORT_DIR/bindings/v8/v8_index.cpp',
'$PORT_DIR/bindings/v8/v8_nodefilter.cpp',
@@ -351,9 +350,11 @@ inputs = [
'$PORT_DIR/bindings/v8/WorkerContextExecutionProxy.cpp',
'$PORT_DIR/bindings/v8/WorkerScriptController.cpp',
+ '$WEBCORE_DIR/bindings/v8/custom/V8AbstractEventListener.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8ClipboardCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp',
+ '$WEBCORE_DIR/bindings/v8/custom/V8CustomEventListener.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8DocumentCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8DOMParserConstructor.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8DOMStringListCustom.cpp',
@@ -368,6 +369,7 @@ inputs = [
'$WEBCORE_DIR/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8HTMLSelectElementCustom.cpp',
+ '$WEBCORE_DIR/bindings/v8/custom/V8LazyEventListener.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8LocationCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8MessageChannelConstructor.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8NamedNodeMapCustom.cpp',
@@ -377,12 +379,14 @@ inputs = [
'$WEBCORE_DIR/bindings/v8/custom/V8NodeFilterCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8NodeIteratorCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8NodeListCustom.cpp',
+ '$WEBCORE_DIR/bindings/v8/custom/V8ObjectEventListener.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8StyleSheetListCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8SVGElementInstanceCustom.cpp',
'$WEBCORE_DIR/bindings/v8/custom/V8SVGLengthCustom.cpp',
'$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/V8WorkerContextEventListener.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 1958c33..7fdf9b33 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -128,6 +128,14 @@
Name="custom"
>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8AbstractEventListener.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8AbstractEventListener.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8CanvasRenderingContext2DCustom.cpp"
>
</File>
@@ -144,6 +152,10 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8CustomEventListener.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8CustomEventListener.h"
>
</File>
@@ -208,6 +220,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8LazyEventListener.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8LazyEventListener.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8LocationCustom.cpp"
>
</File>
@@ -248,6 +268,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8ObjectEventListener.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8ObjectEventListener.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8StyleSheetListCustom.cpp"
>
</File>
@@ -272,6 +300,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8WorkerContextEventListener.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8WorkerContextEventListener.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8XMLSerializerConstructor.cpp"
>
</File>
@@ -2837,14 +2873,6 @@
>
</File>
<File
- RelativePath="..\..\port\bindings\v8\v8_events.cpp"
- >
- </File>
- <File
- RelativePath="..\..\port\bindings\v8\v8_events.h"
- >
- </File>
- <File
RelativePath="..\..\port\bindings\v8\v8_index.cpp"
>
</File>