Changeset 117813 in webkit

Timestamp:

May 21, 2012, 1:52:31 PM (14 years ago)

Author:

rniwa@webkit.org

Message:

isStartOfDocument and isEndOfDocument are poorly named
​https://bugs.webkit.org/show_bug.cgi?id=86649

Reviewed by Levi Weintraub.

Renamed isEndOfDocument to isEndOfEditableOrNonEditableContent because that's what this function checks.

Also added new versions of isStartOfDocument and isEndOfDocument that correctly cross editing boundaries
to be used in selectFrameElementInParentIfFullySelected.

• editing/CompositeEditCommand.cpp:

(WebCore::CompositeEditCommand::moveParagraphContentsToNewBlockIfNecessary):

• editing/Editor.cpp:

(WebCore::Editor::insertLineBreak):
(WebCore::Editor::insertParagraphSeparator):

• editing/ReplaceSelectionCommand.cpp:

(WebCore::ReplaceSelectionCommand::doApply):

• editing/VisibleSelection.cpp:

(WebCore::VisibleSelection::setStartAndEndFromBaseAndExtentRespectingGranularity):

• editing/visible_units.cpp:

(WebCore::isEndOfEditableOrNonEditableContent):

• editing/visible_units.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/CompositeEditCommand.cpp (modified) (1 diff)
• editing/Editor.cpp (modified) (2 diffs)
• editing/ReplaceSelectionCommand.cpp (modified) (1 diff)
• editing/VisibleSelection.cpp (modified) (2 diffs)
• editing/visible_units.cpp (modified) (2 diffs)
• editing/visible_units.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-21  Ryosuke Niwa  <rniwa@webkit.org>
+
+        isStartOfDocument and isEndOfDocument are poorly named
+        https://bugs.webkit.org/show_bug.cgi?id=86649
+
+        Reviewed by Levi Weintraub.
+
+        Renamed isEndOfDocument to isEndOfEditableOrNonEditableContent because that's what this function checks.
+
+        Also added new versions of isStartOfDocument and isEndOfDocument that correctly cross editing boundaries
+        to be used in selectFrameElementInParentIfFullySelected.
+
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::moveParagraphContentsToNewBlockIfNecessary):
+        * editing/Editor.cpp:
+        (WebCore::Editor::insertLineBreak):
+        (WebCore::Editor::insertParagraphSeparator):
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplaceSelectionCommand::doApply):
+        * editing/VisibleSelection.cpp:
+        (WebCore::VisibleSelection::setStartAndEndFromBaseAndExtentRespectingGranularity):
+        * editing/visible_units.cpp:
+        (WebCore::isEndOfEditableOrNonEditableContent):
+        * editing/visible_units.h:
+
 2012-05-21 Anna Cavender  <annacc@chromium.org>
 

trunk/Source/WebCore/editing/CompositeEditCommand.cpp

@@ -930 +930 @@
             ASSERT(upstreamStart.deprecatedNode()->isDescendantOf(enclosingBlock(upstreamEnd.deprecatedNode())));
             return 0;
-        } else if (isEndOfDocument(visibleEnd)) {
-            // At the end of the document. We can bail here as well.
+        } else if (isEndOfEditableOrNonEditableContent(visibleEnd)) {
+            // At the end of the editable region. We can bail here as well.
             return 0;
         }

trunk/Source/WebCore/editing/Editor.cpp

@@ -947 +947 @@
 
     VisiblePosition caret = m_frame->selection()->selection().visibleStart();
-    bool alignToEdge = isEndOfDocument(caret);
+    bool alignToEdge = isEndOfEditableOrNonEditableContent(caret);
     bool autocorrectionIsApplied = m_alternativeTextController->applyAutocorrectionBeforeTypingIfAppropriate();
     TypingCommand::insertLineBreak(m_frame->document(), autocorrectionIsApplied ? TypingCommand::RetainAutocorrectionIndicator : 0);
@@ -967 +967 @@
 
     VisiblePosition caret = m_frame->selection()->selection().visibleStart();
-    bool alignToEdge = isEndOfDocument(caret);
+    bool alignToEdge = isEndOfEditableOrNonEditableContent(caret);
     bool autocorrectionIsApplied = m_alternativeTextController->applyAutocorrectionBeforeTypingIfAppropriate();
     TypingCommand::insertParagraphSeparator(m_frame->document(), autocorrectionIsApplied ? TypingCommand::RetainAutocorrectionIndicator : 0);

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -831 +831 @@
         if (fragment.hasInterchangeNewlineAtStart()) {
             if (isEndOfParagraph(visibleStart) && !isStartOfParagraph(visibleStart)) {
-                if (!isEndOfDocument(visibleStart))
+                if (!isEndOfEditableOrNonEditableContent(visibleStart))
                     setEndingSelection(visibleStart.next());
             } else

trunk/Source/WebCore/editing/VisibleSelection.cpp

@@ -294 +294 @@
             VisiblePosition originalEnd(m_end, m_affinity);
             EWordSide side = RightWordIfOnBoundary;
-            if (isEndOfDocument(start) || (isEndOfLine(start) && !isStartOfLine(start) && !isEndOfParagraph(start)))
+            if (isEndOfEditableOrNonEditableContent(start) || (isEndOfLine(start) && !isStartOfLine(start) && !isEndOfParagraph(start)))
                 side = LeftWordIfOnBoundary;
             m_start = startOfWord(start, side).deepEquivalent();
             side = RightWordIfOnBoundary;
-            if (isEndOfDocument(originalEnd) || (isEndOfLine(originalEnd) && !isStartOfLine(originalEnd) && !isEndOfParagraph(originalEnd)))
+            if (isEndOfEditableOrNonEditableContent(originalEnd) || (isEndOfLine(originalEnd) && !isStartOfLine(originalEnd) && !isEndOfParagraph(originalEnd)))
                 side = LeftWordIfOnBoundary;
                 
@@ -350 +350 @@
         case ParagraphGranularity: {
             VisiblePosition pos(m_start, m_affinity);
-            if (isStartOfLine(pos) && isEndOfDocument(pos))
+            if (isStartOfLine(pos) && isEndOfEditableOrNonEditableContent(pos))
                 pos = pos.previous();
             m_start = startOfParagraph(pos).deepEquivalent();

trunk/Source/WebCore/editing/visible_units.cpp

@@ -1370 +1370 @@
 bool isStartOfDocument(const VisiblePosition &p)
 {
-    return p.isNotNull() && p.previous().isNull();
+    return p.isNotNull() && p.previous(CanCrossEditingBoundary).isNull();
 }
 
 bool isEndOfDocument(const VisiblePosition &p)
 {
-    return p.isNotNull() && p.next().isNull();
+    return p.isNotNull() && p.next(CanCrossEditingBoundary).isNull();
 }
 
@@ -1398 +1398 @@
 }
 
+bool isEndOfEditableOrNonEditableContent(const VisiblePosition &p)
+{
+    return p.isNotNull() && p.next().isNull();
+}
+
 VisiblePosition leftBoundaryOfLine(const VisiblePosition& c, TextDirection direction)
 {

trunk/Source/WebCore/editing/visible_units.h

@@ -95 +95 @@
 VisiblePosition startOfEditableContent(const VisiblePosition&);
 VisiblePosition endOfEditableContent(const VisiblePosition&);
+bool isEndOfEditableOrNonEditableContent(const VisiblePosition&);
 
 } // namespace WebCore