Move Frame to the Oilpan heap.

Source/core/editing/Editor.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 84 matching lines @@
     : m_editor(editor)
 {
     ++m_editor->m_preventRevealSelection;
 }
 
 Editor::RevealSelectionScope::~RevealSelectionScope()
 {
     ASSERT(m_editor->m_preventRevealSelection);
     --m_editor->m_preventRevealSelection;
     if (!m_editor->m_preventRevealSelection)
-        m_editor->m_frame.selection().revealSelection(ScrollAlignment::alignToEdgeIfNeeded, RevealExtent);
+        m_editor->m_frame->selection().revealSelection(ScrollAlignment::alignToEdgeIfNeeded, RevealExtent);

[haraken, 2014/09/08 07:25:57]

It looks better to use frame().foo than m_frame->foo. The same comment for other
parts of this CL.

[sof, 2014/09/08 21:17:45]

Yes; switched over throughout.

 }
 
 // When an event handler has moved the selection outside of a text control
 // we should use the target control's selection for this editing operation.
 VisibleSelection Editor::selectionForCommand(Event* event)
 {
-    VisibleSelection selection = m_frame.selection().selection();
+    VisibleSelection selection = m_frame->selection().selection();
     if (!event)
         return selection;
     // If the target is a text control, and the current selection is outside of its shadow tree,
     // then use the saved selection for that text control.
     HTMLTextFormControlElement* textFormControlOfSelectionStart = enclosingTextFormControl(selection.start());
     HTMLTextFormControlElement* textFromControlOfTarget = isHTMLTextFormControlElement(*event->target()->toNode()) ? toHTMLTextFormControlElement(event->target()->toNode()) : 0;
     if (textFromControlOfTarget && (selection.start().isNull() || textFromControlOfTarget != textFormControlOfSelectionStart)) {
         if (RefPtrWillBeRawPtr<Range> range = textFromControlOfTarget->selection())
             return VisibleSelection(range.get(), DOWNSTREAM, selection.isDirectional());
     }
     return selection;
 }
 
 // Function considers Mac editing behavior a fallback when Page or Settings is not available.
 EditingBehavior Editor::behavior() const
 {
-    if (!m_frame.settings())
+    if (!m_frame->settings())
         return EditingBehavior(EditingMacBehavior);
 
-    return EditingBehavior(m_frame.settings()->editingBehaviorType());
+    return EditingBehavior(m_frame->settings()->editingBehaviorType());
 }
 
 static EditorClient& emptyEditorClient()
 {
     DEFINE_STATIC_LOCAL(EmptyEditorClient, client, ());
     return client;
 }
 
 EditorClient& Editor::client() const
 {
-    if (Page* page = m_frame.page())
+    if (Page* page = m_frame->page())
         return page->editorClient();
     return emptyEditorClient();
 }
 
 UndoStack* Editor::undoStack() const
 {
-    if (Page* page = m_frame.page())
+    if (Page* page = m_frame->page())
         return &page->undoStack();
     return 0;
 }
 
 bool Editor::handleTextEvent(TextEvent* event)
 {
     // Default event handling for Drag and Drop will be handled by DragController
     // so we leave the event for it.
     if (event->isDrop())
         return false;
@@ skipping 11 matching lines @@
         if (event->isLineBreak())
             return insertLineBreak();
         return insertParagraphSeparator();
     }
 
     return insertTextWithoutSendingTextEvent(data, false, event);
 }
 
 bool Editor::canEdit() const
 {
-    return m_frame.selection().rootEditableElement();
+    return m_frame->selection().rootEditableElement();
 }
 
 bool Editor::canEditRichly() const
 {
-    return m_frame.selection().isContentRichlyEditable();
+    return m_frame->selection().isContentRichlyEditable();
 }
 
 // WinIE uses onbeforecut and onbeforepaste to enables the cut and paste menu items. They
 // also send onbeforecopy, apparently for symmetry, but it doesn't affect the menu items.
 // We need to use onbeforecopy as a real menu enabler because we allow elements that are not
 // normally selectable to implement copy/paste (like divs, or a document body).
 
 bool Editor::canDHTMLCut()
 {
-    return !m_frame.selection().isInPasswordField() && !dispatchCPPEvent(EventTypeNames::beforecut, DataTransferNumb);
+    return !m_frame->selection().isInPasswordField() && !dispatchCPPEvent(EventTypeNames::beforecut, DataTransferNumb);
 }
 
 bool Editor::canDHTMLCopy()
 {
-    return !m_frame.selection().isInPasswordField() && !dispatchCPPEvent(EventTypeNames::beforecopy, DataTransferNumb);
+    return !m_frame->selection().isInPasswordField() && !dispatchCPPEvent(EventTypeNames::beforecopy, DataTransferNumb);
 }
 
 bool Editor::canDHTMLPaste()
 {
     return !dispatchCPPEvent(EventTypeNames::beforepaste, DataTransferNumb);
 }
 
 bool Editor::canCut() const
 {
     return canCopy() && canDelete();
@@ skipping 11 matching lines @@
         return 0;
 
     Node* node = body->firstChild();
     if (!isHTMLImageElement(node))
         return 0;
     return toHTMLImageElement(node);
 }
 
 bool Editor::canCopy() const
 {
-    if (imageElementFromImageDocument(m_frame.document()))
+    if (imageElementFromImageDocument(m_frame->document()))
         return true;
-    FrameSelection& selection = m_frame.selection();
+    FrameSelection& selection = m_frame->selection();
     return selection.isRange() && !selection.isInPasswordField();
 }
 
 bool Editor::canPaste() const
 {
     return canEdit();
 }
 
 bool Editor::canDelete() const
 {
-    FrameSelection& selection = m_frame.selection();
+    FrameSelection& selection = m_frame->selection();
     return selection.isRange() && selection.rootEditableElement();
 }
 
 bool Editor::canDeleteRange(Range* range) const
 {
     Node* startContainer = range->startContainer();
     Node* endContainer = range->endContainer();
     if (!startContainer || !endContainer)
         return false;
 
     if (!startContainer->hasEditableStyle() || !endContainer->hasEditableStyle())
         return false;
 
     if (range->collapsed()) {
         VisiblePosition start(range->startPosition(), DOWNSTREAM);
         VisiblePosition previous = start.previous();
         // FIXME: We sometimes allow deletions at the start of editable roots, like when the caret is in an empty list item.
         if (previous.isNull() || previous.deepEquivalent().deprecatedNode()->rootEditableElement() != startContainer->rootEditableElement())
             return false;
     }
     return true;
 }
 
 bool Editor::smartInsertDeleteEnabled() const
 {
-    if (Settings* settings = m_frame.settings())
+    if (Settings* settings = m_frame->settings())
         return settings->smartInsertDeleteEnabled();
     return false;
 }
 
 bool Editor::canSmartCopyOrDelete() const
 {
-    return smartInsertDeleteEnabled() && m_frame.selection().granularity() == WordGranularity;
+    return smartInsertDeleteEnabled() && m_frame->selection().granularity() == WordGranularity;
 }
 
 bool Editor::isSelectTrailingWhitespaceEnabled() const
 {
-    if (Settings* settings = m_frame.settings())
+    if (Settings* settings = m_frame->settings())
         return settings->selectTrailingWhitespaceEnabled();
     return false;
 }
 
 bool Editor::deleteWithDirection(SelectionDirection direction, TextGranularity granularity, bool killRing, bool isTypingAction)
 {
     if (!canEdit())
         return false;
 
-    if (m_frame.selection().isRange()) {
+    if (m_frame->selection().isRange()) {
         if (isTypingAction) {
-            ASSERT(m_frame.document());
-            TypingCommand::deleteKeyPressed(*m_frame.document(), canSmartCopyOrDelete() ? TypingCommand::SmartDelete : 0, granularity);
+            ASSERT(m_frame->document());
+            TypingCommand::deleteKeyPressed(*m_frame->document(), canSmartCopyOrDelete() ? TypingCommand::SmartDelete : 0, granularity);
             revealSelectionAfterEditingOperation();
         } else {
             if (killRing)
                 addToKillRing(selectedRange().get(), false);
             deleteSelectionWithSmartDelete(canSmartCopyOrDelete());
             // Implicitly calls revealSelectionAfterEditingOperation().
         }
     } else {
         TypingCommand::Options options = 0;
         if (canSmartCopyOrDelete())
             options |= TypingCommand::SmartDelete;
         if (killRing)
             options |= TypingCommand::KillRing;
         switch (direction) {
         case DirectionForward:
         case DirectionRight:
-            ASSERT(m_frame.document());
-            TypingCommand::forwardDeleteKeyPressed(*m_frame.document(), options, granularity);
+            ASSERT(m_frame->document());
+            TypingCommand::forwardDeleteKeyPressed(*m_frame->document(), options, granularity);
             break;
         case DirectionBackward:
         case DirectionLeft:
-            ASSERT(m_frame.document());
-            TypingCommand::deleteKeyPressed(*m_frame.document(), options, granularity);
+            ASSERT(m_frame->document());
+            TypingCommand::deleteKeyPressed(*m_frame->document(), options, granularity);
             break;
         }
         revealSelectionAfterEditingOperation();
     }
 
     // FIXME: We should to move this down into deleteKeyPressed.
     // clear the "start new kill ring sequence" setting, because it was set to true
     // when the selection was updated by deleting the range
     if (killRing)
         setStartNewKillRingSequence(false);
 
     return true;
 }
 
 void Editor::deleteSelectionWithSmartDelete(bool smartDelete)
 {
-    if (m_frame.selection().isNone())
+    if (m_frame->selection().isNone())
         return;
 
-    ASSERT(m_frame.document());
-    DeleteSelectionCommand::create(*m_frame.document(), smartDelete)->apply();
+    ASSERT(m_frame->document());
+    DeleteSelectionCommand::create(*m_frame->document(), smartDelete)->apply();
 }
 
 void Editor::pasteAsPlainText(const String& pastingText, bool smartReplace)
 {
     Element* target = findEventTargetFromSelection();
     if (!target)
         return;
-    target->dispatchEvent(TextEvent::createForPlainTextPaste(m_frame.domWindow(), pastingText, smartReplace), IGNORE_EXCEPTION);
+    target->dispatchEvent(TextEvent::createForPlainTextPaste(m_frame->domWindow(), pastingText, smartReplace), IGNORE_EXCEPTION);
 }
 
 void Editor::pasteAsFragment(PassRefPtrWillBeRawPtr<DocumentFragment> pastingFragment, bool smartReplace, bool matchStyle)
 {
     Element* target = findEventTargetFromSelection();
     if (!target)
         return;
-    target->dispatchEvent(TextEvent::createForFragmentPaste(m_frame.domWindow(), pastingFragment, smartReplace, matchStyle), IGNORE_EXCEPTION);
+    target->dispatchEvent(TextEvent::createForFragmentPaste(m_frame->domWindow(), pastingFragment, smartReplace, matchStyle), IGNORE_EXCEPTION);
 }
 
 bool Editor::tryDHTMLCopy()
 {
-    if (m_frame.selection().isInPasswordField())
+    if (m_frame->selection().isInPasswordField())
         return false;
 
     return !dispatchCPPEvent(EventTypeNames::copy, DataTransferWritable);
 }
 
 bool Editor::tryDHTMLCut()
 {
-    if (m_frame.selection().isInPasswordField())
+    if (m_frame->selection().isInPasswordField())
         return false;
 
     return !dispatchCPPEvent(EventTypeNames::cut, DataTransferWritable);
 }
 
 bool Editor::tryDHTMLPaste(PasteMode pasteMode)
 {
     return !dispatchCPPEvent(EventTypeNames::paste, DataTransferReadable, pasteMode);
 }
 
 void Editor::pasteAsPlainTextWithPasteboard(Pasteboard* pasteboard)
 {
     String text = pasteboard->plainText();
     pasteAsPlainText(text, canSmartReplaceWithPasteboard(pasteboard));
 }
 
 void Editor::pasteWithPasteboard(Pasteboard* pasteboard)
 {
     RefPtrWillBeRawPtr<Range> range = selectedRange();
     RefPtrWillBeRawPtr<DocumentFragment> fragment = nullptr;
     bool chosePlainText = false;
 
     if (pasteboard->isHTMLAvailable()) {
         unsigned fragmentStart = 0;
         unsigned fragmentEnd = 0;
         KURL url;
         String markup = pasteboard->readHTML(url, fragmentStart, fragmentEnd);
         if (!markup.isEmpty()) {
-            ASSERT(m_frame.document());
-            fragment = createFragmentFromMarkupWithContext(*m_frame.document(), markup, fragmentStart, fragmentEnd, url, DisallowScriptingAndPluginContent);
+            ASSERT(m_frame->document());
+            fragment = createFragmentFromMarkupWithContext(*m_frame->document(), markup, fragmentStart, fragmentEnd, url, DisallowScriptingAndPluginContent);
         }
     }
 
     if (!fragment) {
         String text = pasteboard->plainText();
         if (!text.isEmpty()) {
             chosePlainText = true;
             fragment = createFragmentFromText(range.get(), text);
         }
     }
@@ skipping 84 matching lines @@
     return !noDefaultProcessing;
 }
 
 bool Editor::canSmartReplaceWithPasteboard(Pasteboard* pasteboard)
 {
     return smartInsertDeleteEnabled() && pasteboard->canSmartReplace();
 }
 
 void Editor::replaceSelectionWithFragment(PassRefPtrWillBeRawPtr<DocumentFragment> fragment, bool selectReplacement, bool smartReplace, bool matchStyle)
 {
-    if (m_frame.selection().isNone() || !m_frame.selection().isContentEditable() || !fragment)
+    if (m_frame->selection().isNone() || !m_frame->selection().isContentEditable() || !fragment)
         return;
 
     ReplaceSelectionCommand::CommandOptions options = ReplaceSelectionCommand::PreventNesting | ReplaceSelectionCommand::SanitizeFragment;
     if (selectReplacement)
         options |= ReplaceSelectionCommand::SelectReplacement;
     if (smartReplace)
         options |= ReplaceSelectionCommand::SmartReplace;
     if (matchStyle)
         options |= ReplaceSelectionCommand::MatchStyle;
-    ASSERT(m_frame.document());
-    ReplaceSelectionCommand::create(*m_frame.document(), fragment, options, EditActionPaste)->apply();
+    ASSERT(m_frame->document());
+    ReplaceSelectionCommand::create(*m_frame->document(), fragment, options, EditActionPaste)->apply();
     revealSelectionAfterEditingOperation();
 
-    if (m_frame.selection().isInPasswordField() || !spellChecker().isContinuousSpellCheckingEnabled())
+    if (m_frame->selection().isInPasswordField() || !spellChecker().isContinuousSpellCheckingEnabled())
         return;
-    spellChecker().chunkAndMarkAllMisspellingsAndBadGrammar(m_frame.selection().rootEditableElement());
+    spellChecker().chunkAndMarkAllMisspellingsAndBadGrammar(m_frame->selection().rootEditableElement());
 }
 
 void Editor::replaceSelectionWithText(const String& text, bool selectReplacement, bool smartReplace)
 {
     replaceSelectionWithFragment(createFragmentFromText(selectedRange().get(), text), selectReplacement, smartReplace, true);
 }
 
 PassRefPtrWillBeRawPtr<Range> Editor::selectedRange()
 {
-    return m_frame.selection().toNormalizedRange();
+    return m_frame->selection().toNormalizedRange();
 }
 
 bool Editor::shouldDeleteRange(Range* range) const
 {
     if (!range || range->collapsed())
         return false;
 
     return canDeleteRange(range);
 }
 
 void Editor::notifyComponentsOnChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions options)
 {
-    client().respondToChangedSelection(&m_frame, m_frame.selection().selectionType());
+    client().respondToChangedSelection(m_frame, m_frame->selection().selectionType());
     setStartNewKillRingSequence(true);
 }
 
 void Editor::respondToChangedContents(const VisibleSelection& endingSelection)
 {
-    if (m_frame.settings() && m_frame.settings()->accessibilityEnabled()) {
+    if (m_frame->settings() && m_frame->settings()->accessibilityEnabled()) {
         Node* node = endingSelection.start().deprecatedNode();
-        if (AXObjectCache* cache = m_frame.document()->existingAXObjectCache())
+        if (AXObjectCache* cache = m_frame->document()->existingAXObjectCache())
             cache->postNotification(node, AXObjectCache::AXValueChanged, false);
     }
 
     spellChecker().updateMarkersForWordsAffectedByEditing(true);
     client().respondToChangedContents();
 }
 
 void Editor::removeFormattingAndStyle()
 {
-    ASSERT(m_frame.document());
-    RemoveFormatCommand::create(*m_frame.document())->apply();
+    ASSERT(m_frame->document());
+    RemoveFormatCommand::create(*m_frame->document())->apply();
 }
 
 void Editor::clearLastEditCommand()
 {
     m_lastEditCommand.clear();
 }
 
 Element* Editor::findEventTargetFrom(const VisibleSelection& selection) const
 {
     Element* target = selection.start().element();
     if (!target)
-        target = m_frame.document()->body();
+        target = m_frame->document()->body();
 
     return target;
 }
 
 Element* Editor::findEventTargetFromSelection() const
 {
-    return findEventTargetFrom(m_frame.selection().selection());
+    return findEventTargetFrom(m_frame->selection().selection());
 }
 
 void Editor::applyStyle(StylePropertySet* style, EditAction editingAction)
 {
-    switch (m_frame.selection().selectionType()) {
+    switch (m_frame->selection().selectionType()) {
     case NoSelection:
         // do nothing
         break;
     case CaretSelection:
         computeAndSetTypingStyle(style, editingAction);
         break;
     case RangeSelection:
         if (style) {
-            ASSERT(m_frame.document());
-            ApplyStyleCommand::create(*m_frame.document(), EditingStyle::create(style).get(), editingAction)->apply();
+            ASSERT(m_frame->document());
+            ApplyStyleCommand::create(*m_frame->document(), EditingStyle::create(style).get(), editingAction)->apply();
         }
         break;
     }
 }
 
 void Editor::applyParagraphStyle(StylePropertySet* style, EditAction editingAction)
 {
-    if (m_frame.selection().isNone() || !style)
+    if (m_frame->selection().isNone() || !style)
         return;
-    ASSERT(m_frame.document());
-    ApplyStyleCommand::create(*m_frame.document(), EditingStyle::create(style).get(), editingAction, ApplyStyleCommand::ForceBlockProperties)->apply();
+    ASSERT(m_frame->document());
+    ApplyStyleCommand::create(*m_frame->document(), EditingStyle::create(style).get(), editingAction, ApplyStyleCommand::ForceBlockProperties)->apply();
 }
 
 void Editor::applyStyleToSelection(StylePropertySet* style, EditAction editingAction)
 {
     if (!style || style->isEmpty() || !canEditRichly())
         return;
 
     applyStyle(style, editingAction);
 }
 
 void Editor::applyParagraphStyleToSelection(StylePropertySet* style, EditAction editingAction)
 {
     if (!style || style->isEmpty() || !canEditRichly())
         return;
 
     applyParagraphStyle(style, editingAction);
 }
 
 bool Editor::selectionStartHasStyle(CSSPropertyID propertyID, const String& value) const
 {
     return EditingStyle::create(propertyID, value)->triStateOfStyle(
-        EditingStyle::styleAtSelectionStart(m_frame.selection().selection(), propertyID == CSSPropertyBackgroundColor).get());
+        EditingStyle::styleAtSelectionStart(m_frame->selection().selection(), propertyID == CSSPropertyBackgroundColor).get());
 }
 
 TriState Editor::selectionHasStyle(CSSPropertyID propertyID, const String& value) const
 {
-    return EditingStyle::create(propertyID, value)->triStateOfStyle(m_frame.selection().selection());
+    return EditingStyle::create(propertyID, value)->triStateOfStyle(m_frame->selection().selection());
 }
 
 String Editor::selectionStartCSSPropertyValue(CSSPropertyID propertyID)
 {
-    RefPtrWillBeRawPtr<EditingStyle> selectionStyle = EditingStyle::styleAtSelectionStart(m_frame.selection().selection(),
+    RefPtrWillBeRawPtr<EditingStyle> selectionStyle = EditingStyle::styleAtSelectionStart(m_frame->selection().selection(),
         propertyID == CSSPropertyBackgroundColor);
     if (!selectionStyle || !selectionStyle->style())
         return String();
 
     if (propertyID == CSSPropertyFontSize)
-        return String::number(selectionStyle->legacyFontSize(m_frame.document()));
+        return String::number(selectionStyle->legacyFontSize(m_frame->document()));
     return selectionStyle->style()->getPropertyValue(propertyID);
 }
 
 static void dispatchEditableContentChangedEvents(PassRefPtrWillBeRawPtr<Element> startRoot, PassRefPtrWillBeRawPtr<Element> endRoot)
 {
     if (startRoot)
         startRoot->dispatchEvent(Event::create(EventTypeNames::webkitEditableContentChanged), IGNORE_EXCEPTION);
     if (endRoot && endRoot != startRoot)
         endRoot->dispatchEvent(Event::create(EventTypeNames::webkitEditableContentChanged), IGNORE_EXCEPTION);
 }
 
 void Editor::appliedEditing(PassRefPtrWillBeRawPtr<CompositeEditCommand> cmd)
 {
     EventQueueScope scope;
-    m_frame.document()->updateLayout();
+    m_frame->document()->updateLayout();
 
     EditCommandComposition* composition = cmd->composition();
     ASSERT(composition);
     dispatchEditableContentChangedEvents(composition->startingRootEditableElement(), composition->endingRootEditableElement());
     VisibleSelection newSelection(cmd->endingSelection());
 
     // Don't clear the typing style with this selection change. We do those things elsewhere if necessary.
     changeSelectionAfterCommand(newSelection, 0);
 
     if (!cmd->preservesTypingStyle())
-        m_frame.selection().clearTypingStyle();
+        m_frame->selection().clearTypingStyle();
 
     // Command will be equal to last edit command only in the case of typing
     if (m_lastEditCommand.get() == cmd) {
         ASSERT(cmd->isTypingCommand());
     } else {
         // Only register a new undo command if the command passed in is
         // different from the last command
         m_lastEditCommand = cmd;
         if (UndoStack* undoStack = this->undoStack())
             undoStack->registerUndoStep(m_lastEditCommand->ensureComposition());
     }
 
     respondToChangedContents(newSelection);
 }
 
 void Editor::unappliedEditing(PassRefPtrWillBeRawPtr<EditCommandComposition> cmd)
 {
     EventQueueScope scope;
-    m_frame.document()->updateLayout();
+    m_frame->document()->updateLayout();
 
     dispatchEditableContentChangedEvents(cmd->startingRootEditableElement(), cmd->endingRootEditableElement());
 
     VisibleSelection newSelection(cmd->startingSelection());
     newSelection.validatePositionsIfNeeded();
-    if (newSelection.start().document() == m_frame.document() && newSelection.end().document() == m_frame.document())
+    if (newSelection.start().document() == m_frame->document() && newSelection.end().document() == m_frame->document())
         changeSelectionAfterCommand(newSelection, FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle);
 
     m_lastEditCommand = nullptr;
     if (UndoStack* undoStack = this->undoStack())
         undoStack->registerRedoStep(cmd);
     respondToChangedContents(newSelection);
 }
 
 void Editor::reappliedEditing(PassRefPtrWillBeRawPtr<EditCommandComposition> cmd)
 {
     EventQueueScope scope;
-    m_frame.document()->updateLayout();
+    m_frame->document()->updateLayout();
 
     dispatchEditableContentChangedEvents(cmd->startingRootEditableElement(), cmd->endingRootEditableElement());
 
     VisibleSelection newSelection(cmd->endingSelection());
     changeSelectionAfterCommand(newSelection, FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle);
 
     m_lastEditCommand = nullptr;
     if (UndoStack* undoStack = this->undoStack())
         undoStack->registerUndoStep(cmd);
     respondToChangedContents(newSelection);
 }
 
 PassOwnPtrWillBeRawPtr<Editor> Editor::create(LocalFrame& frame)
 {
     return adoptPtrWillBeNoop(new Editor(frame));
 }
 
 Editor::Editor(LocalFrame& frame)
-    : m_frame(frame)
+    : m_frame(&frame)
     , m_preventRevealSelection(0)
     , m_shouldStartNewKillRingSequence(false)
     // This is off by default, since most editors want this behavior (this matches IE but not FF).
     , m_shouldStyleWithCSS(false)
     , m_killRing(adoptPtr(new KillRing))
     , m_areMarkedTextMatchesHighlighted(false)
     , m_defaultParagraphSeparator(EditorParagraphSeparatorIsDiv)
     , m_overwriteModeEnabled(false)
 {
 }
 
 Editor::~Editor()
 {
 }
 
 void Editor::clear()
 {
-    m_frame.inputMethodController().clear();
+    m_frame->inputMethodController().clear();
     m_shouldStyleWithCSS = false;
     m_defaultParagraphSeparator = EditorParagraphSeparatorIsDiv;
 }
 
 bool Editor::insertText(const String& text, KeyboardEvent* triggeringEvent)
 {
-    return m_frame.eventHandler().handleTextInputEvent(text, triggeringEvent);
+    return m_frame->eventHandler().handleTextInputEvent(text, triggeringEvent);
 }
 
 bool Editor::insertTextWithoutSendingTextEvent(const String& text, bool selectInsertedText, TextEvent* triggeringEvent)
 {
     if (text.isEmpty())
         return false;
 
     VisibleSelection selection = selectionForCommand(triggeringEvent);
     if (!selection.isContentEditable())
         return false;
@@ skipping 23 matching lines @@
     }
 
     return true;
 }
 
 bool Editor::insertLineBreak()
 {
     if (!canEdit())
         return false;
 
-    VisiblePosition caret = m_frame.selection().selection().visibleStart();
+    VisiblePosition caret = m_frame->selection().selection().visibleStart();
     bool alignToEdge = isEndOfEditableOrNonEditableContent(caret);
-    ASSERT(m_frame.document());
-    TypingCommand::insertLineBreak(*m_frame.document(), 0);
+    ASSERT(m_frame->document());
+    TypingCommand::insertLineBreak(*m_frame->document(), 0);
     revealSelectionAfterEditingOperation(alignToEdge ? ScrollAlignment::alignToEdgeIfNeeded : ScrollAlignment::alignCenterIfNeeded);
 
     return true;
 }
 
 bool Editor::insertParagraphSeparator()
 {
     if (!canEdit())
         return false;
 
     if (!canEditRichly())
         return insertLineBreak();
 
-    VisiblePosition caret = m_frame.selection().selection().visibleStart();
+    VisiblePosition caret = m_frame->selection().selection().visibleStart();
     bool alignToEdge = isEndOfEditableOrNonEditableContent(caret);
-    ASSERT(m_frame.document());
-    TypingCommand::insertParagraphSeparator(*m_frame.document(), 0);
+    ASSERT(m_frame->document());
+    TypingCommand::insertParagraphSeparator(*m_frame->document(), 0);
     revealSelectionAfterEditingOperation(alignToEdge ? ScrollAlignment::alignToEdgeIfNeeded : ScrollAlignment::alignCenterIfNeeded);
 
     return true;
 }
 
 void Editor::cut()
 {
     if (tryDHTMLCut())
         return; // DHTML did the whole operation
     if (!canCut())
         return;
     RefPtrWillBeRawPtr<Range> selection = selectedRange();
     if (shouldDeleteRange(selection.get())) {
         spellChecker().updateMarkersForWordsAffectedByEditing(true);
-        String plainText = m_frame.selectedTextForClipboard();
-        if (enclosingTextFormControl(m_frame.selection().start())) {
+        String plainText = m_frame->selectedTextForClipboard();
+        if (enclosingTextFormControl(m_frame->selection().start())) {
             Pasteboard::generalPasteboard()->writePlainText(plainText,
                 canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
         } else {
             writeSelectionToPasteboard(Pasteboard::generalPasteboard(), selection.get(), plainText);
         }
         deleteSelectionWithSmartDelete(canSmartCopyOrDelete());
     }
 }
 
 void Editor::copy()
 {
     if (tryDHTMLCopy())
         return; // DHTML did the whole operation
     if (!canCopy())
         return;
-    if (enclosingTextFormControl(m_frame.selection().start())) {
-        Pasteboard::generalPasteboard()->writePlainText(m_frame.selectedTextForClipboard(),
+    if (enclosingTextFormControl(m_frame->selection().start())) {
+        Pasteboard::generalPasteboard()->writePlainText(m_frame->selectedTextForClipboard(),
             canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
     } else {
-        Document* document = m_frame.document();
+        Document* document = m_frame->document();
         if (HTMLImageElement* imageElement = imageElementFromImageDocument(document))
             writeImageNodeToPasteboard(Pasteboard::generalPasteboard(), imageElement, document->title());
         else
-            writeSelectionToPasteboard(Pasteboard::generalPasteboard(), selectedRange().get(), m_frame.selectedTextForClipboard());
+            writeSelectionToPasteboard(Pasteboard::generalPasteboard(), selectedRange().get(), m_frame->selectedTextForClipboard());
     }
 }
 
 void Editor::paste()
 {
-    ASSERT(m_frame.document());
+    ASSERT(m_frame->document());
     if (tryDHTMLPaste(AllMimeTypes))
         return; // DHTML did the whole operation
     if (!canPaste())
         return;
     spellChecker().updateMarkersForWordsAffectedByEditing(false);
-    ResourceFetcher* loader = m_frame.document()->fetcher();
+    ResourceFetcher* loader = m_frame->document()->fetcher();
     ResourceCacheValidationSuppressor validationSuppressor(loader);
-    if (m_frame.selection().isContentRichlyEditable())
+    if (m_frame->selection().isContentRichlyEditable())
         pasteWithPasteboard(Pasteboard::generalPasteboard());
     else
         pasteAsPlainTextWithPasteboard(Pasteboard::generalPasteboard());
 }
 
 void Editor::pasteAsPlainText()
 {
     if (tryDHTMLPaste(PlainTextOnly))
         return;
     if (!canPaste())
@@ skipping 125 matching lines @@
     RefPtrWillBeRawPtr<MutableStylePropertySet> style = MutableStylePropertySet::create();
     style->setProperty(CSSPropertyDirection, direction == LeftToRightWritingDirection ? "ltr" : direction == RightToLeftWritingDirection ? "rtl" : "inherit", false);
     applyParagraphStyleToSelection(style.get(), EditActionSetWritingDirection);
 }
 
 void Editor::revealSelectionAfterEditingOperation(const ScrollAlignment& alignment, RevealExtentOption revealExtentOption)
 {
     if (m_preventRevealSelection)
         return;
 
-    m_frame.selection().revealSelection(alignment, revealExtentOption);
+    m_frame->selection().revealSelection(alignment, revealExtentOption);
 }
 
 void Editor::transpose()
 {
     if (!canEdit())
         return;
 
-    VisibleSelection selection = m_frame.selection().selection();
+    VisibleSelection selection = m_frame->selection().selection();
     if (!selection.isCaret())
         return;
 
     // Make a selection that goes back one character and forward two characters.
     VisiblePosition caret = selection.visibleStart();
     VisiblePosition next = isEndOfParagraph(caret) ? caret : caret.next();
     VisiblePosition previous = next.previous();
     if (next == previous)
         return;
     previous = previous.previous();
     if (!inSameParagraph(next, previous))
         return;
     RefPtrWillBeRawPtr<Range> range = makeRange(previous, next);
     if (!range)
         return;
     VisibleSelection newSelection(range.get(), DOWNSTREAM);
 
     // Transpose the two characters.
     String text = plainText(range.get());
     if (text.length() != 2)
         return;
     String transposed = text.right(1) + text.left(1);
 
     // Select the two characters.
-    if (newSelection != m_frame.selection().selection())
-        m_frame.selection().setSelection(newSelection);
+    if (newSelection != m_frame->selection().selection())
+        m_frame->selection().setSelection(newSelection);
 
     // Insert the transposed characters.
     replaceSelectionWithText(transposed, false, false);
 }
 
 void Editor::addToKillRing(Range* range, bool prepend)
 {
     if (m_shouldStartNewKillRingSequence)
         killRing().startNewSequence();
 
     String text = plainText(range);
     if (prepend)
         killRing().prepend(text);
     else
         killRing().append(text);
     m_shouldStartNewKillRingSequence = false;
 }
 
 void Editor::changeSelectionAfterCommand(const VisibleSelection& newSelection,  FrameSelection::SetSelectionOptions options)
 {
     // If the new selection is orphaned, then don't update the selection.
     if (newSelection.start().isOrphan() || newSelection.end().isOrphan())
         return;
 
     // See <rdar://problem/5729315> Some shouldChangeSelectedDOMRange contain Ranges for selections that are no longer valid
-    bool selectionDidNotChangeDOMPosition = newSelection == m_frame.selection().selection();
-    m_frame.selection().setSelection(newSelection, options);
+    bool selectionDidNotChangeDOMPosition = newSelection == m_frame->selection().selection();
+    m_frame->selection().setSelection(newSelection, options);
 
     // Some editing operations change the selection visually without affecting its position within the DOM.
     // For example when you press return in the following (the caret is marked by ^):
     // <div contentEditable="true"><div>^Hello</div></div>
     // WebCore inserts <div><br></div> *before* the current block, which correctly moves the paragraph down but which doesn't
     // change the caret's DOM position (["hello", 0]). In these situations the above FrameSelection::setSelection call
     // does not call EditorClient::respondToChangedSelection(), which, on the Mac, sends selection change notifications and
     // starts a new kill ring sequence, but we want to do these things (matches AppKit).
     if (selectionDidNotChangeDOMPosition)
-        client().respondToChangedSelection(&m_frame, m_frame.selection().selectionType());
+        client().respondToChangedSelection(m_frame, m_frame->selection().selectionType());
 }
 
 IntRect Editor::firstRectForRange(Range* range) const
 {
     LayoutUnit extraWidthToEndOfLine = 0;
     ASSERT(range->startContainer());
     ASSERT(range->endContainer());
 
     IntRect startCaretRect = RenderedPosition(VisiblePosition(range->startPosition()).deepEquivalent(), DOWNSTREAM).absoluteRect(&extraWidthToEndOfLine);
     if (startCaretRect == LayoutRect())
@@ skipping 14 matching lines @@
     // start and end aren't on the same line, so go from start to the end of its line
     return IntRect(startCaretRect.x(),
         startCaretRect.y(),
         startCaretRect.width() + extraWidthToEndOfLine,
         startCaretRect.height());
 }
 
 void Editor::computeAndSetTypingStyle(StylePropertySet* style, EditAction editingAction)
 {
     if (!style || style->isEmpty()) {
-        m_frame.selection().clearTypingStyle();
+        m_frame->selection().clearTypingStyle();
         return;
     }
 
     // Calculate the current typing style.
     RefPtrWillBeRawPtr<EditingStyle> typingStyle = nullptr;
-    if (m_frame.selection().typingStyle()) {
-        typingStyle = m_frame.selection().typingStyle()->copy();
+    if (m_frame->selection().typingStyle()) {
+        typingStyle = m_frame->selection().typingStyle()->copy();
         typingStyle->overrideWithStyle(style);
     } else {
         typingStyle = EditingStyle::create(style);
     }
 
-    typingStyle->prepareToApplyAt(m_frame.selection().selection().visibleStart().deepEquivalent(), EditingStyle::PreserveWritingDirection);
+    typingStyle->prepareToApplyAt(m_frame->selection().selection().visibleStart().deepEquivalent(), EditingStyle::PreserveWritingDirection);
 
     // Handle block styles, substracting these from the typing style.
     RefPtrWillBeRawPtr<EditingStyle> blockStyle = typingStyle->extractAndRemoveBlockProperties();
     if (!blockStyle->isEmpty()) {
-        ASSERT(m_frame.document());
-        ApplyStyleCommand::create(*m_frame.document(), blockStyle.get(), editingAction)->apply();
+        ASSERT(m_frame->document());
+        ApplyStyleCommand::create(*m_frame->document(), blockStyle.get(), editingAction)->apply();
     }
 
     // Set the remaining style as the typing style.
-    m_frame.selection().setTypingStyle(typingStyle);
+    m_frame->selection().setTypingStyle(typingStyle);
 }
 
 bool Editor::findString(const String& target, bool forward, bool caseFlag, bool wrapFlag, bool startInSelection)
 {
     FindOptions options = (forward ? 0 : Backwards) | (caseFlag ? 0 : CaseInsensitive) | (wrapFlag ? WrapAround : 0) | (startInSelection ? StartInSelection : 0);
     return findString(target, options);
 }
 
 bool Editor::findString(const String& target, FindOptions options)
 {
-    VisibleSelection selection = m_frame.selection().selection();
+    VisibleSelection selection = m_frame->selection().selection();
 
     RefPtrWillBeRawPtr<Range> resultRange = rangeOfString(target, selection.firstRange().get(), options);
 
     if (!resultRange)
         return false;
 
-    m_frame.selection().setSelection(VisibleSelection(resultRange.get(), DOWNSTREAM));
-    m_frame.selection().revealSelection();
+    m_frame->selection().setSelection(VisibleSelection(resultRange.get(), DOWNSTREAM));
+    m_frame->selection().revealSelection();
     return true;
 }
 
 PassRefPtrWillBeRawPtr<Range> Editor::findStringAndScrollToVisible(const String& target, Range* previousMatch, FindOptions options)
 {
     RefPtrWillBeRawPtr<Range> nextMatch = rangeOfString(target, previousMatch, options);
     if (!nextMatch)
         return nullptr;
 
     nextMatch->firstNode()->renderer()->scrollRectToVisible(nextMatch->boundingBox(),
@@ skipping 33 matching lines @@
     return nullptr;
 }
 
 PassRefPtrWillBeRawPtr<Range> Editor::rangeOfString(const String& target, Range* referenceRange, FindOptions options)
 {
     if (target.isEmpty())
         return nullptr;
 
     // Start from an edge of the reference range. Which edge is used depends on whether we're searching forward or
     // backward, and whether startInSelection is set.
-    Position searchStart = firstPositionInNode(m_frame.document());
-    Position searchEnd = lastPositionInNode(m_frame.document());
+    Position searchStart = firstPositionInNode(m_frame->document());
+    Position searchEnd = lastPositionInNode(m_frame->document());
 
     bool forward = !(options & Backwards);
     bool startInReferenceRange = referenceRange && (options & StartInSelection);
     if (referenceRange) {
         if (forward)
             searchStart = startInReferenceRange ? referenceRange->startPosition() : referenceRange->endPosition();
         else
             searchEnd = startInReferenceRange ? referenceRange->endPosition() : referenceRange->startPosition();
     }
 
     RefPtrWillBeRawPtr<Range> resultRange = findStringBetweenPositions(target, searchStart, searchEnd, options);
 
     // If we started in the reference range and the found range exactly matches the reference range, find again.
     // Build a selection with the found range to remove collapsed whitespace.
     // Compare ranges instead of selection objects to ignore the way that the current selection was made.
     if (resultRange && startInReferenceRange && areRangesEqual(VisibleSelection(resultRange.get()).toNormalizedRange().get(), referenceRange)) {
         if (forward)
             searchStart = resultRange->endPosition();
         else
             searchEnd = resultRange->startPosition();
         resultRange = findStringBetweenPositions(target, searchStart, searchEnd, options);
     }
 
     if (!resultRange && options & WrapAround) {
-        searchStart = firstPositionInNode(m_frame.document());
-        searchEnd = lastPositionInNode(m_frame.document());
+        searchStart = firstPositionInNode(m_frame->document());
+        searchEnd = lastPositionInNode(m_frame->document());
         resultRange = findStringBetweenPositions(target, searchStart, searchEnd, options);
     }
 
     return resultRange.release();
 }
 
 void Editor::setMarkedTextMatchesAreHighlighted(bool flag)
 {
     if (flag == m_areMarkedTextMatchesHighlighted)
         return;
 
     m_areMarkedTextMatchesHighlighted = flag;
-    m_frame.document()->markers().repaintMarkers(DocumentMarker::TextMatch);
+    m_frame->document()->markers().repaintMarkers(DocumentMarker::TextMatch);
 }
 
 void Editor::respondToChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions options)
 {
     spellChecker().respondToChangedSelection(oldSelection, options);
-    m_frame.inputMethodController().cancelCompositionIfSelectionIsInvalid();
+    m_frame->inputMethodController().cancelCompositionIfSelectionIsInvalid();
     notifyComponentsOnChangedSelection(oldSelection, options);
 }
 
 SpellChecker& Editor::spellChecker() const
 {
-    return m_frame.spellChecker();
+    return m_frame->spellChecker();
 }
 
 void Editor::toggleOverwriteModeEnabled()
 {
     m_overwriteModeEnabled = !m_overwriteModeEnabled;
     frame().selection().setShouldShowBlockCursor(m_overwriteModeEnabled);
 }
 
 void Editor::trace(Visitor* visitor)
 {
+    visitor->trace(m_frame);
     visitor->trace(m_lastEditCommand);
     visitor->trace(m_mark);
 }
 
 } // namespace blink