Diff
Modified: trunk/LayoutTests/ChangeLog (120177 => 120178)
--- trunk/LayoutTests/ChangeLog 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/LayoutTests/ChangeLog 2012-06-13 10:21:12 UTC (rev 120178)
@@ -1,3 +1,21 @@
+2012-06-13 Ryosuke Niwa <[email protected]>
+
+ Mac rebaseline after r120167 and r120173.
+
+ Also revert an inadvertent change to file.invalidext.
+
+ * editing/pasteboard/file-input-files-access-expected.txt:
+ * editing/pasteboard/paste-sanitize-crash-2-expected.txt:
+ * editing/pasteboard/resources/file.invalidext:
+ * editing/selection/blockquote-crash-expected.txt:
+ * editing/style/4230923-expected.txt:
+ * platform/mac/editing/pasteboard/4641033-expected.txt:
+ * platform/mac/editing/selection/mixed-editability-1-expected.txt:
+ * platform/mac/editing/selection/paragraph-granularity-expected.txt:
+ * platform/mac/editing/selection/triple-click-in-pre-expected.txt:
+ * platform/mac/editing/selection/word-granularity-expected.txt:
+ * platform/mac/http/tests/misc/location-replace-crossdomain-expected.txt:
+
2012-06-13 Taiju Tsuiki <[email protected]>
Implement InspectorFileSystemAgent::readDirectory for FileSystem support.
Modified: trunk/LayoutTests/editing/pasteboard/file-input-files-access-expected.txt (120177 => 120178)
--- trunk/LayoutTests/editing/pasteboard/file-input-files-access-expected.txt 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/LayoutTests/editing/pasteboard/file-input-files-access-expected.txt 2012-06-13 10:21:12 UTC (rev 120178)
@@ -39,7 +39,7 @@
PASS fileInput.files[1].size is 2593
PASS fileInput.files[2].name is "file.invalidext"
PASS fileInput.files[2].type is ""
-PASS fileInput.files[2].size is 10
+FAIL fileInput.files[2].size should be 10. Was 11.
Dragging a file and a directory onto a mutli-file input control:
FAIL fileInput.value should be . Was C:\fakepath\apple.gif.
FAIL fileInput.files.length should be 0. Was 2.
Modified: trunk/LayoutTests/editing/pasteboard/paste-sanitize-crash-2-expected.txt (120177 => 120178)
--- trunk/LayoutTests/editing/pasteboard/paste-sanitize-crash-2-expected.txt 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/LayoutTests/editing/pasteboard/paste-sanitize-crash-2-expected.txt 2012-06-13 10:21:12 UTC (rev 120178)
@@ -3,3 +3,5 @@
three
four
two
+
+
Modified: trunk/LayoutTests/editing/pasteboard/resources/file.invalidext (120177 => 120178)
--- trunk/LayoutTests/editing/pasteboard/resources/file.invalidext 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/LayoutTests/editing/pasteboard/resources/file.invalidext 2012-06-13 10:21:12 UTC (rev 120178)
@@ -1 +1 @@
-1234567890
+1234567890
\ No newline at end of file
Modified: trunk/LayoutTests/editing/selection/blockquote-crash-expected.txt (120177 => 120178)
--- trunk/LayoutTests/editing/selection/blockquote-crash-expected.txt 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/LayoutTests/editing/selection/blockquote-crash-expected.txt 2012-06-13 10:21:12 UTC (rev 120178)
@@ -3,3 +3,4 @@
+
Modified: trunk/LayoutTests/editing/style/4230923-expected.txt (120177 => 120178)
--- trunk/LayoutTests/editing/style/4230923-expected.txt 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/LayoutTests/editing/style/4230923-expected.txt 2012-06-13 10:21:12 UTC (rev 120178)
@@ -2,3 +2,4 @@
<div style="text-align: center;"><br></div>
+
Modified: trunk/LayoutTests/platform/mac/editing/pasteboard/4641033-expected.txt (120177 => 120178)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/4641033-expected.txt 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/4641033-expected.txt 2012-06-13 10:21:12 UTC (rev 120178)
@@ -33,4 +33,5 @@
RenderText at (8,2) size 7x13
text run at (8,2) width 7: "1"
RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
caret: position 1 of child 2 {SELECT} of child 2 {DIV} of body
Modified: trunk/LayoutTests/platform/mac/editing/selection/mixed-editability-1-expected.txt (120177 => 120178)
--- trunk/LayoutTests/platform/mac/editing/selection/mixed-editability-1-expected.txt 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/LayoutTests/platform/mac/editing/selection/mixed-editability-1-expected.txt 2012-06-13 10:21:12 UTC (rev 120178)
@@ -17,5 +17,6 @@
text run at (484,0) width 298: "To run this test manually, double click between"
text run at (782,0) width 2: " "
text run at (0,18) width 351: "the first two letters of the first word of the first sentence."
+ RenderText {#text} at (0,0) size 0x0
selection start: position 0 of child 0 {#text} of child 0 {SPAN} of body
selection end: position 2 of child 0 {#text} of child 0 {SPAN} of body
Modified: trunk/LayoutTests/platform/mac/editing/selection/paragraph-granularity-expected.txt (120177 => 120178)
--- trunk/LayoutTests/platform/mac/editing/selection/paragraph-granularity-expected.txt 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/LayoutTests/platform/mac/editing/selection/paragraph-granularity-expected.txt 2012-06-13 10:21:12 UTC (rev 120178)
@@ -16,13 +16,13 @@
text run at (0,0) width 368: "This tests modifying a selection created with a triple click. "
text run at (368,0) width 329: "The new selection should use paragraph granularity."
RenderBlock {P} at (0,34) size 784x54 [color=#008000]
- RenderText {#text} at (0,0) size 771x54
+ RenderText {#text} at (0,0) size 778x54
text run at (0,0) width 224: "This test does not run interactively. "
- text run at (224,0) width 414: "It uses the testRunners eventSender to do mouse clicks. "
- text run at (638,0) width 121: "To run it manually,"
- text run at (0,18) width 365: "double click on the blue 'g', then drag down to the red 'g'. "
- text run at (365,18) width 406: "As you drag, watch the selection that is created, it should always"
- text run at (0,36) width 244: "start and end on paragraph boundaries."
+ text run at (224,0) width 352: "It uses the testRunners eventSender to do mouse clicks. "
+ text run at (576,0) width 202: "To run it manually, double click"
+ text run at (0,18) width 284: "on the blue 'g', then drag down to the red 'g'. "
+ text run at (284,18) width 490: "As you drag, watch the selection that is created, it should always start and end"
+ text run at (0,36) width 160: "on paragraph boundaries."
RenderBlock {DIV} at (0,104) size 784x108
RenderText {#text} at (0,0) size 84x18
text run at (0,0) width 84: "This is a para"
Modified: trunk/LayoutTests/platform/mac/editing/selection/triple-click-in-pre-expected.txt (120177 => 120178)
--- trunk/LayoutTests/platform/mac/editing/selection/triple-click-in-pre-expected.txt 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/LayoutTests/platform/mac/editing/selection/triple-click-in-pre-expected.txt 2012-06-13 10:21:12 UTC (rev 120178)
@@ -13,15 +13,14 @@
RenderText {#text} at (0,0) size 678x18
text run at (0,0) width 379: "This tests modifying a selection created with a double click. "
text run at (379,0) width 299: "The new selection should use word granularity."
- RenderBlock {P} at (0,34) size 784x54 [color=#008000]
- RenderText {#text} at (0,0) size 764x54
+ RenderBlock {P} at (0,34) size 784x36 [color=#008000]
+ RenderText {#text} at (0,0) size 767x36
text run at (0,0) width 224: "This test does not run interactively. "
- text run at (224,0) width 414: "It uses the testRunners eventSender to do mouse clicks. "
- text run at (638,0) width 121: "To run it manually,"
- text run at (0,18) width 522: "triple click on the second line in the box below (anywhere after \"whitespace:pre\"). "
- text run at (522,18) width 242: "The triple click should select the entire"
- text run at (0,36) width 27: "line."
- RenderBlock {DIV} at (0,104) size 784x58
+ text run at (224,0) width 352: "It uses the testRunners eventSender to do mouse clicks. "
+ text run at (576,0) width 191: "To run it manually, triple click"
+ text run at (0,18) width 452: "on the second line in the box below (anywhere after \"whitespace:pre\"). "
+ text run at (452,18) width 273: "The triple click should select the entire line."
+ RenderBlock {DIV} at (0,86) size 784x58
RenderBlock {DIV} at (0,0) size 784x58 [border: (1px solid #0000FF)]
RenderBlock {PRE} at (1,14) size 782x30
RenderText {#text} at (0,0) size 120x30
Modified: trunk/LayoutTests/platform/mac/editing/selection/word-granularity-expected.txt (120177 => 120178)
--- trunk/LayoutTests/platform/mac/editing/selection/word-granularity-expected.txt 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/LayoutTests/platform/mac/editing/selection/word-granularity-expected.txt 2012-06-13 10:21:12 UTC (rev 120178)
@@ -14,13 +14,13 @@
text run at (0,0) width 379: "This tests modifying a selection created with a double click. "
text run at (379,0) width 299: "The new selection should use word granularity."
RenderBlock {P} at (0,34) size 784x54 [color=#008000]
- RenderText {#text} at (0,0) size 771x54
+ RenderText {#text} at (0,0) size 778x54
text run at (0,0) width 224: "This test does not run interactively. "
- text run at (224,0) width 414: "It uses the testRunners eventSender to do mouse clicks. "
- text run at (638,0) width 121: "To run it manually,"
- text run at (0,18) width 365: "double click on the blue 'g', then drag down to the red 'g'. "
- text run at (365,18) width 406: "As you drag, watch the selection that is created, it should always"
- text run at (0,36) width 214: "start and end on word boundaries."
+ text run at (224,0) width 352: "It uses the testRunners eventSender to do mouse clicks. "
+ text run at (576,0) width 202: "To run it manually, double click"
+ text run at (0,18) width 284: "on the blue 'g', then drag down to the red 'g'. "
+ text run at (284,18) width 490: "As you drag, watch the selection that is created, it should always start and end"
+ text run at (0,36) width 130: "on word boundaries."
RenderBlock {DIV} at (0,104) size 784x108
RenderText {#text} at (0,0) size 84x18
text run at (0,0) width 84: "This is a para"
Modified: trunk/LayoutTests/platform/mac/http/tests/misc/location-replace-crossdomain-expected.txt (120177 => 120178)
--- trunk/LayoutTests/platform/mac/http/tests/misc/location-replace-crossdomain-expected.txt 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/LayoutTests/platform/mac/http/tests/misc/location-replace-crossdomain-expected.txt 2012-06-13 10:21:12 UTC (rev 120178)
@@ -12,3 +12,4 @@
RenderText {#text} at (0,0) size 71x18
text run at (0,0) width 71: "SUCCESS"
RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
Modified: trunk/Tools/ChangeLog (120177 => 120178)
--- trunk/Tools/ChangeLog 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/Tools/ChangeLog 2012-06-13 10:21:12 UTC (rev 120178)
@@ -1,3 +1,9 @@
+2012-06-13 Ryosuke Niwa <[email protected]>
+
+ Update the builder name for Apple Lion builders.
+
+ * Scripts/webkitpy/layout_tests/port/builders.py:
+
2012-06-13 Joel Dillon <[email protected]>
[Qt][Win]QtTestBrowser somehow picks up DumpRenderTree's main.cpp, causing a failure to link
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py (120177 => 120178)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2012-06-13 09:52:20 UTC (rev 120177)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2012-06-13 10:21:12 UTC (rev 120178)
@@ -67,7 +67,7 @@
_fuzzy_matches = {
# These builders are on build.webkit.org.
r"SnowLeopard": "mac-snowleopard",
- r"Lion": "mac-lion",
+ r"Apple Lion": "mac-lion",
r"Leopard": "mac-leopard",
r"Windows": "win",
r"GTK": "gtk",
