diff options
| author | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 21:02:01 +0000 |
|---|---|---|
| committer | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 21:02:01 +0000 |
| commit | 428c0f261b9fd5aa5435050131a440c6a6ed2fd6 (patch) | |
| tree | 8cdbe664e05d3f024a895f5e9e4ad7b240228ff8 | |
| parent | 49fd9da3932c3c6e94ca1d9f35c9c90106859128 (diff) | |
| download | chromium_src-428c0f261b9fd5aa5435050131a440c6a6ed2fd6.zip chromium_src-428c0f261b9fd5aa5435050131a440c6a6ed2fd6.tar.gz chromium_src-428c0f261b9fd5aa5435050131a440c6a6ed2fd6.tar.bz2 | |
WebKit Roll 56106:56124.
TBR=japhet
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/1016007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41877 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/data/layout_tests/platform/chromium-win/LayoutTests/inspector/timeline-network-resource-expected.txt | 4 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "56106", + "webkit_revision": "56124", "ffmpeg_revision": "40718", "skia_revision": "504", "chromium_git": "http://src.chromium.org/git", diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/inspector/timeline-network-resource-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/inspector/timeline-network-resource-expected.txt index 462a737..306e38c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/inspector/timeline-network-resource-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/inspector/timeline-network-resource-expected.txt @@ -18,10 +18,12 @@ ResourceReceiveResponse Properties: + data : { +- identifier : * DEFINED * +- statusCode : 0 -+- mimeType : application/x-javascript ++- mimeType : * DEFINED * +- expectedContentLength : 210 +- url : * DEFINED * + } ++ children : * DEFINED * ++ endTime : * DEFINED * + type : 13 ResourceFinish Properties: diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 8318907..a3d8bb4 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -820,6 +820,8 @@ BUG16779 WONTFIX SKIP : media/audio-mpeg-supported.html = FAIL TIMEOUT BUG16779 WONTFIX SKIP : media/audio-data-url.html = FAIL TIMEOUT BUG16779 WONTFIX SKIP : media/video-size-intrinsic-scale.html = FAIL TIMEOUT +// Skipped to reduce crashiness during a test run. +BUG38444 SKIP : media/video-append-source.html = CRASH PASS TIMEOUT // Function arguments object is copied for each access. BUG24194 : fast/js/kde/function_arguments.html = FAIL |