summaryrefslogtreecommitdiffstats
path: root/webkit/SConscript
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/SConscript
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/SConscript')
-rw-r--r--webkit/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/webkit/SConscript b/webkit/SConscript
index 1100f41..c59c49d 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -123,6 +123,7 @@ env.Prepend(
'$WEBKIT_DIR/pending',
'$WEBKIT_DIR_PORT_INC/bindings/v8',
+ '$WEBKIT_DIR_PORT_INC/bindings/v8/custom',
'$WEBKIT_DIR_PORT_INC/platform',
'$WEBKIT_DIR_PORT_INC/platform/$WEBKIT_PLATFORM_SUBDIR',