summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-09 19:37:48 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-09 19:37:48 +0000
commit851da074d1c73438f30f4671ac45d25ee589573d (patch)
treebca04c06d03a9764163fad49c15d4b034fd96b72 /webkit
parent44cfe4bcc54ca525d9a71b83d2effb89a7723ca9 (diff)
downloadchromium_src-851da074d1c73438f30f4671ac45d25ee589573d.zip
chromium_src-851da074d1c73438f30f4671ac45d25ee589573d.tar.gz
chromium_src-851da074d1c73438f30f4671ac45d25ee589573d.tar.bz2
Roll WebKit DEPS
TBR=michaeln Review URL: http://codereview.chromium.org/149401 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20300 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
-rw-r--r--webkit/webkit.gyp2
2 files changed, 7 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 52e0ded..41491dc 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2814,3 +2814,8 @@ BUG16237 : LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-nul
// WebKit merge 45652:45659
BUG16289 MAC WIN : LayoutTests/fast/forms/slider-mouse-events.html = FAIL
+// WebKit merge 45659:45664
+BUG16355 WIN : LayoutTests/media/audio-delete-while-slider-thumb-clicked.html = TIMEOUT
+BUG16355 WIN : LayoutTests/media/audio-delete-while-step-button-clicked.html = TIMEOUT
+BUG16355 LINUX : LayoutTests/fast/forms/slider-delete-while-dragging-thumb.html = FAIL
+
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 30a39a2..8d012d7 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1122,6 +1122,8 @@
'../third_party/WebKit/WebCore/bindings/v8/V8Collection.h',
'../third_party/WebKit/WebCore/bindings/v8/V8DOMMap.cpp',
'../third_party/WebKit/WebCore/bindings/v8/V8DOMMap.h',
+ '../third_party/WebKit/WebCore/bindings/v8/V8DOMWrapper.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/V8DOMWrapper.h',
'../third_party/WebKit/WebCore/bindings/v8/V8EventListenerList.cpp',
'../third_party/WebKit/WebCore/bindings/v8/V8EventListenerList.h',
'../third_party/WebKit/WebCore/bindings/v8/V8GCController.cpp',