summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.pngbin0 -> 27475 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.txt27
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/compare-content-style-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/compare-content-style-expected.pngbin0 -> 26743 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/compare-content-style-expected.txt48
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt10
7 files changed, 81 insertions, 6 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.checksum
new file mode 100644
index 0000000..b5b65e4
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.checksum
@@ -0,0 +1 @@
+fd0e3911e82fe9e187edacee3a89a419 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.png
new file mode 100644
index 0000000..0559772
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.png
Binary files differ
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
new file mode 100644
index 0000000..b2626de
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/style/apply-through-end-of-document-expected.txt
@@ -0,0 +1,27 @@
+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/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/compare-content-style-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/compare-content-style-expected.checksum
new file mode 100644
index 0000000..f25c5a0
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/compare-content-style-expected.checksum
@@ -0,0 +1 @@
+a58ba660c9387c5cda64af2743018eca \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/compare-content-style-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/compare-content-style-expected.png
new file mode 100644
index 0000000..4adfe10
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/compare-content-style-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/compare-content-style-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/compare-content-style-expected.txt
new file mode 100644
index 0000000..ed22369
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/css/compare-content-style-expected.txt
@@ -0,0 +1,48 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x236
+ RenderBlock {HTML} at (0,0) size 800x236
+ RenderBody {BODY} at (8,8) size 784x212
+ RenderBlock {DIV} at (0,0) size 784x108
+ RenderBlock {DIV} at (0,0) size 784x18
+ RenderInline (generated) at (0,0) size 39x18
+ RenderText at (0,0) size 39x18
+ text run at (0,0) width 39: "PASS"
+ RenderBlock {DIV} at (0,18) size 784x18
+ RenderInline (generated) at (0,0) size 39x18
+ RenderText at (0,0) size 39x18
+ text run at (0,0) width 39: "PASS"
+ RenderBlock {DIV} at (0,36) size 784x18
+ RenderInline (generated) at (0,0) size 39x18
+ RenderText at (0,0) size 39x18
+ text run at (0,0) width 39: "PASS"
+ RenderBlock {DIV} at (0,54) size 784x18
+ RenderInline (generated) at (0,0) size 39x18
+ RenderText at (0,0) size 39x18
+ text run at (0,0) width 39: "PASS"
+ RenderBlock {DIV} at (0,72) size 784x18
+ RenderInline (generated) at (0,0) size 39x18
+ RenderText at (0,0) size 39x18
+ text run at (0,0) width 39: "PASS"
+ RenderBlock {DIV} at (0,90) size 784x18
+ RenderInline (generated) at (0,0) size 39x18
+ RenderText at (0,0) size 39x18
+ text run at (0,0) width 39: "PASS"
+ RenderBlock {DIV} at (0,124) size 784x88
+ RenderBlock {P} at (0,0) size 784x18
+ RenderInline {A} at (0,0) size 671x18 [color=#0000EE]
+ RenderText {#text} at (0,0) size 671x18
+ text run at (0,0) width 671: "Bug 23741: StyleRareNonInheritedData::operator==() should not compare ContentData objects by pointer"
+ RenderBlock {OL} at (0,34) size 784x54
+ RenderListItem {LI} at (40,0) size 744x18
+ RenderListMarker at (-20,0) size 16x18: "1"
+ RenderText {#text} at (0,0) size 345x18
+ text run at (0,0) width 345: "All lines above should be \"PASS\" on initial page load."
+ RenderListItem {LI} at (40,18) size 744x18
+ RenderListMarker at (-20,0) size 16x18: "2"
+ RenderText {#text} at (0,0) size 140x18
+ text run at (0,0) width 140: "Reload the page once."
+ RenderListItem {LI} at (40,36) size 744x18
+ RenderListMarker at (-20,0) size 16x18: "3"
+ RenderText {#text} at (0,0) size 247x18
+ text run at (0,0) width 247: "All lines above should still be \"PASS\"."
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index fd12f65..a44edcb 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2677,12 +2677,10 @@ BUG11669 LINUX : LayoutTests/fast/layers/remove-only-this-layer-update.html = FA
// May need rebaselining for mac/linux, or may need nothing at all. Triage after has run
// on mac/linux buildbot. See http://crbug.com/11763.
-BUG11763 MAC : LayoutTests/fast/overflow/overflow-focus-ring.html = FAIL PASS
-BUG11763 MAC LINUX : LayoutTests/fast/js/postfix-syntax.html = FAIL PASS
-BUG11763 MAC LINUX : LayoutTests/fast/layers/self-painting-outline.html = FAIL PASS
-BUG11763 MAC LINUX : LayoutTests/fast/css/compare-content-style.html = FAIL PASS
-BUG11763 MAC LINUX : LayoutTests/editing/style/apply-through-end-of-document.html = FAIL PASS
-BUG11763 MAC LINUX : LayoutTests/webarchive/test-link-rel-icon.html = FAIL PASS
+BUG11763 LINUX : LayoutTests/fast/js/postfix-syntax.html = FAIL PASS
+BUG11763 LINUX : LayoutTests/fast/layers/self-painting-outline.html = FAIL PASS
+BUG11763 LINUX : LayoutTests/fast/css/compare-content-style.html = FAIL PASS
+BUG11763 LINUX : LayoutTests/editing/style/apply-through-end-of-document.html = FAIL PASS
// This test got moved (and the baselines have been moved accordingly), but now as a result
// it seems to be failing?!