diff options
| author | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 02:46:19 +0000 |
|---|---|---|
| committer | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 02:46:19 +0000 |
| commit | dea25ab41a0ff9c875f64e8d44a2279b304837b8 (patch) | |
| tree | 9028d364c69ef672af1f303a77ef53365a68cb14 /webkit | |
| parent | 193d7788338da20eb546a61a58c96531cc8408c5 (diff) | |
| download | chromium_src-dea25ab41a0ff9c875f64e8d44a2279b304837b8.zip chromium_src-dea25ab41a0ff9c875f64e8d44a2279b304837b8.tar.gz chromium_src-dea25ab41a0ff9c875f64e8d44a2279b304837b8.tar.bz2 | |
Roll WebKit up to 49830 and fix a build error caused by that revision.
TBR=yutak
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/294017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/api/src/StorageEventDispatcherImpl.cpp | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/webkit/api/src/StorageEventDispatcherImpl.cpp b/webkit/api/src/StorageEventDispatcherImpl.cpp index 6916e0b..6dc6357 100644 --- a/webkit/api/src/StorageEventDispatcherImpl.cpp +++ b/webkit/api/src/StorageEventDispatcherImpl.cpp @@ -73,7 +73,7 @@ void StorageEventDispatcherImpl::dispatchStorageEvent(const String& key, const S // FIXME: Figure out how to pass in the document URI. for (unsigned i = 0; i < frames.size(); ++i) { frames[i]->document()->dispatchWindowEvent(StorageEvent::create(eventNames().storageEvent, key,oldValue, newValue, - String(), 0, frames[i]->domWindow()->localStorage())); + String(), frames[i]->domWindow()->localStorage())); } } diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 955ad4e..0c1d0ab 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -707,7 +707,7 @@ BUG21118 WIN LINUX : LayoutTests/fast/forms/box-shadow-override.html = FAIL BUG24192 SKIP : chrome/http/mime = PASS // These tests all depend on DOM Storage events which are not yet supported. -BUG4360 : LayoutTests/storage/domstorage/localstorage/iframe-events.html = TIMEOUT +BUG4360 : LayoutTests/storage/domstorage/localstorage/iframe-events.html = TIMEOUT FAIL BUG4360 : LayoutTests/storage/domstorage/sessionstorage/iframe-events.html = TIMEOUT BUG4360 : LayoutTests/storage/domstorage/localstorage/simple-events.html = FAIL BUG4360 : LayoutTests/storage/domstorage/sessionstorage/simple-events.html = FAIL @@ -3171,3 +3171,7 @@ BUG_JAPHET LINUX WIN : LayoutTests/fast/canvas/arc360.html = FAIL BUG_JAPHET LINUX : LayoutTests/fast/css/transition-color-unspecified.html = FAIL BUG_JAPHET : LayoutTests/media/media-load-event.html = FAIL BUG_JAPHET : LayoutTests/media/progress-event-at-least-one.html = FAIL + +// WebKit Roll 49809:49830 +BUG_YUTAK LINUX : LayoutTests/svg/custom/marker-default-width-height.svg = FAIL +BUG_YUTAK MAC : LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f.svg = FAIL |