diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/browser/in_process_webkit/dom_storage_uitest.cc | 24 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 8 |
3 files changed, 16 insertions, 18 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "49926", + "webkit_revision": "49941", "ffmpeg_revision": "28488", } diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc index 935cf43..1574697 100644 --- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc +++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc @@ -8,13 +8,6 @@ #include "chrome/test/ui/ui_layout_test.h" // TODO(jorlow): Enable all of these tests, eventually... -/* -static const char* kTopLevelFiles[] = { - "window-attributes-exist.html", - NULL -}; -*/ - static const char* kEventsFiles[] = { //"complex-values.html", //"iframe-events.html", @@ -28,24 +21,30 @@ static const char* kEventsFiles[] = { NULL }; -static const char* kNoEventsFiles[] = { +static const char* kTopLevelFiles[] = { "clear.html", + "quota.html", + "remove-item.html", + //"window-attributes-exist.html", + NULL +}; + +static const char* kNoEventsFiles[] = { //"complex-keys.html", "delete-removal.html", "enumerate-storage.html", "enumerate-with-length-and-key.html", - "remove-item.html", "simple-usage.html", NULL }; static const char* kLocalStorageFiles[] = { - "quota.html", + // "quota.html", NULL }; static const char* kSessionStorageFiles[] = { - "no-quota.html", + // "no-quota.html", NULL }; @@ -105,7 +104,8 @@ class DOMStorageTest : public UILayoutTest { TEST_F(DOMStorageTest, DOMStorageLayoutTests) { InitializeForLayoutTest(test_dir_, FilePath(), false); - //RunTests(kTopLevelFiles); + AddResources(); + RunTests(kTopLevelFiles); } // http://code.google.com/p/chromium/issues/detail?id=24145 diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index e7cfa13..550a866 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -92,7 +92,6 @@ BUG24182 SLOW WIN : LayoutTests/fast/backgrounds/svg-as-background-5.html = PASS BUG24182 SLOW WIN : LayoutTests/http/tests/local/file-url-sent-as-referer.html = PASS BUG24182 SLOW WIN : LayoutTests/svg/carto.net/window.svg = PASS BUG24182 SLOW WIN LINUX DEBUG : LayoutTests/tables/mozilla/bugs/bug149275-2.html = PASS -BUG24182 SLOW WIN LINUX DEBUG : LayoutTests/storage/domstorage/localstorage/quota.html = PASS BUG24182 SLOW WIN LINUX DEBUG : LayoutTests/tables/mozilla/bugs/bug1818-4.html = PASS BUG24182 SLOW DEBUG : LayoutTests/fast/xpath/4XPath/Borrowed/cz_20030217.html = PASS BUG24182 SLOW LINUX DEBUG : LayoutTests/svg/custom/viewbox-syntax.svg = PASS @@ -3087,10 +3086,6 @@ BUG24331 LINUX : LayoutTests/svg/text/text-text-07-t.svg = FAIL PASS // Fails since WebKit merge 49321:49372 BUG24331 LINUX : LayoutTests/svg/text/text-tselect-02-f.svg = FAIL PASS -// WebKit update: 49142:49190 -// Changed in http://trac.webkit.org/changeset/49155. -BUG_JORLOW : LayoutTests/storage/domstorage/sessionstorage/complex-values.html = FAIL - // WebKit update: 49190:49206 BUG_JPARENT WIN DEBUG : LayoutTests/fast/frames/calculate-percentage.html = CRASH PASS BUG_JPARENT LINUX DEBUG SLOW : LayoutTests/fast/frames/calculate-fixed.html = PASS @@ -3190,3 +3185,6 @@ BUG25399 LINUX MAC : LayoutTests/fast/xmlhttprequest/null-document-xmlhttpreques // Incorrect baseline removed. BUG25433 WIN LINUX : LayoutTests/css2.1/t040103-ident-03-c.html = IMAGE + +// Webkit roll 49926:49941 +BUG_JORLOW : LayoutTests/storage/domstorage/complex-values.html = FAIL |