diff options
6 files changed, 35 insertions, 3 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "42523", + "webkit_revision": "42547", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@13787", + "/trunk/deps/third_party/WebKit@13799", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13472", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 6ae8021..83afda9 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@42523
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@42547
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/generated-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/generated-expected.checksum new file mode 100755 index 0000000..934f406 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/generated-expected.checksum @@ -0,0 +1 @@ +26ff9627c0ec832f7b1c1c5ce5eac22e
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/generated-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/generated-expected.png Binary files differnew file mode 100755 index 0000000..7444b56 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/generated-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/generated-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/generated-expected.txt new file mode 100755 index 0000000..7b6177d --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/generated-expected.txt @@ -0,0 +1,25 @@ +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 784x584
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 51x19
+ text run at (0,0) width 51: "Test for "
+ RenderInline {I} at (0,0) size 504x19
+ RenderInline {A} at (0,0) size 154x19 [color=#0000EE]
+ RenderText {#text} at (51,0) size 154x19
+ text run at (51,0) width 154: "rdar://problem/6777374"
+ RenderText {#text} at (205,0) size 350x19
+ text run at (205,0) width 4: " "
+ text run at (209,0) width 346: "Generated content with display: run-in causes a crash"
+ RenderText {#text} at (555,0) size 4x19
+ text run at (555,0) width 4: "."
+ RenderBlock {DIV} at (0,36) size 784x20
+ RenderBlock (anonymous) at (0,0) size 784x20
+ RenderInline (generated) at (0,0) size 38x19
+ RenderText at (0,0) size 38x19
+ text run at (0,0) width 38: "PASS"
+ RenderText {#text} at (38,0) size 158x19
+ text run at (38,0) width 4: " "
+ text run at (42,0) width 154: "< this should say \x{201C}PASS\x{201D}"
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index df7af7f..a180e42 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -585,6 +585,9 @@ BUG1124568 DEFER : LayoutTests/fast/dom/Window/window-function-name-getter-prece BUG4363 DEFER SKIP : LayoutTests/media = TIMEOUT BUG4363 DEFER SKIP : LayoutTests/fast/media = PASS FAIL BUG4363 DEFER : LayoutTests/http/tests/media = FAIL +BUG4363 DEFER : LayoutTests/http/tests/security/local-video-poster-from-remote.html = FAIL +BUG4363 DEFER : LayoutTests/http/tests/security/local-video-source-from-remote.html = FAIL +BUG4363 DEFER : LayoutTests/http/tests/security/local-video-src-from-remote.html = FAIL BUG4363 DEFER : LayoutTests/fast/dom/Window/custom-constructors.html = FAIL // Function arguments object is copied for each access. @@ -2465,6 +2468,9 @@ BUG10529 MAC RELEASE : LayoutTests/editing/inserting/6703873.html = FAIL // to include window.showModalDialog, which we give as undefined. BUG10530 : LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.html = FAIL +// New test from merge 42523:42547. Needs rebaseline. +BUG_TONY LINUX MAC : LayoutTests/fast/runin/generated.html = FAIL + // TODO(brettw) Regressions from merge 42244:42287 BUG10571 WIN : LayoutTests/http/tests/navigation/anchor-basic.html = FAIL BUG10571 WIN : LayoutTests/http/tests/navigation/anchor-frames.html = FAIL |
