diff options
3 files changed, 6 insertions, 34 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "56197", + "webkit_revision": "56239", "ffmpeg_revision": "42082", "skia_revision": "504", "chromium_git": "http://src.chromium.org/git", diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.txt deleted file mode 100644 index b2626de..0000000 --- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.txt +++ /dev/null @@ -1,27 +0,0 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x600 - RenderBlock {HTML} at (0,0) size 800x600 - RenderBody {BODY} at (8,8) size 784x579 - RenderBlock {P} at (0,0) size 784x36 - RenderText {#text} at (0,0) size 53x18 - text run at (0,0) width 53: "Test for " - RenderInline {I} at (0,0) size 747x36 - RenderInline {A} at (0,0) size 154x18 [color=#0000EE] - RenderText {#text} at (53,0) size 154x18 - text run at (53,0) width 154: "rdar://problem/6864786" - RenderText {#text} at (207,0) size 747x36 - text run at (207,0) width 540: ": REGRESSION: Crash below ApplyStyleCommand::applyInlineStyleToRange when" - text run at (0,18) width 185: "reviewing a patch in Bugzilla" - RenderText {#text} at (185,18) size 4x18 - text run at (185,18) width 4: "." - RenderBlock {P} at (0,52) size 784x18 - RenderText {#text} at (0,0) size 217x18 - text run at (0,0) width 217: "The test passes if it does not crash." - RenderBlock {DIV} at (0,86) size 784x41 - RenderText {#text} at (0,0) size 563x41 - text run at (0,0) width 563: "Copy the second word in this sentence." - RenderBlock {PRE} at (0,140) size 784x15 - RenderText {#text} at (0,0) size 24x15 - text run at (0,0) width 24: "the" -caret: position 3 of child 0 {#text} of child 7 {PRE} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 4699ad1..c0ede81 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2834,11 +2834,10 @@ BUG38534 LINUX : tables/mozilla/bugs/bug20804.html = IMAGE PASS BUG_AGL LINUX : platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle.html = IMAGE // WebKit roll 56165:56197. -// Baseline wasn't checked with the test. Will clear up on next roll. -BUG_DGLAZKOV WIN LINUX MAC : fast/dynamic/float-remove-above-line-2.html = MISSING -// New test (http://trac.webkit.org/changeset/56191), failing upstream as well -// will try to help fix on next roll. -BUG_DGLAZKOV SKIP : fast/css/nth-child-odd-case-insensitive.html = CRASH TEXT PASS // New test (http://trac.webkit.org/changeset/56198), requires changes to PluginObject BUG38578 : plugins/override-node-method.html = TEXT -BUG_DGLAZKOV MAC : editing/style/apply-through-end-of-document.html = TEXT + +// WebKit roll 56197:56239. +// Needs layoutTestController.setMediaType() (implemented on Qt only) +BUG38653 : editing/selection/find-yensign-and-backslash.html = TEXT +BUG38656 MAC : fast/media/print-restores-previous-mediatype.html = TEXT |