Changeset 121318 in webkit

Timestamp:

Jun 26, 2012, 9:03:04 PM (14 years ago)

Author:

rniwa@webkit.org

Message:

Rebaseline after r121286 and r121290.

• editing/deleting/merge-into-empty-block-2-expected.txt:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• editing/deleting/merge-into-empty-block-2-expected.txt (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-26  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Rebaseline after r121286 and r121290.
+
+        * editing/deleting/merge-into-empty-block-2-expected.txt:
+
 2012-06-26  Keishi Hattori  <keishi@webkit.org>
 

trunk/LayoutTests/editing/deleting/merge-into-empty-block-2-expected.txt

@@ -5 +5 @@
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-CONSOLE MESSAGE: line 13: ReferenceError: Can't find variable: Markup
-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 784x576
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 731x18
-          text run at (0,0) width 731: "When a user puts the caret at the very beginning a list and hits delete into an empty line, the list should just move up."
-      RenderBlock {DIV} at (0,34) size 784x18
-        RenderBlock {UL} at (0,0) size 784x18
-          RenderListItem {LI} at (40,0) size 744x18
-            RenderListMarker at (-17,0) size 7x18: bullet
-            RenderInline {SPAN} at (0,0) size 21x18
-              RenderText {#text} at (0,0) size 21x18
-                text run at (0,0) width 21: "foo"
-caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of body
+EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
+When a user puts the caret at the very beginning a list and hits delete into an empty line, the list should just move up.
+| <ul>
+|   <li>
+|     <span>
+|       id="test"
+|       "<#selection-caret>foo"