Changeset 154943 in webkit

Timestamp:

Sep 1, 2013 7:57:23 AM (11 years ago)

Author:

akling@apple.com

Message:

Give EditCommand a protected Frame& getter.
<​https://webkit.org/b/120574>

Reviewed by Darin Adler.

EditCommand is only created for documents that are attached to a Frame,
we already ASSERTed as much in the EditCommand constructor.

This patch adds a "Frame& EditCommand::frame()" helper, so EditCommand
and its subclasses don't have to fumble around with pointers.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/CompositeEditCommand.cpp (modified) (4 diffs)
• editing/DeleteSelectionCommand.cpp (modified) (4 diffs)
• editing/EditCommand.cpp (modified) (1 diff)
• editing/EditCommand.h (modified) (2 diffs)
• editing/InsertLineBreakCommand.cpp (modified) (1 diff)
• editing/InsertTextCommand.cpp (modified) (2 diffs)
• editing/RemoveFormatCommand.cpp (modified) (1 diff)
• editing/ReplaceSelectionCommand.cpp (modified) (1 diff)
• editing/SetSelectionCommand.cpp (modified) (2 diffs)
• editing/SpellingCorrectionCommand.cpp (modified) (2 diffs)
• editing/TypingCommand.cpp (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-01  Andreas Kling  <akling@apple.com>
+
+        Give EditCommand a protected Frame& getter.
+        <https://webkit.org/b/120574>
+
+        Reviewed by Darin Adler.
+
+        EditCommand is only created for documents that are attached to a Frame,
+        we already ASSERTed as much in the EditCommand constructor.
+
+        This patch adds a "Frame& EditCommand::frame()" helper, so EditCommand
+        and its subclasses don't have to fumble around with pointers.
+
 2013-08-31  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/editing/CompositeEditCommand.cpp

@@ -206 +206 @@
     document().updateLayoutIgnorePendingStylesheets();
 
-    Frame* frame = document().frame();
-    ASSERT(frame);
     {
         EventQueueScope scope;
 #if ENABLE(DELETION_UI)
-        DeleteButtonControllerDisableScope deleteButtonControllerDisableScope(frame);
+        DeleteButtonControllerDisableScope deleteButtonControllerDisableScope(&frame());
 #endif
         doApply();
@@ -219 +217 @@
     // and TypingCommands do it on their own (see TypingCommand::typingAddedToOpenCommand).
     if (!isTypingCommand())
-        frame->editor().appliedEditing(this);
+        frame().editor().appliedEditing(this);
     setShouldRetainAutocorrectionIndicator(false);
 }
@@ -1217 +1215 @@
     
     setEndingSelection(VisibleSelection(start, end, DOWNSTREAM));
-    document().frame()->editor().clearMisspellingsAndBadGrammar(endingSelection());
+    frame().editor().clearMisspellingsAndBadGrammar(endingSelection());
     deleteSelection(false, false, false, false);
 
@@ -1250 +1248 @@
     applyCommandToComposite(ReplaceSelectionCommand::create(document(), fragment, options));
 
-    document().frame()->editor().markMisspellingsAndBadGrammar(endingSelection());
+    frame().editor().markMisspellingsAndBadGrammar(endingSelection());
 
     // If the selection is in an empty paragraph, restore styles from the old empty paragraph to the new empty paragraph.

trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp

@@ -656 +656 @@
     RefPtr<Range> range = Range::create(&document(), startOfParagraphToMove.deepEquivalent().parentAnchoredEquivalent(), endOfParagraphToMove.deepEquivalent().parentAnchoredEquivalent());
     RefPtr<Range> rangeToBeReplaced = Range::create(&document(), mergeDestination.deepEquivalent().parentAnchoredEquivalent(), mergeDestination.deepEquivalent().parentAnchoredEquivalent());
-    if (!document().frame()->editor().client()->shouldMoveRangeAfterDelete(range.get(), rangeToBeReplaced.get()))
+    if (!frame().editor().client()->shouldMoveRangeAfterDelete(range.get(), rangeToBeReplaced.get()))
         return;
     
@@ -729 +729 @@
     // but, if we change the selection, come back and start typing that style should be lost.  Also see 
     // preserveTypingStyle() below.
-    document().frame()->selection().setTypingStyle(m_typingStyle);
+    frame().selection().setTypingStyle(m_typingStyle);
 }
 
@@ -802 +802 @@
         Element* textControl = enclosingTextFormControl(m_selectionToDelete.start());
         if (textControl && textControl->focused())
-            document().frame()->editor().textWillBeDeletedInTextField(textControl);
+            frame().editor().textWillBeDeletedInTextField(textControl);
     }
 
@@ -860 +860 @@
     calculateTypingStyleAfterDelete();
 
-    if (!originalString.isEmpty()) {
-        if (Frame* frame = document().frame())
-            frame->editor().deletedAutocorrectionAtPosition(m_endingPosition, originalString);
-    }
+    if (!originalString.isEmpty())
+        frame().editor().deletedAutocorrectionAtPosition(m_endingPosition, originalString);
 
     setEndingSelection(VisibleSelection(m_endingPosition, affinity, endingSelection().isDirectional()));

trunk/Source/WebCore/editing/EditCommand.cpp

@@ -62 +62 @@
 }
 
+Frame& EditCommand::frame() const
+{
+    ASSERT(document().frame());
+    return *document().frame();
+}
+
 EditAction EditCommand::editingAction() const
 {

trunk/Source/WebCore/editing/EditCommand.h

@@ -39 +39 @@
 class Document;
 class Element;
+class Frame;
 
 class EditCommand : public RefCounted<EditCommand> {
@@ -62 +63 @@
     EditCommand(Document&, const VisibleSelection&, const VisibleSelection&);
 
+    Frame& frame() const;
     Document& document() const { return *m_document; }
     CompositeEditCommand* parent() const { return m_parent; }

trunk/Source/WebCore/editing/InsertLineBreakCommand.cpp

@@ -168 +168 @@
     // Handle the case where there is a typing style.
 
-    RefPtr<EditingStyle> typingStyle = document().frame()->selection().typingStyle();
+    RefPtr<EditingStyle> typingStyle = frame().selection().typingStyle();
 
     if (typingStyle && !typingStyle->isEmpty()) {

trunk/Source/WebCore/editing/InsertTextCommand.cpp

@@ -147 +147 @@
         if (endingSelection().isNone())
             return;
-    } else if (document().frame()->editor().isOverwriteModeEnabled()) {
+    } else if (frame().editor().isOverwriteModeEnabled()) {
         if (performOverwrite(m_text, m_selectInsertedText))
             return;
@@ -223 +223 @@
 
     // Handle the case where there is a typing style.
-    if (RefPtr<EditingStyle> typingStyle = document().frame()->selection().typingStyle()) {
+    if (RefPtr<EditingStyle> typingStyle = frame().selection().typingStyle()) {
         typingStyle->prepareToApplyAt(endPosition, EditingStyle::PreserveWritingDirection);
         if (!typingStyle->isEmpty())

trunk/Source/WebCore/editing/RemoveFormatCommand.cpp

@@ -80 +80 @@
 void RemoveFormatCommand::doApply()
 {
-    Frame* frame = document().frame();
-
-    if (!frame->selection().selection().isNonOrphanedCaretOrRange())
+    if (!frame().selection().selection().isNonOrphanedCaretOrRange())
         return;
 
     // Get the default style for this editable root, it's the style that we'll give the
     // content that we're operating on.
-    Node* root = frame->selection().rootEditableElement();
+    Node* root = frame().selection().rootEditableElement();
     RefPtr<EditingStyle> defaultStyle = EditingStyle::create(root);
 

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -1013 +1013 @@
     // FIXME: Can this wait until after the operation has been performed?  There doesn't seem to be
     // any work performed after this that queries or uses the typing style.
-    if (Frame* frame = document().frame())
-        frame->selection().clearTypingStyle();
+    frame().selection().clearTypingStyle();
 
     removeHeadContents(fragment);

trunk/Source/WebCore/editing/SetSelectionCommand.cpp

@@ -41 +41 @@
 void SetSelectionCommand::doApply()
 {
-    FrameSelection& selection = document().frame()->selection();
+    FrameSelection& selection = frame().selection();
 
     if (selection.shouldChangeSelection(m_selectionToSet) && m_selectionToSet.isNonOrphanedCaretOrRange()) {
@@ -51 +51 @@
 void SetSelectionCommand::doUnapply()
 {
-    FrameSelection& selection = document().frame()->selection();
+    FrameSelection& selection = frame().selection();
 
     if (selection.shouldChangeSelection(startingSelection()) && startingSelection().isNonOrphanedCaretOrRange())

trunk/Source/WebCore/editing/SpellingCorrectionCommand.cpp

@@ -64 +64 @@
     {
         if (!m_hasBeenUndone) {
-            document().frame()->editor().unappliedSpellCorrection(startingSelection(), m_corrected, m_correction);
+            frame().editor().unappliedSpellCorrection(startingSelection(), m_corrected, m_correction);
             m_hasBeenUndone = true;
         }
@@ -96 +96 @@
         return;
 
-    if (!document().frame()->selection().shouldChangeSelection(m_selectionToBeCorrected))
+    if (!frame().selection().shouldChangeSelection(m_selectionToBeCorrected))
         return;
 

trunk/Source/WebCore/editing/TypingCommand.cpp

@@ -294 +294 @@
 void TypingCommand::markMisspellingsAfterTyping(ETypingCommand commandType)
 {
-    Frame* frame = document().frame();
-    if (!frame)
-        return;
+    Frame& frame = this->frame();
 
 #if PLATFORM(MAC)
-    if (!frame->editor().isContinuousSpellCheckingEnabled()
-        && !frame->editor().isAutomaticQuoteSubstitutionEnabled()
-        && !frame->editor().isAutomaticLinkDetectionEnabled()
-        && !frame->editor().isAutomaticDashSubstitutionEnabled()
-        && !frame->editor().isAutomaticTextReplacementEnabled())
+    if (!frame.editor().isContinuousSpellCheckingEnabled()
+        && !frame.editor().isAutomaticQuoteSubstitutionEnabled()
+        && !frame.editor().isAutomaticLinkDetectionEnabled()
+        && !frame.editor().isAutomaticDashSubstitutionEnabled()
+        && !frame.editor().isAutomaticTextReplacementEnabled())
             return;
 #else
-    if (!frame->editor().isContinuousSpellCheckingEnabled())
+    if (!frame.editor().isContinuousSpellCheckingEnabled())
         return;
 #endif
@@ -323 +321 @@
             if (range && (commandType == TypingCommand::InsertText || commandType == TypingCommand::InsertLineBreak || commandType == TypingCommand::InsertParagraphSeparator || commandType == TypingCommand::InsertParagraphSeparatorInQuotedContent))
                 strippedPreviousWord = plainText(range.get()).stripWhiteSpace();
-            frame->editor().markMisspellingsAfterTypingToWord(p1, endingSelection(), !strippedPreviousWord.isEmpty());
+            frame.editor().markMisspellingsAfterTypingToWord(p1, endingSelection(), !strippedPreviousWord.isEmpty());
         } else if (commandType == TypingCommand::InsertText)
-            frame->editor().startAlternativeTextUITimer();
+            frame.editor().startAlternativeTextUITimer();
     }
 }
@@ -331 +329 @@
 void TypingCommand::typingAddedToOpenCommand(ETypingCommand commandTypeForAddedTyping)
 {
-    Frame* frame = document().frame();
-    if (!frame)
-        return;
+    Frame& frame = this->frame();
 
     updatePreservesTypingStyle(commandTypeForAddedTyping);
 
 #if PLATFORM(MAC)
-    frame->editor().appliedEditing(this);
+    frame.editor().appliedEditing(this);
     // Since the spellchecking code may also perform corrections and other replacements, it should happen after the typing changes.
     if (!m_shouldPreventSpellChecking)
@@ -345 +341 @@
     // The old spellchecking code requires that checking be done first, to prevent issues like that in 6864072, where <doesn't> is marked as misspelled.
     markMisspellingsAfterTyping(commandTypeForAddedTyping);
-    frame->editor().appliedEditing(this);
+    frame.editor().appliedEditing(this);
 #endif
 }
@@ -424 +420 @@
 void TypingCommand::deleteKeyPressed(TextGranularity granularity, bool killRing)
 {
-    Frame* frame = document().frame();
-    if (!frame)
-        return;
-
-    frame->editor().updateMarkersForWordsAffectedByEditing(false);
+    Frame& frame = this->frame();
+
+    frame.editor().updateMarkersForWordsAffectedByEditing(false);
 
     VisibleSelection selectionToDelete;
@@ -511 +505 @@
         return;
     
-    if (selectionToDelete.isCaret() || !frame->selection().shouldDeleteSelection(selectionToDelete))
+    if (selectionToDelete.isCaret() || !frame.selection().shouldDeleteSelection(selectionToDelete))
         return;
     
     if (killRing)
-        frame->editor().addToKillRing(selectionToDelete.toNormalizedRange().get(), false);
+        frame.editor().addToKillRing(selectionToDelete.toNormalizedRange().get(), false);
     // Make undo select everything that has been deleted, unless an undo will undo more than just this deletion.
     // FIXME: This behaves like TextEdit except for the case where you open with text insertion and then delete
@@ -528 +522 @@
 void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity, bool killRing)
 {
-    Frame* frame = document().frame();
-    if (!frame)
-        return;
-
-    frame->editor().updateMarkersForWordsAffectedByEditing(false);
+    Frame& frame = this->frame();
+
+    frame.editor().updateMarkersForWordsAffectedByEditing(false);
 
     VisibleSelection selectionToDelete;
@@ -604 +596 @@
         return;
     
-    if (selectionToDelete.isCaret() || !frame->selection().shouldDeleteSelection(selectionToDelete))
+    if (selectionToDelete.isCaret() || !frame.selection().shouldDeleteSelection(selectionToDelete))
         return;
         
     if (killRing)
-        frame->editor().addToKillRing(selectionToDelete.toNormalizedRange().get(), false);
+        frame.editor().addToKillRing(selectionToDelete.toNormalizedRange().get(), false);
     // make undo select what was deleted
     setStartingSelection(selectionAfterUndo);