Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (151864 => 151865)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-06-21 23:05:28 UTC (rev 151864)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-06-21 23:23:17 UTC (rev 151865)
@@ -1,3 +1,24 @@
+2013-06-21 Lucas Forschler <[email protected]>
+
+ Rollout r151801 after 151451 was rolled out.
+
+ 2013-06-20 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r151463.
+ http://trac.webkit.org/changeset/151463
+ https://bugs.webkit.org/show_bug.cgi?id=117850
+
+ "r151451 was rolled out" (Requested by rhogan on #webkit).
+
+ * platform/efl/fast/forms/button-positioned-expected.txt:
+ * platform/efl/fast/forms/input-appearance-preventDefault-expected.txt:
+ * platform/efl/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt: Removed.
+ * platform/gtk/fast/forms/button-positioned-expected.txt:
+ * platform/gtk/fast/forms/input-appearance-preventDefault-expected.png:
+ * platform/gtk/fast/forms/input-appearance-preventDefault-expected.txt:
+ * platform/gtk/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt: Removed.
+ * platform/win/fast/forms/onselect-textfield-expected.txt: Removed.
+
2013-06-20 Lucas Forschler <[email protected]>
Merge r151799
Modified: branches/safari-537-branch/LayoutTests/platform/efl/fast/forms/button-positioned-expected.txt (151864 => 151865)
--- branches/safari-537-branch/LayoutTests/platform/efl/fast/forms/button-positioned-expected.txt 2013-06-21 23:05:28 UTC (rev 151864)
+++ branches/safari-537-branch/LayoutTests/platform/efl/fast/forms/button-positioned-expected.txt 2013-06-21 23:23:17 UTC (rev 151865)
@@ -3,13 +3,13 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
-layer at (10,10) size 245x22
- RenderButton {BUTTON} at (10,10) size 245x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (17,10) size 211x18
- RenderText {#text} at (17,0) size 177x17
- text run at (17,0) width 177: "This button is positioned."
-layer at (10,10) size 275x22
- RenderButton {INPUT} at (10,10) size 275x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (17,10) size 241x18
- RenderText at (17,0) size 207x17
- text run at (17,0) width 207: "This button is also positioned"
+layer at (10,10) size 211x40
+ RenderButton {BUTTON} at (10,10) size 211x40 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (17,10) size 177x18
+ RenderText {#text} at (0,0) size 177x17
+ text run at (0,0) width 177: "This button is positioned."
+layer at (10,10) size 241x40
+ RenderButton {INPUT} at (10,10) size 241x40 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (17,10) size 207x18
+ RenderText at (0,0) size 207x17
+ text run at (0,0) width 207: "This button is also positioned"
Modified: branches/safari-537-branch/LayoutTests/platform/efl/fast/forms/input-appearance-preventDefault-expected.txt (151864 => 151865)
--- branches/safari-537-branch/LayoutTests/platform/efl/fast/forms/input-appearance-preventDefault-expected.txt 2013-06-21 23:05:28 UTC (rev 151864)
+++ branches/safari-537-branch/LayoutTests/platform/efl/fast/forms/input-appearance-preventDefault-expected.txt 2013-06-21 23:23:17 UTC (rev 151865)
@@ -8,10 +8,10 @@
text run at (0,18) width 666: "This tests that preventDefault called onmousedown will prevent a caret from being placed in the text field."
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (12,52) size 199x38
- RenderTextControl {INPUT} at (12,52) size 199x38 [bgcolor=#FFFFFF]
-layer at (16,63) size 192x18
- RenderBlock {DIV} at (4,11) size 192x18
+layer at (12,52) size 192x28
+ RenderTextControl {INPUT} at (12,52) size 192x28 [bgcolor=#FFFFFF]
+layer at (16,58) size 185x18
+ RenderBlock {DIV} at (4,6) size 185x18
RenderText {#text} at (0,0) size 170x17
text run at (0,0) width 170: "No caret should be here"
layer at (10,70) size 323x36
Deleted: branches/safari-537-branch/LayoutTests/platform/efl/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt (151864 => 151865)
--- branches/safari-537-branch/LayoutTests/platform/efl/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt 2013-06-21 23:05:28 UTC (rev 151864)
+++ branches/safari-537-branch/LayoutTests/platform/efl/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt 2013-06-21 23:23:17 UTC (rev 151865)
@@ -1,25 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x50
- RenderBlock {HTML} at (0,0) size 800x50
- RenderBody {BODY} at (8,16) size 784x18
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 608x17
- text run at (0,0) width 608: "webkit.org/b/93735: Use the replaced height and width computation for positioned form controls"
-layer at (7,32) size 414x40
- RenderTextControl {INPUT} at (7,32) size 414x40 [bgcolor=#FFFFFF]
-layer at (11,43) size 407x20
- RenderBlock {DIV} at (4,11) size 407x20
-layer at (7,82) size 148x22
- RenderButton {INPUT} at (7,82) size 148x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (17,10) size 114x20
- RenderText at (17,0) size 80x20
- text run at (17,0) width 80: "text"
-layer at (7,132) size 192x60
- RenderMenuList {SELECT} at (7,132) size 192x60 [bgcolor=#FFFFFF]
- RenderBlock (anonymous) at (15,20) size 136x20
- RenderText at (0,0) size 80x20
- text run at (0,0) width 80: "test"
-layer at (7,182) size 427x52 clip at (8,183) size 425x50
- RenderTextControl {TEXTAREA} at (7,182) size 427x52 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
- RenderBlock {DIV} at (3,3) size 421x20
Modified: branches/safari-537-branch/LayoutTests/platform/gtk/fast/forms/button-positioned-expected.txt (151864 => 151865)
--- branches/safari-537-branch/LayoutTests/platform/gtk/fast/forms/button-positioned-expected.txt 2013-06-21 23:05:28 UTC (rev 151864)
+++ branches/safari-537-branch/LayoutTests/platform/gtk/fast/forms/button-positioned-expected.txt 2013-06-21 23:23:17 UTC (rev 151865)
@@ -3,13 +3,13 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
-layer at (10,10) size 209x9
- RenderButton {BUTTON} at (10,10) size 209x9 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,4) size 193x17
- RenderText {#text} at (8,0) size 177x17
- text run at (8,0) width 177: "This button is positioned."
-layer at (10,10) size 239x9
- RenderButton {INPUT} at (10,10) size 239x9 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,4) size 223x17
- RenderText at (8,0) size 207x17
- text run at (8,0) width 207: "This button is also positioned"
+layer at (10,10) size 193x26
+ RenderButton {BUTTON} at (10,10) size 193x26 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (8,4) size 177x17
+ RenderText {#text} at (0,0) size 177x17
+ text run at (0,0) width 177: "This button is positioned."
+layer at (10,10) size 223x26
+ RenderButton {INPUT} at (10,10) size 223x26 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderBlock (anonymous) at (8,4) size 207x17
+ RenderText at (0,0) size 207x17
+ text run at (0,0) width 207: "This button is also positioned"
Modified: branches/safari-537-branch/LayoutTests/platform/gtk/fast/forms/input-appearance-preventDefault-expected.png
(Binary files differ)
Modified: branches/safari-537-branch/LayoutTests/platform/gtk/fast/forms/input-appearance-preventDefault-expected.txt (151864 => 151865)
--- branches/safari-537-branch/LayoutTests/platform/gtk/fast/forms/input-appearance-preventDefault-expected.txt 2013-06-21 23:05:28 UTC (rev 151864)
+++ branches/safari-537-branch/LayoutTests/platform/gtk/fast/forms/input-appearance-preventDefault-expected.txt 2013-06-21 23:23:17 UTC (rev 151865)
@@ -8,10 +8,10 @@
text run at (0,17) width 666: "This tests that preventDefault called onmousedown will prevent a caret from being placed in the text field."
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (12,52) size 197x29
- RenderTextControl {INPUT} at (12,52) size 197x29 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-layer at (15,58) size 191x17
- RenderBlock {DIV} at (3,6) size 191x17
+layer at (12,52) size 191x23
+ RenderTextControl {INPUT} at (12,52) size 191x23 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+layer at (15,55) size 185x17
+ RenderBlock {DIV} at (3,3) size 185x17
RenderText {#text} at (0,0) size 170x17
text run at (0,0) width 170: "No caret should be here"
layer at (10,70) size 323x34
Deleted: branches/safari-537-branch/LayoutTests/platform/gtk/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt (151864 => 151865)
--- branches/safari-537-branch/LayoutTests/platform/gtk/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt 2013-06-21 23:05:28 UTC (rev 151864)
+++ branches/safari-537-branch/LayoutTests/platform/gtk/fast/replaced/width-and-height-of-positioned-replaced-elements-expected.txt 2013-06-21 23:23:17 UTC (rev 151865)
@@ -1,25 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x49
- RenderBlock {HTML} at (0,0) size 800x49
- RenderBody {BODY} at (8,16) size 784x17
- RenderBlock {P} at (0,0) size 784x17
- RenderText {#text} at (0,0) size 608x17
- text run at (0,0) width 608: "webkit.org/b/93735: Use the replaced height and width computation for positioned form controls"
-layer at (7,32) size 412x32
- RenderTextControl {INPUT} at (7,32) size 412x32 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-layer at (10,38) size 406x20
- RenderBlock {DIV} at (3,6) size 406x20
-layer at (7,82) size 112x9
- RenderButton {INPUT} at (7,82) size 112x9 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,4) size 96x20
- RenderText at (8,0) size 80x20
- text run at (8,0) width 80: "text"
-layer at (7,132) size 109x32
- RenderMenuList {SELECT} at (7,132) size 109x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
- RenderBlock (anonymous) at (1,2) size 107x28
- RenderText at (4,4) size 80x20
- text run at (4,4) width 80: "test"
-layer at (7,182) size 427x52 clip at (8,183) size 425x50
- RenderTextControl {TEXTAREA} at (7,182) size 427x52 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
- RenderBlock {DIV} at (3,3) size 421x20
Deleted: branches/safari-537-branch/LayoutTests/platform/win/fast/forms/onselect-textfield-expected.txt (151864 => 151865)
--- branches/safari-537-branch/LayoutTests/platform/win/fast/forms/onselect-textfield-expected.txt 2013-06-21 23:05:28 UTC (rev 151864)
+++ branches/safari-537-branch/LayoutTests/platform/win/fast/forms/onselect-textfield-expected.txt 2013-06-21 23:23:17 UTC (rev 151865)
@@ -1,19 +0,0 @@
-
-This tests onSelect for text fields.
-
-Calling focus on text field
-After focus: text field selection start: 0 end: 10
-
-Calling setSelectionRange on text field
-After setSelectionRange(3, 5): text field selection start: 3 end: 5
-
-Double clicking to make selection for text field
-onselect fired for text field
-After double clicking: text field selection start: 6 end: 10
-
-Calling blur on text field
-After blur: text field selection start: 6 end: 10
-
-Calling focus on text field
-After focus: text field selection start: 6 end: 10
-
