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/webkit.gyp | |
| 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/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 8fa13d1..6f34053 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -28,6 +28,7 @@ 'webcore_include_dirs': [ 'pending', '../third_party/WebKit/WebCore/bindings/v8', + '../third_party/WebKit/WebCore/bindings/v8/custom', '../third_party/WebKit/WebCore/css', '../third_party/WebKit/WebCore/dom', '../third_party/WebKit/WebCore/editing', @@ -77,6 +78,8 @@ }], ['OS=="mac"', { 'non_feature_defines': [ + # Ensure that only Leopard features are used when doing the Mac build. + 'BUILDING_ON_LEOPARD', # Match Safari and Mozilla on Mac x86. 'WEBCORE_NAVIGATOR_PLATFORM="MacIntel"', ], @@ -959,10 +962,13 @@ 'port/bindings/v8/UndetectableHTMLCollection.idl', # V8 bindings not generated from .idl source. + '../third_party/WebKit/WebCore/bindings/v8/custom/V8AbstractEventListener.cpp', + '../third_party/WebKit/WebCore/bindings/v8/custom/V8AbstractEventListener.h', '../third_party/WebKit/WebCore/bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8ClipboardCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomBinding.h', + '../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomEventListener.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomEventListener.h', '../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.h', @@ -990,6 +996,8 @@ '../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.h', + '../third_party/WebKit/WebCore/bindings/v8/custom/V8LazyEventListener.cpp', + '../third_party/WebKit/WebCore/bindings/v8/custom/V8LazyEventListener.h', '../third_party/WebKit/WebCore/bindings/v8/custom/V8LocationCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8MessageChannelConstructor.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8NamedNodeMapCustom.cpp', @@ -1000,6 +1008,8 @@ '../third_party/WebKit/WebCore/bindings/v8/custom/V8NodeFilterCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8NodeIteratorCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8NodeListCustom.cpp', + '../third_party/WebKit/WebCore/bindings/v8/custom/V8ObjectEventListener.cpp', + '../third_party/WebKit/WebCore/bindings/v8/custom/V8ObjectEventListener.h', '../third_party/WebKit/WebCore/bindings/v8/custom/V8SQLResultSetRowListCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8SVGElementInstanceCustom.cpp', @@ -1008,6 +1018,8 @@ '../third_party/WebKit/WebCore/bindings/v8/custom/V8StyleSheetListCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8TreeWalkerCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp', + '../third_party/WebKit/WebCore/bindings/v8/custom/V8WorkerContextEventListener.cpp', + '../third_party/WebKit/WebCore/bindings/v8/custom/V8WorkerContextEventListener.h', '../third_party/WebKit/WebCore/bindings/v8/custom/V8XMLSerializerConstructor.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8XPathEvaluatorConstructor.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8XSLTProcessorCustom.cpp', @@ -1066,8 +1078,6 @@ 'port/bindings/v8/v8_collection.h', 'port/bindings/v8/v8_custom.cpp', 'port/bindings/v8/v8_custom.h', - 'port/bindings/v8/v8_events.cpp', - 'port/bindings/v8/v8_events.h', 'port/bindings/v8/v8_helpers.cpp', 'port/bindings/v8/v8_helpers.h', 'port/bindings/v8/v8_index.cpp', |