Modified: branches/safari-536-branch/LayoutTests/ChangeLog (118276 => 118277)
--- branches/safari-536-branch/LayoutTests/ChangeLog 2012-05-24 00:15:14 UTC (rev 118276)
+++ branches/safari-536-branch/LayoutTests/ChangeLog 2012-05-24 00:15:48 UTC (rev 118277)
@@ -1,5 +1,11 @@
2012-05-23 Jessie Berlin <[email protected]>
+ Finish rolling r116340 into the 536 branch.
+
+ * platform/mac-wk2/editing/selection/select-across-readonly-input-1-expected.txt: Removed.
+
+2012-05-23 Jessie Berlin <[email protected]>
+
Skip more CSS Regions related tests on the 536 branch.
* platform/mac/Skipped:
Deleted: branches/safari-536-branch/LayoutTests/platform/mac-wk2/editing/selection/select-across-readonly-input-1-expected.txt (118276 => 118277)
--- branches/safari-536-branch/LayoutTests/platform/mac-wk2/editing/selection/select-across-readonly-input-1-expected.txt 2012-05-24 00:15:14 UTC (rev 118276)
+++ branches/safari-536-branch/LayoutTests/platform/mac-wk2/editing/selection/select-across-readonly-input-1-expected.txt 2012-05-24 00:15:48 UTC (rev 118277)
@@ -1,26 +0,0 @@
-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 784x584
- RenderBlock {P} at (0,0) size 784x36
- RenderText {#text} at (0,0) size 776x36
- text run at (0,0) width 776: "This test ensures selection that crosses the shadow DOM boundary of a readonly input element cannot be made by a mouse"
- text run at (0,18) width 32: "drag."
- RenderBlock {P} at (0,52) size 784x36
- RenderText {#text} at (0,0) size 774x36
- text run at (0,0) width 774: "To manually test, select text by a mouse drag starting in \"hello\" and ending in \"world\". Selection should only extend inside"
- text run at (0,18) width 112: "the input element."
- RenderBlock {DIV} at (0,104) size 784x28
- RenderTextControl {INPUT} at (0,2) size 59x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (59,6) size 4x18
- text run at (59,6) width 4: " "
- RenderInline {SPAN} at (0,0) size 37x18
- RenderText {#text} at (63,6) size 37x18
- text run at (63,6) width 37: "world"
- RenderText {#text} at (0,0) size 0x0
-layer at (11,117) size 53x18
- RenderBlock {DIV} at (3,3) size 53x18
- RenderText {#text} at (1,0) size 38x18
- text run at (1,0) width 38: "hello"
-caret: position 3 of child 0 {#text} of child 0 {DIV} of {#shadow-root} of child 1 {INPUT} of child 5 {DIV} of body
