summaryrefslogtreecommitdiffstats
path: root/webkit/data
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-26 22:39:30 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-26 22:39:30 +0000
commitcfd9fa44f742a6beabe130177b0b35b112ff339c (patch)
treea3235bccfa873737f98193127ea5072dfcc490ff /webkit/data
parent6f39aee96cc206bc2f2cd90de3ebf5fc11fae17b (diff)
downloadchromium_src-cfd9fa44f742a6beabe130177b0b35b112ff339c.zip
chromium_src-cfd9fa44f742a6beabe130177b0b35b112ff339c.tar.gz
chromium_src-cfd9fa44f742a6beabe130177b0b35b112ff339c.tar.bz2
I can rebaseline!
TEST=none BUG=none Review URL: http://codereview.chromium.org/552161 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug6674-expected.pngbin11791 -> 10709 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt7
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic-expected.pngbin49025 -> 49007 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/tables/mozilla/bugs/bug6674-expected.pngbin0 -> 16388 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt7
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.pngbin5594 -> 5408 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.txt30
11 files changed, 32 insertions, 19 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum
index 40b8a60..000a543 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum
@@ -1 +1 @@
-74784275827519ee8c6b2299fb4cd9ba \ No newline at end of file
+f37b7d9db312e1cbb24d3829b070a745 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug6674-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug6674-expected.png
index 4c3d2b4..cacc3bf 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug6674-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug6674-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
new file mode 100644
index 0000000..286b1aa
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
@@ -0,0 +1,7 @@
+ALERT: hello
+CONSOLE MESSAGE: line 1: Uncaught ReferenceError: sayHello is not defined
+This test copies the content of an iframe and pastes it in an editable area in an xhtml document and verifies that no script, handlers or javascript urls are copied.
+
+HelloCNNHello
+This is a form
+<button xmlns="http://www.w3.org/1999/xhtml" id="button1" style="width: 100px; ">Hello</button><a xmlns="http://www.w3.org/1999/xhtml" id="anchor1" href="http://www.cnn.com">CNN</a><a xmlns="http://www.w3.org/1999/xhtml" id="anchor2">Hello</a><iframe xmlns="http://www.w3.org/1999/xhtml" id="iframe1" style="width: 200px; height: 100px; background-color: rgb(204, 238, 238); "></iframe><form xmlns="http://www.w3.org/1999/xhtml" id="form1" style="width: 200px; height: 150px; background-color: rgb(204, 238, 238); ">This is a form</form>
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic-expected.checksum
index a2a265f..f53febc 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic-expected.checksum
@@ -1 +1 @@
-975f398ea52a2a93796d68ebd121a8db \ No newline at end of file
+b6bed3d893daffc642d8e1680876d271 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic-expected.png
index 90654c8..33bba48 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/lists/w3-css3-list-styles-alphabetic-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum
new file mode 100644
index 0000000..51ca31d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum
@@ -0,0 +1 @@
+d9abc00c465b8b373d54b947563e3d19 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/tables/mozilla/bugs/bug6674-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/tables/mozilla/bugs/bug6674-expected.png
new file mode 100644
index 0000000..06f54ba
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/tables/mozilla/bugs/bug6674-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
new file mode 100644
index 0000000..286b1aa
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
@@ -0,0 +1,7 @@
+ALERT: hello
+CONSOLE MESSAGE: line 1: Uncaught ReferenceError: sayHello is not defined
+This test copies the content of an iframe and pastes it in an editable area in an xhtml document and verifies that no script, handlers or javascript urls are copied.
+
+HelloCNNHello
+This is a form
+<button xmlns="http://www.w3.org/1999/xhtml" id="button1" style="width: 100px; ">Hello</button><a xmlns="http://www.w3.org/1999/xhtml" id="anchor1" href="http://www.cnn.com">CNN</a><a xmlns="http://www.w3.org/1999/xhtml" id="anchor2">Hello</a><iframe xmlns="http://www.w3.org/1999/xhtml" id="iframe1" style="width: 200px; height: 100px; background-color: rgb(204, 238, 238); "></iframe><form xmlns="http://www.w3.org/1999/xhtml" id="form1" style="width: 200px; height: 150px; background-color: rgb(204, 238, 238); ">This is a form</form>
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum
index 032d901..fd4b0651 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.checksum
@@ -1 +1 @@
-e8c829c7f7d29b992ba1061d035b6697 \ No newline at end of file
+c87c260a7ab899ba144c89f12de996a4 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.png
index 998f973..7c2d589 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.txt
index 652bf02..22ffafa 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug6674-expected.txt
@@ -1,21 +1,19 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x170
- RenderBlock {HTML} at (0,0) size 800x170
- RenderBody {BODY} at (8,8) size 784x154
- RenderTable {TABLE} at (0,0) size 96x56 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 94x54
- RenderTableRow {TR} at (0,2) size 94x50
- RenderTableCell {TD} at (2,2) size 90x50 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderBlock {DIV} at (2,2) size 86x46 [border: (3px dotted #00FF00)]
- RenderText {#text} at (3,3) size 103x39
- text run at (3,3) width 68: "Truncated?"
- text run at (3,23) width 103: " It should not be!"
- RenderBlock {P} at (0,72) size 784x20
+layer at (0,0) size 800x130
+ RenderBlock {HTML} at (0,0) size 800x130
+ RenderBody {BODY} at (8,8) size 784x114
+ RenderTable {TABLE} at (0,0) size 96x36 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 94x34
+ RenderTableRow {TR} at (0,2) size 94x30
+ RenderTableCell {TD} at (2,2) size 90x30 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (2,2) size 86x26 [border: (3px dotted #00FF00)]
+ RenderText {#text} at (3,3) size 171x19
+ text run at (3,3) width 171: "Truncated? It should not be!"
+ RenderBlock {P} at (0,52) size 784x20
RenderText {#text} at (0,0) size 706x19
text run at (0,0) width 440: "According to the rules of CSS, the text above should spill right out of the "
text run at (440,0) width 266: "table, as it does in the table-less case below:"
- RenderBlock {DIV} at (0,108) size 86x46 [border: (3px dotted #00FF00)]
- RenderText {#text} at (3,3) size 103x39
- text run at (3,3) width 68: "Truncated?"
- text run at (3,23) width 103: " It should not be!"
+ RenderBlock {DIV} at (0,88) size 86x26 [border: (3px dotted #00FF00)]
+ RenderText {#text} at (3,3) size 171x19
+ text run at (3,3) width 171: "Truncated? It should not be!"