Diff
Modified: trunk/LayoutTests/ChangeLog (90279 => 90280)
--- trunk/LayoutTests/ChangeLog 2011-07-01 21:47:44 UTC (rev 90279)
+++ trunk/LayoutTests/ChangeLog 2011-07-01 22:01:12 UTC (rev 90280)
@@ -1,5 +1,21 @@
2011-07-01 Ryosuke Niwa <[email protected]>
+ Fix expected results after r90275. I checked in Mac-specific results for these tests.
+ Move them to platform/mac and revert the changes in platform-independent results.
+ Also copy results to platform/win because they fallback to Mac by default.
+
+ * editing/deleting/delete-br-011-expected.txt:
+ * editing/selection/anchor-focus2-expected.txt:
+ * editing/selection/anchor-focus3-expected.txt:
+ * platform/mac/editing/deleting/delete-br-011-expected.txt: Copied from LayoutTests/editing/deleting/delete-br-011-expected.txt.
+ * platform/mac/editing/selection/anchor-focus2-expected.txt: Copied from LayoutTests/editing/selection/anchor-focus2-expected.txt.
+ * platform/mac/editing/selection/anchor-focus3-expected.txt: Copied from LayoutTests/editing/selection/anchor-focus3-expected.txt.
+ * platform/win/editing/deleting/delete-br-011-expected.txt: Copied from LayoutTests/editing/deleting/delete-br-011-expected.txt.
+ * platform/win/editing/selection/anchor-focus2-expected.txt: Copied from LayoutTests/editing/selection/anchor-focus2-expected.txt.
+ * platform/win/editing/selection/anchor-focus3-expected.txt: Copied from LayoutTests/editing/selection/anchor-focus3-expected.txt.
+
+2011-07-01 Ryosuke Niwa <[email protected]>
+
Reviewed by Ojan Vafai.
Move m_isDirectional from FrameSelection to VisibleSelection
Modified: trunk/LayoutTests/editing/deleting/delete-br-011-expected.txt (90279 => 90280)
--- trunk/LayoutTests/editing/deleting/delete-br-011-expected.txt 2011-07-01 21:47:44 UTC (rev 90279)
+++ trunk/LayoutTests/editing/deleting/delete-br-011-expected.txt 2011-07-01 22:01:12 UTC (rev 90280)
@@ -2,10 +2,6 @@
EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BODY > HTML > #document to 2 of BODY > HTML > #document
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
Modified: trunk/LayoutTests/editing/selection/anchor-focus2-expected.txt (90279 => 90280)
--- trunk/LayoutTests/editing/selection/anchor-focus2-expected.txt 2011-07-01 21:47:44 UTC (rev 90279)
+++ trunk/LayoutTests/editing/selection/anchor-focus2-expected.txt 2011-07-01 22:01:12 UTC (rev 90280)
@@ -1,6 +1,5 @@
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
This tests the anchorNode, anchorOffset, focusNode and focusOffset properties of the Selection object. These properties are part of Mozilla's Selection object API, and so their values should be consistent in both browsers.
Modified: trunk/LayoutTests/editing/selection/anchor-focus3-expected.txt (90279 => 90280)
--- trunk/LayoutTests/editing/selection/anchor-focus3-expected.txt 2011-07-01 21:47:44 UTC (rev 90279)
+++ trunk/LayoutTests/editing/selection/anchor-focus3-expected.txt 2011-07-01 22:01:12 UTC (rev 90280)
@@ -1,6 +1,5 @@
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
This tests the anchorNode, anchorOffset, focusNode and focusOffset properties of the Selection object. These properties are part of Mozilla's Selection object API, and so their values should be consistent in both browsers.
Copied: trunk/LayoutTests/platform/mac/editing/deleting/delete-br-011-expected.txt (from rev 90276, trunk/LayoutTests/editing/deleting/delete-br-011-expected.txt) (0 => 90280)
--- trunk/LayoutTests/platform/mac/editing/deleting/delete-br-011-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/editing/deleting/delete-br-011-expected.txt 2011-07-01 22:01:12 UTC (rev 90280)
@@ -0,0 +1,36 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 4 of BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BODY > HTML > #document to 2 of BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+rdar://problem/4065343 Mail: Deleting a line sometimes makes the insertion point jump to the top of the message.
+
+before deletion:
+| "hello"
+| <div>
+| class="editing"
+| id="test"
+| <#selection-caret>
+| <br>
+| <br>
+| "
+"
+
+after deletion:
+| "hello"
+| <div>
+| class="editing"
+| id="test"
+| <#selection-caret>
+| <br>
+| "
+"
Copied: trunk/LayoutTests/platform/mac/editing/selection/anchor-focus2-expected.txt (from rev 90276, trunk/LayoutTests/editing/selection/anchor-focus2-expected.txt) (0 => 90280)
--- trunk/LayoutTests/platform/mac/editing/selection/anchor-focus2-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/editing/selection/anchor-focus2-expected.txt 2011-07-01 22:01:12 UTC (rev 90280)
@@ -0,0 +1,11 @@
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+This tests the anchorNode, anchorOffset, focusNode and focusOffset properties of the Selection object. These properties are part of Mozilla's Selection object API, and so their values should be consistent in both browsers.
+
+
+text
+Anchor ([object Text], 0) is correct.
+Focus ([object Text], 4) is correct.
Copied: trunk/LayoutTests/platform/mac/editing/selection/anchor-focus3-expected.txt (from rev 90276, trunk/LayoutTests/editing/selection/anchor-focus3-expected.txt) (0 => 90280)
--- trunk/LayoutTests/platform/mac/editing/selection/anchor-focus3-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/editing/selection/anchor-focus3-expected.txt 2011-07-01 22:01:12 UTC (rev 90280)
@@ -0,0 +1,11 @@
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+This tests the anchorNode, anchorOffset, focusNode and focusOffset properties of the Selection object. These properties are part of Mozilla's Selection object API, and so their values should be consistent in both browsers.
+
+
+text
+Anchor ([object Text], 4) is correct.
+Focus ([object Text], 0) is correct.
Copied: trunk/LayoutTests/platform/win/editing/deleting/delete-br-011-expected.txt (from rev 90276, trunk/LayoutTests/editing/deleting/delete-br-011-expected.txt) (0 => 90280)
--- trunk/LayoutTests/platform/win/editing/deleting/delete-br-011-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/editing/deleting/delete-br-011-expected.txt 2011-07-01 22:01:12 UTC (rev 90280)
@@ -0,0 +1,32 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 4 of BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BODY > HTML > #document to 2 of BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+rdar://problem/4065343 Mail: Deleting a line sometimes makes the insertion point jump to the top of the message.
+
+before deletion:
+| "hello"
+| <div>
+| class="editing"
+| id="test"
+| <#selection-caret>
+| <br>
+| <br>
+| "
+"
+
+after deletion:
+| "hello"
+| <div>
+| class="editing"
+| id="test"
+| <#selection-caret>
+| <br>
+| "
+"
Copied: trunk/LayoutTests/platform/win/editing/selection/anchor-focus2-expected.txt (from rev 90276, trunk/LayoutTests/editing/selection/anchor-focus2-expected.txt) (0 => 90280)
--- trunk/LayoutTests/platform/win/editing/selection/anchor-focus2-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/editing/selection/anchor-focus2-expected.txt 2011-07-01 22:01:12 UTC (rev 90280)
@@ -0,0 +1,10 @@
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+This tests the anchorNode, anchorOffset, focusNode and focusOffset properties of the Selection object. These properties are part of Mozilla's Selection object API, and so their values should be consistent in both browsers.
+
+
+text
+Anchor ([object Text], 0) is correct.
+Focus ([object Text], 4) is correct.
Copied: trunk/LayoutTests/platform/win/editing/selection/anchor-focus3-expected.txt (from rev 90276, trunk/LayoutTests/editing/selection/anchor-focus3-expected.txt) (0 => 90280)
--- trunk/LayoutTests/platform/win/editing/selection/anchor-focus3-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/editing/selection/anchor-focus3-expected.txt 2011-07-01 22:01:12 UTC (rev 90280)
@@ -0,0 +1,10 @@
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+This tests the anchorNode, anchorOffset, focusNode and focusOffset properties of the Selection object. These properties are part of Mozilla's Selection object API, and so their values should be consistent in both browsers.
+
+
+text
+Anchor ([object Text], 4) is correct.
+Focus ([object Text], 0) is correct.