diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-13 00:58:31 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-13 00:58:31 +0000 |
| commit | 4b706713acf8483673ca6a2ec543521dd2bd8d16 (patch) | |
| tree | 798405f55dd119b7500149348b674e254222859f /webkit/build | |
| parent | 6b6734719b15274966e0f4aa0c014ee96b2c8466 (diff) | |
| download | chromium_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')
| -rw-r--r-- | webkit/build/V8Bindings/SConscript | 6 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/V8Bindings.vcproj | 44 | ||||
| -rw-r--r-- | webkit/build/webkit_common_includes.vsprops | 2 |
3 files changed, 42 insertions, 10 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> diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops index 446060f..bdbcb37 100644 --- a/webkit/build/webkit_common_includes.vsprops +++ b/webkit/build/webkit_common_includes.vsprops @@ -6,6 +6,6 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(OutDir)\obj\WebCore";"$(OutDir)\obj\WebCore\JavaScriptHeaders";"$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore";$(SolutionDir)..\webkit\pending;$(SolutionDir)..\webkit\port\bridge;"$(ProjectDir)";$(SolutionDir)..\third_party\WebKit\WebCore;$(SolutionDir)..\third_party\WebKit\WebCore\bindings\v8;$(SolutionDir)..\third_party\WebKit\WebCore\bridge;$(SolutionDir)..\third_party\WebKit\WebCore\bridge\c;$(SolutionDir)..\third_party\WebKit\WebCore\css;$(SolutionDir)..\third_party\WebKit\WebCore\dom;$(SolutionDir)..\third_party\WebKit\WebCore\editing;$(SolutionDir)..\third_party\WebKit\WebCore\history;$(SolutionDir)..\third_party\WebKit\WebCore\html;$(SolutionDir)..\third_party\WebKit\WebCore\loader;$(SolutionDir)..\third_party\WebKit\WebCore\loader\appcache;$(SolutionDir)..\third_party\WebKit\WebCore\loader\archive;$(SolutionDir)..\third_party\WebKit\WebCore\loader\icon;$(SolutionDir)..\third_party\WebKit\WebCore\page;$(SolutionDir)..\third_party\WebKit\WebCore\page\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform;$(SolutionDir)..\third_party\WebKit\WebCore\platform\animation;$(SolutionDir)..\third_party\WebKit\WebCore\platform\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform\image-decoders\skia;$(SolutionDir)..\third_party\WebKit\WebCore\platform\image-encoders\skia;$(SolutionDir)..\third_party\WebKit\WebCore\page\animation;$(SolutionDir)..\third_party\WebKit\WebCore\platform\text;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\opentype;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\transforms;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\skia;$(SolutionDir)..\third_party\WebKit\WebCore\svg\graphics;$(SolutionDir)..\third_party\WebKit\WebCore\platform\network;$(SolutionDir)..\third_party\WebKit\WebCore\platform\network\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform\sql;$(SolutionDir)..\third_party\WebKit\WebCore\rendering;$(SolutionDir)..\third_party\WebKit\WebCore\rendering\style;$(SolutionDir)..\third_party\WebKit\WebCore\storage;$(SolutionDir)..\third_party\WebKit\WebCore\xml;"$(SolutionDir)..\third_party\WebKit\WebCore\os-win32";$(SolutionDir)..\third_party\WebKit\WebCore\wtf;$(SolutionDir)..\third_party\WebKit\JavaScriptCore;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\wtf;"$(SolutionDir)..\third_party\WebKit\JavaScriptCore\os-win32";..\..\build;"$(SDKIncludes)";"$(IntDir)\..\WebCore\DerivedSources";$(SolutionDir)..\third_party\WebKit\WebCore\svg;$(SolutionDir)..\third_party\WebKit\WebCore\svg\animation;$(SolutionDir)..\third_party\WebKit\WebCore\svg\graphics\filters;$(SolutionDir)..\third_party\WebKit\WebCore\plugins;$(SolutionDir)..\third_party\WebKit\WebCore\inspector;$(SolutionDir)..\third_party\WebKit\WebCore\workers;$(SolutionDir)..\third_party\WebKit\WebKit\chromium\public;$(SolutionDir)..\third_party\WebKit\WebKit\chromium\public\win;$(SolutionDir)..\third_party\sqlite\preprocessed" + AdditionalIncludeDirectories=""$(OutDir)\obj\WebCore";"$(OutDir)\obj\WebCore\JavaScriptHeaders";"$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore";$(SolutionDir)..\webkit\pending;$(SolutionDir)..\webkit\port\bridge;"$(ProjectDir)";$(SolutionDir)..\third_party\WebKit\WebCore;$(SolutionDir)..\third_party\WebKit\WebCore\bindings\v8;$(SolutionDir)..\third_party\WebKit\WebCore\bindings\v8\custom;$(SolutionDir)..\third_party\WebKit\WebCore\bridge;$(SolutionDir)..\third_party\WebKit\WebCore\bridge\c;$(SolutionDir)..\third_party\WebKit\WebCore\css;$(SolutionDir)..\third_party\WebKit\WebCore\dom;$(SolutionDir)..\third_party\WebKit\WebCore\editing;$(SolutionDir)..\third_party\WebKit\WebCore\history;$(SolutionDir)..\third_party\WebKit\WebCore\html;$(SolutionDir)..\third_party\WebKit\WebCore\loader;$(SolutionDir)..\third_party\WebKit\WebCore\loader\appcache;$(SolutionDir)..\third_party\WebKit\WebCore\loader\archive;$(SolutionDir)..\third_party\WebKit\WebCore\loader\icon;$(SolutionDir)..\third_party\WebKit\WebCore\page;$(SolutionDir)..\third_party\WebKit\WebCore\page\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform;$(SolutionDir)..\third_party\WebKit\WebCore\platform\animation;$(SolutionDir)..\third_party\WebKit\WebCore\platform\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform\image-decoders\skia;$(SolutionDir)..\third_party\WebKit\WebCore\platform\image-encoders\skia;$(SolutionDir)..\third_party\WebKit\WebCore\page\animation;$(SolutionDir)..\third_party\WebKit\WebCore\platform\text;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\opentype;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\transforms;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\skia;$(SolutionDir)..\third_party\WebKit\WebCore\svg\graphics;$(SolutionDir)..\third_party\WebKit\WebCore\platform\network;$(SolutionDir)..\third_party\WebKit\WebCore\platform\network\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform\sql;$(SolutionDir)..\third_party\WebKit\WebCore\rendering;$(SolutionDir)..\third_party\WebKit\WebCore\rendering\style;$(SolutionDir)..\third_party\WebKit\WebCore\storage;$(SolutionDir)..\third_party\WebKit\WebCore\xml;"$(SolutionDir)..\third_party\WebKit\WebCore\os-win32";$(SolutionDir)..\third_party\WebKit\WebCore\wtf;$(SolutionDir)..\third_party\WebKit\JavaScriptCore;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\wtf;"$(SolutionDir)..\third_party\WebKit\JavaScriptCore\os-win32";..\..\build;"$(SDKIncludes)";"$(IntDir)\..\WebCore\DerivedSources";$(SolutionDir)..\third_party\WebKit\WebCore\svg;$(SolutionDir)..\third_party\WebKit\WebCore\svg\animation;$(SolutionDir)..\third_party\WebKit\WebCore\svg\graphics\filters;$(SolutionDir)..\third_party\WebKit\WebCore\plugins;$(SolutionDir)..\third_party\WebKit\WebCore\inspector;$(SolutionDir)..\third_party\WebKit\WebCore\workers;$(SolutionDir)..\third_party\WebKit\WebKit\chromium\public;$(SolutionDir)..\third_party\WebKit\WebKit\chromium\public\win;$(SolutionDir)..\third_party\sqlite\preprocessed" /> </VisualStudioPropertySheet> |