diff options
| author | vitalyr@chromium.org <vitalyr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 21:45:49 +0000 |
|---|---|---|
| committer | vitalyr@chromium.org <vitalyr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 21:45:49 +0000 |
| commit | ff7fd2275987f0fb9bb683f77bebb8d90969126a (patch) | |
| tree | 5a4b0225b453096bb99862f203ddb692afa293ea | |
| parent | 54a1e109b51a201f90dc301c848dfc2b4e822959 (diff) | |
| download | chromium_src-ff7fd2275987f0fb9bb683f77bebb8d90969126a.zip chromium_src-ff7fd2275987f0fb9bb683f77bebb8d90969126a.tar.gz chromium_src-ff7fd2275987f0fb9bb683f77bebb8d90969126a.tar.bz2 | |
WebKit roll 55161 to 55193.
BUG=none
TEST=none
R=dglazkov@chromium.org
Review URL: http://codereview.chromium.org/658008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39928 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-xml-expected.txt | 3 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 4 |
3 files changed, 8 insertions, 1 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "55161", + "webkit_revision": "55193", "ffmpeg_revision": "39607", "skia_revision": "504", "chromium_git": "http://src.chromium.org/git", diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-xml-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-xml-expected.txt new file mode 100644 index 0000000..3516e9b --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/insert-list-xml-expected.txt @@ -0,0 +1,3 @@ +. +<div xmlns="http://www.w3.org/1999/xhtml" contenteditable="true" id="insertlisthere"><ol><li><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: 'times new roman'; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; font-size: medium; ">.</span><br /></li></ol></div> +PASS diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 8b804d9..eda13c8 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2952,3 +2952,7 @@ BUG36019 : fast/images/svg-as-tiled-background.html = IMAGE // Flaky tests BUG36603 WIN RELEASE : svg/text/text-text-05-t.svg = CRASH PASS BUG36603 WIN RELEASE : svg/text/text-text-06-t.svg = CRASH PASS + +// WebKit roll 55161 to 55193 +BUG36681 : java/argument-to-object-type.html = TEXT +BUG36681 : java/array-return.html = TEXT |