[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
eric at webkit.org
eric at webkit.org
Thu Oct 29 20:32:42 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit e95583a3db79e7615c2bf858c5021da1df4b8b2d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 24 00:40:35 2009 +0000
2009-09-23 Karen Grünberg <karen+webkit at chromium.org>
Reviewed by Dimitri Glazkov.
https://bugs.webkit.org/show_bug.cgi?id=29493
Added layout test to test buttons extensively
with different paddings. Testing both buttons
with images and text. Existing tests were not
comprehensive enough.
* fast/forms/basic-buttons.html: Added.
* platform/mac/fast/forms/basic-buttons-expected.checksum: Added.
* platform/mac/fast/forms/basic-buttons-expected.png: Added.
* platform/mac/fast/forms/basic-buttons-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48690 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 25879c0..3d75261 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2009-09-23 Karen Grünberg <karen+webkit at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ https://bugs.webkit.org/show_bug.cgi?id=29493
+
+ Added layout test to test buttons extensively
+ with different paddings. Testing both buttons
+ with images and text. Existing tests were not
+ comprehensive enough.
+
+ * fast/forms/basic-buttons.html: Added.
+ * platform/mac/fast/forms/basic-buttons-expected.checksum: Added.
+ * platform/mac/fast/forms/basic-buttons-expected.png: Added.
+ * platform/mac/fast/forms/basic-buttons-expected.txt: Added.
+
2009-09-23 Daniel Bates <dbates at webkit.org>
Reviewed by Adam Barth.
diff --git a/LayoutTests/fast/forms/basic-buttons.html b/LayoutTests/fast/forms/basic-buttons.html
new file mode 100644
index 0000000..1ff9824
--- /dev/null
+++ b/LayoutTests/fast/forms/basic-buttons.html
@@ -0,0 +1,56 @@
+<!DocType html><html>
+<body>
+
+Tests for basic button rendering. Creates a table with seven columns and seven rows. <BR>
+Creates two different types of buttons, one with an image (a red dot) and another <BR>
+with text ("foo") and then uses six different paddings to make sure each of the buttons render properly.
+<BR><BR>
+
+<script>
+var fooImage = '<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9YGARc5KB0XV+IAAAAddEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIFRoZSBHSU1Q72QlbgAAAF1JREFUGNO9zL0NglAAxPEfdLTs4BZM4DIO4C7OwQg2JoQ9LE1exdlYvBBeZ7jqch9//q1uH4TLzw4d6+ErXMMcXuHWxId3KOETnnXXV6MJpcq2MLaI97CER3N0vr4MkhoXe0rZigAAAABJRU5ErkJggg==" alt="Red dot" />';
+
+function getRowHtml(style)
+{
+ return '<tr><td>' + (style || '(default)') + '</td>' +
+ '<td><button ' + (style ? 'style="' + style + '"' : '') + '>' + fooImage + '</button></td>' +
+ '<td></td>' +
+ '<td><input type="button" value="foo" style="' + style + '"></td>' +
+ '<td></td></tr>';
+}
+
+document.body.innerHTML += '<table cellspacing=0><tbody>' +
+ '<tr><td>styling</td><td><button></td><td>(offsetH,W) (clientH,W)</td>' +
+ '<td><input type=button></td><td>(offsetH,W) (clientH, -W)</td>' +
+ '</tr>' +
+ getRowHtml('') +
+ getRowHtml('padding: 0') +
+ getRowHtml('padding: 10%') +
+ getRowHtml('padding: 2px') +
+ getRowHtml('padding: 2px 6px 3px 6px') +
+ getRowHtml('padding: 3px 7px') +
+ getRowHtml('padding: 20px') +
+ '</tbody></table>';
+
+function printSize(tagname, cell)
+{
+ var buttons = document.getElementsByTagName(tagname);
+ for (var i = 0; i < buttons.length; i++) {
+ var button = buttons[i];
+
+ var table = document.getElementsByTagName('table')[0];
+ var rows = table.rows;
+ var thisCell = button.parentNode;
+ var thisRow = thisCell.parentNode;
+
+ button.parentNode.nextSibling.innerHTML =
+ "(" + button.offsetHeight + ", " + button.offsetWidth + ") " +
+ "(" + button.clientHeight + ", " + button.clientWidth + ")";
+ }
+}
+
+printSize('button');
+printSize('input');
+</script>
+
+</body>
+</html>
diff --git a/LayoutTests/platform/mac/fast/forms/basic-buttons-expected.checksum b/LayoutTests/platform/mac/fast/forms/basic-buttons-expected.checksum
new file mode 100644
index 0000000..abfbe8e
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/forms/basic-buttons-expected.checksum
@@ -0,0 +1 @@
+c803ef2afc01606fc4f6b70ec0691cd1
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/forms/basic-buttons-expected.png b/LayoutTests/platform/mac/fast/forms/basic-buttons-expected.png
new file mode 100644
index 0000000..b9d279b
Binary files /dev/null and b/LayoutTests/platform/mac/fast/forms/basic-buttons-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/forms/basic-buttons-expected.txt b/LayoutTests/platform/mac/fast/forms/basic-buttons-expected.txt
new file mode 100644
index 0000000..f0852b3
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/forms/basic-buttons-expected.txt
@@ -0,0 +1,167 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x317
+ RenderBlock {HTML} at (0,0) size 800x317
+ RenderBody {BODY} at (8,8) size 784x301
+ RenderBlock (anonymous) at (0,0) size 784x72
+ RenderText {#text} at (0,0) size 538x18
+ text run at (0,0) width 538: "Tests for basic button rendering. Creates a table with seven columns and seven rows. "
+ RenderBR {BR} at (538,0) size 0x18
+ RenderText {#text} at (0,18) size 511x18
+ text run at (0,18) width 511: "Creates two different types of buttons, one with an image (a red dot) and another "
+ RenderBR {BR} at (511,18) size 0x18
+ RenderText {#text} at (0,36) size 649x18
+ text run at (0,36) width 649: "with text (\"foo\") and then uses six different paddings to make sure each of the buttons render properly. "
+ RenderBR {BR} at (649,36) size 0x18
+ RenderBR {BR} at (0,54) size 0x18
+ RenderTable {TABLE} at (0,72) size 684x229
+ RenderTableSection {TBODY} at (0,0) size 684x229
+ RenderTableRow {TR} at (0,0) size 684x20
+ RenderTableCell {TD} at (0,0) size 169x20 [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 42x18
+ text run at (1,1) width 42: "styling"
+ RenderTableCell {TD} at (169,0) size 60x20 [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 58x18
+ text run at (1,1) width 58: "<button>"
+ RenderTableCell {TD} at (229,0) size 157x20 [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 155x18
+ text run at (1,1) width 155: "(offsetH,W) (clientH,W)"
+ RenderTableCell {TD} at (386,0) size 132x20 [r=0 c=3 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 130x18
+ text run at (1,1) width 130: "<input type=button>"
+ RenderTableCell {TD} at (518,0) size 166x20 [r=0 c=4 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 164x18
+ text run at (1,1) width 164: "(offsetH,W) (clientH, -W)"
+ RenderTableRow {TR} at (0,20) size 684x24
+ RenderTableCell {TD} at (0,22) size 169x20 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 53x18
+ text run at (1,1) width 53: "(default)"
+ RenderTableCell {TD} at (169,20) size 60x24 [r=1 c=1 rs=1 cs=1]
+ RenderButton {BUTTON} at (3,3) size 26x18 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0) none (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (8,2) size 10x13
+ RenderImage {IMG} at (0,1) size 10x10
+ RenderTableCell {TD} at (229,22) size 157x20 [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 104x18
+ text run at (1,1) width 104: "(18, 16) (18, 12)"
+ RenderTableCell {TD} at (386,20) size 132x24 [r=1 c=3 rs=1 cs=1]
+ RenderButton {INPUT} at (3,3) size 34x18 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (8,2) size 18x13
+ RenderText at (0,0) size 18x13
+ text run at (0,0) width 18: "foo"
+ RenderTableCell {TD} at (518,22) size 166x20 [r=1 c=4 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 104x18
+ text run at (1,1) width 104: "(18, 34) (18, 34)"
+ RenderTableRow {TR} at (0,44) size 684x24
+ RenderTableCell {TD} at (0,46) size 169x20 [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 67x18
+ text run at (1,1) width 67: "padding: 0"
+ RenderTableCell {TD} at (169,45) size 60x21 [r=2 c=1 rs=1 cs=1]
+ RenderButton {BUTTON} at (3,3) size 14x15 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0) none (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (2,1) size 10x13
+ RenderImage {IMG} at (0,1) size 10x10
+ RenderTableCell {TD} at (229,46) size 157x20 [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 88x18
+ text run at (1,1) width 88: "(15, 4) (15, 0)"
+ RenderTableCell {TD} at (386,44) size 132x24 [r=2 c=3 rs=1 cs=1]
+ RenderButton {INPUT} at (3,3) size 34x18 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (8,2) size 18x13
+ RenderText at (0,0) size 18x13
+ text run at (0,0) width 18: "foo"
+ RenderTableCell {TD} at (518,46) size 166x20 [r=2 c=4 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 104x18
+ text run at (1,1) width 104: "(18, 34) (18, 34)"
+ RenderTableRow {TR} at (0,68) size 684x29
+ RenderTableCell {TD} at (0,72) size 169x20 [r=3 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 88x18
+ text run at (1,1) width 88: "padding: 10%"
+ RenderTableCell {TD} at (169,68) size 60x29 [r=3 c=1 rs=1 cs=1]
+ RenderButton {BUTTON} at (3,3) size 24x23 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0) none (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (7,5) size 10x13
+ RenderImage {IMG} at (0,1) size 10x10
+ RenderTableCell {TD} at (229,72) size 157x20 [r=3 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 104x18
+ text run at (1,1) width 104: "(23, 14) (23, 10)"
+ RenderTableCell {TD} at (386,70) size 132x24 [r=3 c=3 rs=1 cs=1]
+ RenderButton {INPUT} at (3,3) size 34x18 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (8,2) size 18x13
+ RenderText at (0,0) size 18x13
+ text run at (0,0) width 18: "foo"
+ RenderTableCell {TD} at (518,72) size 166x20 [r=3 c=4 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 104x18
+ text run at (1,1) width 104: "(18, 34) (18, 34)"
+ RenderTableRow {TR} at (0,97) size 684x24
+ RenderTableCell {TD} at (0,99) size 169x20 [r=4 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 83x18
+ text run at (1,1) width 83: "padding: 2px"
+ RenderTableCell {TD} at (169,97) size 60x23 [r=4 c=1 rs=1 cs=1]
+ RenderButton {BUTTON} at (3,3) size 18x17 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0) none (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (4,2) size 10x13
+ RenderImage {IMG} at (0,1) size 10x10
+ RenderTableCell {TD} at (229,99) size 157x20 [r=4 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 88x18
+ text run at (1,1) width 88: "(17, 8) (17, 4)"
+ RenderTableCell {TD} at (386,97) size 132x24 [r=4 c=3 rs=1 cs=1]
+ RenderButton {INPUT} at (3,3) size 34x18 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (8,2) size 18x13
+ RenderText at (0,0) size 18x13
+ text run at (0,0) width 18: "foo"
+ RenderTableCell {TD} at (518,99) size 166x20 [r=4 c=4 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 104x18
+ text run at (1,1) width 104: "(18, 34) (18, 34)"
+ RenderTableRow {TR} at (0,121) size 684x24
+ RenderTableCell {TD} at (0,123) size 169x20 [r=5 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 167x18
+ text run at (1,1) width 167: "padding: 2px 6px 3px 6px"
+ RenderTableCell {TD} at (169,121) size 60x24 [r=5 c=1 rs=1 cs=1]
+ RenderButton {BUTTON} at (3,3) size 26x18 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0) none (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (8,2) size 10x13
+ RenderImage {IMG} at (0,1) size 10x10
+ RenderTableCell {TD} at (229,123) size 157x20 [r=5 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 104x18
+ text run at (1,1) width 104: "(18, 16) (18, 12)"
+ RenderTableCell {TD} at (386,121) size 132x24 [r=5 c=3 rs=1 cs=1]
+ RenderButton {INPUT} at (3,3) size 34x18 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (8,2) size 18x13
+ RenderText at (0,0) size 18x13
+ text run at (0,0) width 18: "foo"
+ RenderTableCell {TD} at (518,123) size 166x20 [r=5 c=4 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 104x18
+ text run at (1,1) width 104: "(18, 34) (18, 34)"
+ RenderTableRow {TR} at (0,145) size 684x25
+ RenderTableCell {TD} at (0,147) size 169x20 [r=6 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 111x18
+ text run at (1,1) width 111: "padding: 3px 7px"
+ RenderTableCell {TD} at (169,145) size 60x25 [r=6 c=1 rs=1 cs=1]
+ RenderButton {BUTTON} at (3,3) size 28x19 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0) none (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (9,3) size 10x13
+ RenderImage {IMG} at (0,1) size 10x10
+ RenderTableCell {TD} at (229,147) size 157x20 [r=6 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 104x18
+ text run at (1,1) width 104: "(19, 18) (19, 14)"
+ RenderTableCell {TD} at (386,145) size 132x24 [r=6 c=3 rs=1 cs=1]
+ RenderButton {INPUT} at (3,3) size 34x18 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (8,2) size 18x13
+ RenderText at (0,0) size 18x13
+ text run at (0,0) width 18: "foo"
+ RenderTableCell {TD} at (518,147) size 166x20 [r=6 c=4 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 104x18
+ text run at (1,1) width 104: "(18, 34) (18, 34)"
+ RenderTableRow {TR} at (0,170) size 684x59
+ RenderTableCell {TD} at (0,189) size 169x20 [r=7 c=0 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 91x18
+ text run at (1,1) width 91: "padding: 20px"
+ RenderTableCell {TD} at (169,170) size 60x59 [r=7 c=1 rs=1 cs=1]
+ RenderButton {BUTTON} at (3,3) size 54x53 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0) none (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (22,20) size 10x13
+ RenderImage {IMG} at (0,1) size 10x10
+ RenderTableCell {TD} at (229,189) size 157x20 [r=7 c=2 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 104x18
+ text run at (1,1) width 104: "(53, 44) (53, 40)"
+ RenderTableCell {TD} at (386,187) size 132x24 [r=7 c=3 rs=1 cs=1]
+ RenderButton {INPUT} at (3,3) size 34x18 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (8,2) size 18x13
+ RenderText at (0,0) size 18x13
+ text run at (0,0) width 18: "foo"
+ RenderTableCell {TD} at (518,189) size 166x20 [r=7 c=4 rs=1 cs=1]
+ RenderText {#text} at (1,1) size 104x18
+ text run at (1,1) width 104: "(18, 34) (18, 34)"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list