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.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154943 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/editing/DeleteSelectionCommand.cpp b/Source/WebCore/editing/DeleteSelectionCommand.cpp
index c6f7170..1e6e770 100644
--- a/Source/WebCore/editing/DeleteSelectionCommand.cpp
+++ b/Source/WebCore/editing/DeleteSelectionCommand.cpp
@@ -655,7 +655,7 @@
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;
// moveParagraphs will insert placeholders if it removes blocks that would require their use, don't let block
@@ -728,7 +728,7 @@
// In this case if we start typing, the new characters should have the same style as the just deleted ones,
// 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);
}
void DeleteSelectionCommand::clearTransientState()
@@ -801,7 +801,7 @@
if (!m_replace) {
Element* textControl = enclosingTextFormControl(m_selectionToDelete.start());
if (textControl && textControl->focused())
- document().frame()->editor().textWillBeDeletedInTextField(textControl);
+ frame().editor().textWillBeDeletedInTextField(textControl);
}
// save this to later make the selection with
@@ -859,10 +859,8 @@
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()));
clearTransientState();
