Changeset 85864 in webkit


Ignore:
Timestamp:
May 5, 2011 11:14:43 AM (13 years ago)
Author:
rniwa@webkit.org
Message:

2011-05-05 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Rename SelectionController to FrameSelection
https://bugs.webkit.org/show_bug.cgi?id=60234

  • src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::selectWordAroundCaret):
  • src/WebViewImpl.cpp: (WebKit::WebViewImpl::textInputType): (WebKit::WebViewImpl::caretOrSelectionBounds): (WebKit::WebViewImpl::caretOrSelectionRange): (WebKit::WebViewImpl::clearFocusedNode):

2011-05-05 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Rename SelectionController to FrameSelection
https://bugs.webkit.org/show_bug.cgi?id=60234

  • Api/qwebframe.cpp:

2011-05-05 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Rename SelectionController to FrameSelection
https://bugs.webkit.org/show_bug.cgi?id=60234

  • webkit/webkitwebview.cpp: (getLocationForKeyboardGeneratedContextMenu):

2011-05-05 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Rename SelectionController to FrameSelection
https://bugs.webkit.org/show_bug.cgi?id=60234

  • WebView.cpp:

2011-05-05 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Rename SelectionController to FrameSelection
https://bugs.webkit.org/show_bug.cgi?id=60234

  • WebDOMSelection.cpp:
  • WebDOMSelection.h:
  • WebKitSupport/EditorClientWx.cpp:
  • WebView.cpp:

2011-05-05 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Rename SelectionController to FrameSelection
https://bugs.webkit.org/show_bug.cgi?id=60234

  • WebView/WebFrame.mm: (-[WebFrame _rangeByAlteringCurrentSelection:FrameSelection::direction:granularity:]):
  • WebView/WebFrameInternal.h:
  • WebView/WebHTMLView.mm:
  • WebView/WebTextCompletionController.mm: (-[WebTextCompletionController doCompletion]):
  • WebView/WebView.mm:

2011-05-05 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Rename SelectionController to FrameSelection
https://bugs.webkit.org/show_bug.cgi?id=60234

  • WebCoreSupport/EditorClientHaiku.cpp: (WebCore::EditorClientHaiku::handleKeyboardEvent):

2011-05-05 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Rename SelectionController to FrameSelection
https://bugs.webkit.org/show_bug.cgi?id=60234

  • WebCoreSupport/EditorClientWinCE.cpp: (WebKit::EditorClientWinCE::handleEditingKeyboardEvent):

2011-05-05 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Rename SelectionController to FrameSelection
https://bugs.webkit.org/show_bug.cgi?id=60234

  • WebCoreSupport/EditorClientEfl.cpp: (WebCore::EditorClientEfl::handleEditingKeyboardEvent):

2011-05-05 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Eric Seidel.

Rename SelectionController to FrameSelection
https://bugs.webkit.org/show_bug.cgi?id=60234

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • WebCore.exp.in:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • accessibility/AccessibilityObject.cpp:
  • accessibility/AccessibilityRenderObject.cpp: (WebCore::AccessibilityRenderObject::visiblePositionRangeForLine):
  • accessibility/mac/AccessibilityObjectWrapper.mm:
  • bindings/objc/ExceptionHandlers.h:
  • css/CSSStyleSelector.cpp:
  • dom/ContainerNode.cpp: (WebCore::ContainerNode::cloneChildNodes):
  • dom/Document.cpp:
  • dom/InputElement.cpp:
  • editing/DeleteButtonController.cpp:
  • editing/EditCommand.cpp:
  • editing/EditingAllInOne.cpp:
  • editing/EditingStyle.cpp:
  • editing/Editor.cpp: (WebCore::Editor::canCopy): (WebCore::Editor::canDelete): (WebCore::Editor::markMisspellingsAfterTypingToWord): (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): (WebCore::Editor::changeSelectionAfterCommand): (WebCore::Editor::respondToChangedSelection):
  • editing/Editor.h:
  • editing/EditorCommand.cpp: (WebCore::executeDeleteToMark): (WebCore::executeMoveBackward): (WebCore::executeMoveBackwardAndModifySelection): (WebCore::executeMoveDown): (WebCore::executeMoveDownAndModifySelection): (WebCore::executeMoveForward): (WebCore::executeMoveForwardAndModifySelection): (WebCore::executeMoveLeft): (WebCore::executeMoveLeftAndModifySelection): (WebCore::executeMovePageDown): (WebCore::executeMovePageDownAndModifySelection): (WebCore::executeMovePageUp): (WebCore::executeMovePageUpAndModifySelection): (WebCore::executeMoveRight): (WebCore::executeMoveRightAndModifySelection): (WebCore::executeMoveToBeginningOfDocument): (WebCore::executeMoveToBeginningOfDocumentAndModifySelection): (WebCore::executeMoveToBeginningOfLine): (WebCore::executeMoveToBeginningOfLineAndModifySelection): (WebCore::executeMoveToBeginningOfParagraph): (WebCore::executeMoveToBeginningOfParagraphAndModifySelection): (WebCore::executeMoveToBeginningOfSentence): (WebCore::executeMoveToBeginningOfSentenceAndModifySelection): (WebCore::executeMoveToEndOfDocument): (WebCore::executeMoveToEndOfDocumentAndModifySelection): (WebCore::executeMoveToEndOfSentence): (WebCore::executeMoveToEndOfSentenceAndModifySelection): (WebCore::executeMoveToEndOfLine): (WebCore::executeMoveToEndOfLineAndModifySelection): (WebCore::executeMoveToEndOfParagraph): (WebCore::executeMoveToEndOfParagraphAndModifySelection): (WebCore::executeMoveParagraphBackwardAndModifySelection): (WebCore::executeMoveParagraphForwardAndModifySelection): (WebCore::executeMoveUp): (WebCore::executeMoveUpAndModifySelection): (WebCore::executeMoveWordBackward): (WebCore::executeMoveWordBackwardAndModifySelection): (WebCore::executeMoveWordForward): (WebCore::executeMoveWordForwardAndModifySelection): (WebCore::executeMoveWordLeft): (WebCore::executeMoveWordLeftAndModifySelection): (WebCore::executeMoveWordRight): (WebCore::executeMoveWordRightAndModifySelection): (WebCore::executeMoveToLeftEndOfLine): (WebCore::executeMoveToLeftEndOfLineAndModifySelection): (WebCore::executeMoveToRightEndOfLine): (WebCore::executeMoveToRightEndOfLineAndModifySelection):
  • editing/FrameSelection.cpp: Copied from Source/WebCore/editing/SelectionController.cpp. (WebCore::FrameSelection::FrameSelection): (WebCore::FrameSelection::moveTo): (WebCore::FrameSelection::setSelection): (WebCore::FrameSelection::nodeWillBeRemoved): (WebCore::FrameSelection::respondToNodeModification): (WebCore::FrameSelection::textWillBeReplaced): (WebCore::FrameSelection::setIsDirectional): (WebCore::FrameSelection::directionOfEnclosingBlock): (WebCore::FrameSelection::willBeModified): (WebCore::FrameSelection::positionForPlatform): (WebCore::FrameSelection::startForPlatform): (WebCore::FrameSelection::endForPlatform): (WebCore::FrameSelection::modifyExtendingRight): (WebCore::FrameSelection::modifyExtendingForward): (WebCore::FrameSelection::modifyMovingRight): (WebCore::FrameSelection::modifyMovingForward): (WebCore::FrameSelection::modifyExtendingLeft): (WebCore::FrameSelection::modifyExtendingBackward): (WebCore::FrameSelection::modifyMovingLeft): (WebCore::FrameSelection::modifyMovingBackward): (WebCore::FrameSelection::modify): (WebCore::FrameSelection::xPosForVerticalArrowNavigation): (WebCore::FrameSelection::clear): (WebCore::FrameSelection::setStart): (WebCore::FrameSelection::setEnd): (WebCore::FrameSelection::setBase): (WebCore::FrameSelection::setExtent): (WebCore::FrameSelection::setCaretRectNeedsUpdate): (WebCore::FrameSelection::updateCaretRect): (WebCore::FrameSelection::caretRenderer): (WebCore::FrameSelection::localCaretRect): (WebCore::FrameSelection::absoluteBoundsForLocalRect): (WebCore::FrameSelection::absoluteCaretBounds): (WebCore::FrameSelection::caretRepaintRect): (WebCore::FrameSelection::recomputeCaretRect): (WebCore::FrameSelection::shouldRepaintCaret): (WebCore::FrameSelection::invalidateCaretRect): (WebCore::FrameSelection::paintCaret): (WebCore::FrameSelection::debugRenderer): (WebCore::FrameSelection::contains): (WebCore::FrameSelection::selectFrameElementInParentIfFullySelected): (WebCore::FrameSelection::selectAll): (WebCore::FrameSelection::setSelectedRange): (WebCore::FrameSelection::isInPasswordField): (WebCore::FrameSelection::caretRendersInsideNode): (WebCore::FrameSelection::focusedOrActiveStateChanged): (WebCore::FrameSelection::pageActivationChanged): (WebCore::FrameSelection::updateSecureKeyboardEntryIfActive): (WebCore::FrameSelection::setUseSecureKeyboardEntry): (WebCore::FrameSelection::setFocused): (WebCore::FrameSelection::isFocusedAndActive): (WebCore::FrameSelection::updateAppearance): (WebCore::FrameSelection::setCaretVisible): (WebCore::FrameSelection::clearCaretRectIfNeeded): (WebCore::FrameSelection::caretBlinkTimerFired): (WebCore::FrameSelection::notifyRendererOfSelectionChange): (WebCore::FrameSelection::setFocusedNodeIfNeeded): (WebCore::FrameSelection::paintDragCaret): (WebCore::FrameSelection::copyTypingStyle): (WebCore::FrameSelection::shouldDeleteSelection): (WebCore::FrameSelection::bounds): (WebCore::FrameSelection::getClippedVisibleTextRectangles): (WebCore::FrameSelection::currentForm): (WebCore::FrameSelection::revealSelection): (WebCore::FrameSelection::setSelectionFromNone): (WebCore::FrameSelection::shouldChangeSelection): (WebCore::FrameSelection::formatForDebugger): (WebCore::FrameSelection::showTreeForThis): (showTree):
  • editing/FrameSelection.h: Copied from Source/WebCore/editing/SelectionController.h. (WebCore::FrameSelection::typingStyle): (WebCore::FrameSelection::clearTypingStyle): (WebCore::FrameSelection::setTypingStyle): (WebCore::FrameSelection::notifyAccessibilityForSelectionChange):
  • editing/ModifySelectionListLevel.cpp:
  • editing/RemoveFormatCommand.cpp:
  • editing/ReplaceSelectionCommand.cpp:
  • editing/SelectionController.cpp: Removed.
  • editing/SelectionController.h: Removed.
  • editing/SetSelectionCommand.cpp: (WebCore::SetSelectionCommand::SetSelectionCommand): (WebCore::SetSelectionCommand::doApply): (WebCore::SetSelectionCommand::doUnapply):
  • editing/SetSelectionCommand.h: (WebCore::SetSelectionCommand::create):
  • editing/SpellingCorrectionCommand.cpp: (WebCore::SpellingCorrectionCommand::doApply):
  • editing/SpellingCorrectionController.cpp: (WebCore::SpellingCorrectionController::respondToUnappliedSpellCorrection):
  • editing/TypingCommand.cpp: (WebCore::TypingCommand::deleteKeyPressed): (WebCore::TypingCommand::forwardDeleteKeyPressed):
  • editing/chromium/FrameSelectionChromium.cpp: Copied from Source/WebCore/editing/chromium/SelectionControllerChromium.cpp. (WebCore::FrameSelection::notifyAccessibilityForSelectionChange):
  • editing/chromium/SelectionControllerChromium.cpp: Removed.
  • editing/gtk/FrameSelectionGtk.cpp: Copied from Source/WebCore/editing/gtk/SelectionControllerGtk.cpp. (WebCore::FrameSelection::notifyAccessibilityForSelectionChange):
  • editing/gtk/SelectionControllerGtk.cpp: Removed.
  • editing/mac/EditorMac.mm: (WebCore::Editor::canCopyExcludingStandaloneImages):
  • editing/mac/FrameSelectionMac.mm: Copied from Source/WebCore/editing/mac/SelectionControllerMac.mm. (WebCore::FrameSelection::notifyAccessibilityForSelectionChange):
  • editing/mac/SelectionControllerMac.mm: Removed.
  • editing/qt/EditorQt.cpp:
  • loader/archive/cf/LegacyWebArchive.cpp:
  • page/ContextMenuController.cpp: (WebCore::ContextMenuController::populate):
  • page/DOMSelection.cpp: (WebCore::DOMSelection::type): (WebCore::DOMSelection::modify): (WebCore::DOMSelection::addRange): (WebCore::DOMSelection::deleteFromDocument): (WebCore::DOMSelection::containsNode):
  • page/DragController.cpp: (WebCore::DragController::dragIsMove):
  • page/DragController.h:
  • page/EventHandler.cpp: (WebCore::setSelectionIfNeeded): (WebCore::setNonDirectionalSelectionIfNeeded): (WebCore::EventHandler::sendContextMenuEventForKey): (WebCore::EventHandler::handleKeyboardSelectionMovement):
  • page/EventHandler.h:
  • page/FocusController.cpp: (WebCore::clearSelectionIfNeeded):
  • page/Frame.cpp: (WebCore::Frame::Frame):
  • page/Frame.h: (WebCore::Frame::selection):
  • page/Page.cpp: (WebCore::Page::Page):
  • page/Page.h: (WebCore::Page::dragCaretController):
  • page/chromium/DragControllerChromium.cpp:
  • page/chromium/EventHandlerChromium.cpp:
  • page/win/DragControllerWin.cpp:
  • page/win/EventHandlerWin.cpp:
  • rendering/HitTestResult.cpp:
  • rendering/RenderBlock.cpp: (WebCore::RenderBlock::destroy): (WebCore::RenderBlock::paintCaret):
  • rendering/RenderImage.cpp:
  • rendering/RenderInline.cpp: (WebCore::RenderInline::destroy):
  • rendering/RenderLayer.cpp:
  • rendering/RenderListBox.cpp:
  • rendering/RenderObjectChildList.cpp: (WebCore::RenderObjectChildList::removeChildNode):
  • rendering/RenderTextControl.cpp:
  • rendering/RenderTextControlSingleLine.cpp:
  • rendering/RenderTheme.cpp:
  • rendering/RenderTreeAsText.cpp:
  • svg/SVGSVGElement.cpp:
  • svg/SVGTextContentElement.cpp: (WebCore::SVGTextContentElement::selectSubString):
Location:
trunk/Source
Files:
88 edited
5 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/CMakeLists.txt

    r85850 r85864  
    653653    editing/EditorCommand.cpp
    654654    editing/FormatBlockCommand.cpp
     655    editing/FrameSelection.cpp
    655656    editing/HTMLInterchange.cpp
    656657    editing/IndentOutdentCommand.cpp
     
    672673    editing/ReplaceNodeWithSpanCommand.cpp
    673674    editing/ReplaceSelectionCommand.cpp
    674     editing/SelectionController.cpp
    675675    editing/SetNodeAttributeCommand.cpp
    676676    editing/SmartReplace.cpp
  • trunk/Source/WebCore/ChangeLog

    r85862 r85864  
     12011-05-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename SelectionController to FrameSelection
     6        https://bugs.webkit.org/show_bug.cgi?id=60234
     7
     8        * CMakeLists.txt:
     9        * GNUmakefile.list.am:
     10        * WebCore.exp.in:
     11        * WebCore.gypi:
     12        * WebCore.pro:
     13        * WebCore.vcproj/WebCore.vcproj:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * accessibility/AccessibilityObject.cpp:
     16        * accessibility/AccessibilityRenderObject.cpp:
     17        (WebCore::AccessibilityRenderObject::visiblePositionRangeForLine):
     18        * accessibility/mac/AccessibilityObjectWrapper.mm:
     19        * bindings/objc/ExceptionHandlers.h:
     20        * css/CSSStyleSelector.cpp:
     21        * dom/ContainerNode.cpp:
     22        (WebCore::ContainerNode::cloneChildNodes):
     23        * dom/Document.cpp:
     24        * dom/InputElement.cpp:
     25        * editing/DeleteButtonController.cpp:
     26        * editing/EditCommand.cpp:
     27        * editing/EditingAllInOne.cpp:
     28        * editing/EditingStyle.cpp:
     29        * editing/Editor.cpp:
     30        (WebCore::Editor::canCopy):
     31        (WebCore::Editor::canDelete):
     32        (WebCore::Editor::markMisspellingsAfterTypingToWord):
     33        (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges):
     34        (WebCore::Editor::changeSelectionAfterCommand):
     35        (WebCore::Editor::respondToChangedSelection):
     36        * editing/Editor.h:
     37        * editing/EditorCommand.cpp:
     38        (WebCore::executeDeleteToMark):
     39        (WebCore::executeMoveBackward):
     40        (WebCore::executeMoveBackwardAndModifySelection):
     41        (WebCore::executeMoveDown):
     42        (WebCore::executeMoveDownAndModifySelection):
     43        (WebCore::executeMoveForward):
     44        (WebCore::executeMoveForwardAndModifySelection):
     45        (WebCore::executeMoveLeft):
     46        (WebCore::executeMoveLeftAndModifySelection):
     47        (WebCore::executeMovePageDown):
     48        (WebCore::executeMovePageDownAndModifySelection):
     49        (WebCore::executeMovePageUp):
     50        (WebCore::executeMovePageUpAndModifySelection):
     51        (WebCore::executeMoveRight):
     52        (WebCore::executeMoveRightAndModifySelection):
     53        (WebCore::executeMoveToBeginningOfDocument):
     54        (WebCore::executeMoveToBeginningOfDocumentAndModifySelection):
     55        (WebCore::executeMoveToBeginningOfLine):
     56        (WebCore::executeMoveToBeginningOfLineAndModifySelection):
     57        (WebCore::executeMoveToBeginningOfParagraph):
     58        (WebCore::executeMoveToBeginningOfParagraphAndModifySelection):
     59        (WebCore::executeMoveToBeginningOfSentence):
     60        (WebCore::executeMoveToBeginningOfSentenceAndModifySelection):
     61        (WebCore::executeMoveToEndOfDocument):
     62        (WebCore::executeMoveToEndOfDocumentAndModifySelection):
     63        (WebCore::executeMoveToEndOfSentence):
     64        (WebCore::executeMoveToEndOfSentenceAndModifySelection):
     65        (WebCore::executeMoveToEndOfLine):
     66        (WebCore::executeMoveToEndOfLineAndModifySelection):
     67        (WebCore::executeMoveToEndOfParagraph):
     68        (WebCore::executeMoveToEndOfParagraphAndModifySelection):
     69        (WebCore::executeMoveParagraphBackwardAndModifySelection):
     70        (WebCore::executeMoveParagraphForwardAndModifySelection):
     71        (WebCore::executeMoveUp):
     72        (WebCore::executeMoveUpAndModifySelection):
     73        (WebCore::executeMoveWordBackward):
     74        (WebCore::executeMoveWordBackwardAndModifySelection):
     75        (WebCore::executeMoveWordForward):
     76        (WebCore::executeMoveWordForwardAndModifySelection):
     77        (WebCore::executeMoveWordLeft):
     78        (WebCore::executeMoveWordLeftAndModifySelection):
     79        (WebCore::executeMoveWordRight):
     80        (WebCore::executeMoveWordRightAndModifySelection):
     81        (WebCore::executeMoveToLeftEndOfLine):
     82        (WebCore::executeMoveToLeftEndOfLineAndModifySelection):
     83        (WebCore::executeMoveToRightEndOfLine):
     84        (WebCore::executeMoveToRightEndOfLineAndModifySelection):
     85        * editing/FrameSelection.cpp: Copied from Source/WebCore/editing/SelectionController.cpp.
     86        (WebCore::FrameSelection::FrameSelection):
     87        (WebCore::FrameSelection::moveTo):
     88        (WebCore::FrameSelection::setSelection):
     89        (WebCore::FrameSelection::nodeWillBeRemoved):
     90        (WebCore::FrameSelection::respondToNodeModification):
     91        (WebCore::FrameSelection::textWillBeReplaced):
     92        (WebCore::FrameSelection::setIsDirectional):
     93        (WebCore::FrameSelection::directionOfEnclosingBlock):
     94        (WebCore::FrameSelection::willBeModified):
     95        (WebCore::FrameSelection::positionForPlatform):
     96        (WebCore::FrameSelection::startForPlatform):
     97        (WebCore::FrameSelection::endForPlatform):
     98        (WebCore::FrameSelection::modifyExtendingRight):
     99        (WebCore::FrameSelection::modifyExtendingForward):
     100        (WebCore::FrameSelection::modifyMovingRight):
     101        (WebCore::FrameSelection::modifyMovingForward):
     102        (WebCore::FrameSelection::modifyExtendingLeft):
     103        (WebCore::FrameSelection::modifyExtendingBackward):
     104        (WebCore::FrameSelection::modifyMovingLeft):
     105        (WebCore::FrameSelection::modifyMovingBackward):
     106        (WebCore::FrameSelection::modify):
     107        (WebCore::FrameSelection::xPosForVerticalArrowNavigation):
     108        (WebCore::FrameSelection::clear):
     109        (WebCore::FrameSelection::setStart):
     110        (WebCore::FrameSelection::setEnd):
     111        (WebCore::FrameSelection::setBase):
     112        (WebCore::FrameSelection::setExtent):
     113        (WebCore::FrameSelection::setCaretRectNeedsUpdate):
     114        (WebCore::FrameSelection::updateCaretRect):
     115        (WebCore::FrameSelection::caretRenderer):
     116        (WebCore::FrameSelection::localCaretRect):
     117        (WebCore::FrameSelection::absoluteBoundsForLocalRect):
     118        (WebCore::FrameSelection::absoluteCaretBounds):
     119        (WebCore::FrameSelection::caretRepaintRect):
     120        (WebCore::FrameSelection::recomputeCaretRect):
     121        (WebCore::FrameSelection::shouldRepaintCaret):
     122        (WebCore::FrameSelection::invalidateCaretRect):
     123        (WebCore::FrameSelection::paintCaret):
     124        (WebCore::FrameSelection::debugRenderer):
     125        (WebCore::FrameSelection::contains):
     126        (WebCore::FrameSelection::selectFrameElementInParentIfFullySelected):
     127        (WebCore::FrameSelection::selectAll):
     128        (WebCore::FrameSelection::setSelectedRange):
     129        (WebCore::FrameSelection::isInPasswordField):
     130        (WebCore::FrameSelection::caretRendersInsideNode):
     131        (WebCore::FrameSelection::focusedOrActiveStateChanged):
     132        (WebCore::FrameSelection::pageActivationChanged):
     133        (WebCore::FrameSelection::updateSecureKeyboardEntryIfActive):
     134        (WebCore::FrameSelection::setUseSecureKeyboardEntry):
     135        (WebCore::FrameSelection::setFocused):
     136        (WebCore::FrameSelection::isFocusedAndActive):
     137        (WebCore::FrameSelection::updateAppearance):
     138        (WebCore::FrameSelection::setCaretVisible):
     139        (WebCore::FrameSelection::clearCaretRectIfNeeded):
     140        (WebCore::FrameSelection::caretBlinkTimerFired):
     141        (WebCore::FrameSelection::notifyRendererOfSelectionChange):
     142        (WebCore::FrameSelection::setFocusedNodeIfNeeded):
     143        (WebCore::FrameSelection::paintDragCaret):
     144        (WebCore::FrameSelection::copyTypingStyle):
     145        (WebCore::FrameSelection::shouldDeleteSelection):
     146        (WebCore::FrameSelection::bounds):
     147        (WebCore::FrameSelection::getClippedVisibleTextRectangles):
     148        (WebCore::FrameSelection::currentForm):
     149        (WebCore::FrameSelection::revealSelection):
     150        (WebCore::FrameSelection::setSelectionFromNone):
     151        (WebCore::FrameSelection::shouldChangeSelection):
     152        (WebCore::FrameSelection::formatForDebugger):
     153        (WebCore::FrameSelection::showTreeForThis):
     154        (showTree):
     155        * editing/FrameSelection.h: Copied from Source/WebCore/editing/SelectionController.h.
     156        (WebCore::FrameSelection::typingStyle):
     157        (WebCore::FrameSelection::clearTypingStyle):
     158        (WebCore::FrameSelection::setTypingStyle):
     159        (WebCore::FrameSelection::notifyAccessibilityForSelectionChange):
     160        * editing/ModifySelectionListLevel.cpp:
     161        * editing/RemoveFormatCommand.cpp:
     162        * editing/ReplaceSelectionCommand.cpp:
     163        * editing/SelectionController.cpp: Removed.
     164        * editing/SelectionController.h: Removed.
     165        * editing/SetSelectionCommand.cpp:
     166        (WebCore::SetSelectionCommand::SetSelectionCommand):
     167        (WebCore::SetSelectionCommand::doApply):
     168        (WebCore::SetSelectionCommand::doUnapply):
     169        * editing/SetSelectionCommand.h:
     170        (WebCore::SetSelectionCommand::create):
     171        * editing/SpellingCorrectionCommand.cpp:
     172        (WebCore::SpellingCorrectionCommand::doApply):
     173        * editing/SpellingCorrectionController.cpp:
     174        (WebCore::SpellingCorrectionController::respondToUnappliedSpellCorrection):
     175        * editing/TypingCommand.cpp:
     176        (WebCore::TypingCommand::deleteKeyPressed):
     177        (WebCore::TypingCommand::forwardDeleteKeyPressed):
     178        * editing/chromium/FrameSelectionChromium.cpp: Copied from Source/WebCore/editing/chromium/SelectionControllerChromium.cpp.
     179        (WebCore::FrameSelection::notifyAccessibilityForSelectionChange):
     180        * editing/chromium/SelectionControllerChromium.cpp: Removed.
     181        * editing/gtk/FrameSelectionGtk.cpp: Copied from Source/WebCore/editing/gtk/SelectionControllerGtk.cpp.
     182        (WebCore::FrameSelection::notifyAccessibilityForSelectionChange):
     183        * editing/gtk/SelectionControllerGtk.cpp: Removed.
     184        * editing/mac/EditorMac.mm:
     185        (WebCore::Editor::canCopyExcludingStandaloneImages):
     186        * editing/mac/FrameSelectionMac.mm: Copied from Source/WebCore/editing/mac/SelectionControllerMac.mm.
     187        (WebCore::FrameSelection::notifyAccessibilityForSelectionChange):
     188        * editing/mac/SelectionControllerMac.mm: Removed.
     189        * editing/qt/EditorQt.cpp:
     190        * loader/archive/cf/LegacyWebArchive.cpp:
     191        * page/ContextMenuController.cpp:
     192        (WebCore::ContextMenuController::populate):
     193        * page/DOMSelection.cpp:
     194        (WebCore::DOMSelection::type):
     195        (WebCore::DOMSelection::modify):
     196        (WebCore::DOMSelection::addRange):
     197        (WebCore::DOMSelection::deleteFromDocument):
     198        (WebCore::DOMSelection::containsNode):
     199        * page/DragController.cpp:
     200        (WebCore::DragController::dragIsMove):
     201        * page/DragController.h:
     202        * page/EventHandler.cpp:
     203        (WebCore::setSelectionIfNeeded):
     204        (WebCore::setNonDirectionalSelectionIfNeeded):
     205        (WebCore::EventHandler::sendContextMenuEventForKey):
     206        (WebCore::EventHandler::handleKeyboardSelectionMovement):
     207        * page/EventHandler.h:
     208        * page/FocusController.cpp:
     209        (WebCore::clearSelectionIfNeeded):
     210        * page/Frame.cpp:
     211        (WebCore::Frame::Frame):
     212        * page/Frame.h:
     213        (WebCore::Frame::selection):
     214        * page/Page.cpp:
     215        (WebCore::Page::Page):
     216        * page/Page.h:
     217        (WebCore::Page::dragCaretController):
     218        * page/chromium/DragControllerChromium.cpp:
     219        * page/chromium/EventHandlerChromium.cpp:
     220        * page/win/DragControllerWin.cpp:
     221        * page/win/EventHandlerWin.cpp:
     222        * rendering/HitTestResult.cpp:
     223        * rendering/RenderBlock.cpp:
     224        (WebCore::RenderBlock::destroy):
     225        (WebCore::RenderBlock::paintCaret):
     226        * rendering/RenderImage.cpp:
     227        * rendering/RenderInline.cpp:
     228        (WebCore::RenderInline::destroy):
     229        * rendering/RenderLayer.cpp:
     230        * rendering/RenderListBox.cpp:
     231        * rendering/RenderObjectChildList.cpp:
     232        (WebCore::RenderObjectChildList::removeChildNode):
     233        * rendering/RenderTextControl.cpp:
     234        * rendering/RenderTextControlSingleLine.cpp:
     235        * rendering/RenderTheme.cpp:
     236        * rendering/RenderTreeAsText.cpp:
     237        * svg/SVGSVGElement.cpp:
     238        * svg/SVGTextContentElement.cpp:
     239        (WebCore::SVGTextContentElement::selectSubString):
     240
    12412011-05-05  Brent Fulgham  <bfulgham@webkit.org>
    2242
  • trunk/Source/WebCore/GNUmakefile.list.am

    r85850 r85864  
    13241324        Source/WebCore/editing/FormatBlockCommand.cpp \
    13251325        Source/WebCore/editing/FormatBlockCommand.h \
    1326         Source/WebCore/editing/gtk/SelectionControllerGtk.cpp \
     1326        Source/WebCore/editing/FrameSelection.cpp \
     1327        Source/WebCore/editing/FrameSelection.h \
     1328        Source/WebCore/editing/gtk/FrameSelectionGtk.cpp \
    13271329        Source/WebCore/editing/htmlediting.cpp \
    13281330        Source/WebCore/editing/htmlediting.h \
     
    13671369        Source/WebCore/editing/ReplaceSelectionCommand.cpp \
    13681370        Source/WebCore/editing/ReplaceSelectionCommand.h \
    1369         Source/WebCore/editing/SelectionController.cpp \
    1370         Source/WebCore/editing/SelectionController.h \
    13711371        Source/WebCore/editing/SetNodeAttributeCommand.cpp \
    13721372        Source/WebCore/editing/SetNodeAttributeCommand.h \
  • trunk/Source/WebCore/WebCore.exp.in

    r85826 r85864  
    349349__ZN7WebCore14DocumentLoaderD2Ev
    350350__ZN7WebCore14DocumentWriter11setEncodingERKN3WTF6StringEb
     351__ZN7WebCore14FrameSelection10setFocusedEb
     352__ZN7WebCore14FrameSelection12setSelectionERKNS_16VisibleSelectionEjNS0_19CursorAlignOnScrollENS_15TextGranularityENS_20DirectionalityPolicyE
     353__ZN7WebCore14FrameSelection15revealSelectionERKNS_15ScrollAlignmentEb
     354__ZN7WebCore14FrameSelection16setSelectedRangeEPNS_5RangeENS_9EAffinityEb
     355__ZN7WebCore14FrameSelection20setSelectionFromNoneEv
     356__ZN7WebCore14FrameSelection6modifyENS0_11EAlterationENS_18SelectionDirectionENS_15TextGranularityEb
     357__ZN7WebCore14FrameSelection5clearEv
     358__ZN7WebCore14FrameSelection9selectAllEv
     359__ZN7WebCore14FrameSelectionC1EPNS_5FrameEb
    351360__ZN7WebCore14ResourceHandle12releaseProxyEv
    352361__ZN7WebCore14ResourceHandle20forceContentSniffingEv
     
    521530__ZN7WebCore19ResourceRequestBase25setDefaultTimeoutIntervalEd
    522531__ZN7WebCore19ResourceRequestBase6setURLERKNS_4KURLE
    523 __ZN7WebCore19SelectionController10setFocusedEb
    524 __ZN7WebCore19SelectionController12setSelectionERKNS_16VisibleSelectionEjNS0_19CursorAlignOnScrollENS_15TextGranularityENS_20DirectionalityPolicyE
    525 __ZN7WebCore19SelectionController15revealSelectionERKNS_15ScrollAlignmentEb
    526 __ZN7WebCore19SelectionController16setSelectedRangeEPNS_5RangeENS_9EAffinityEb
    527 __ZN7WebCore19SelectionController20setSelectionFromNoneEv
    528 __ZN7WebCore19SelectionController5clearEv
    529 __ZN7WebCore19SelectionController6modifyENS0_11EAlterationENS_18SelectionDirectionENS_15TextGranularityEb
    530 __ZN7WebCore19SelectionController9selectAllEv
    531 __ZN7WebCore19SelectionControllerC1EPNS_5FrameEb
    532532__ZN7WebCore19TextResourceDecoder5flushEv
    533533__ZN7WebCore19TextResourceDecoder6decodeEPKcm
     
    11181118__ZNK7WebCore14DocumentLoader28urlForHistoryReflectsFailureEv
    11191119__ZNK7WebCore14DocumentLoader3urlEv
     1120__ZNK7WebCore14FrameSelection11currentFormEv
     1121__ZNK7WebCore14FrameSelection15copyTypingStyleEv
     1122__ZNK7WebCore14FrameSelection17isInPasswordFieldEv
     1123__ZNK7WebCore14FrameSelection18isFocusedAndActiveEv
     1124__ZNK7WebCore14FrameSelection31getClippedVisibleTextRectanglesERN3WTF6VectorINS_9FloatRectELm0EEE
     1125__ZNK7WebCore14FrameSelection6boundsEb
    11201126__ZNK7WebCore14RenderListItem10markerTextEv
    11211127__ZNK7WebCore14ResourceHandle10connectionEv
     
    11581164__ZNK7WebCore19ResourceRequestBase6isNullEv
    11591165__ZNK7WebCore19ResourceRequestBase7isEmptyEv
    1160 __ZNK7WebCore19SelectionController11currentFormEv
    1161 __ZNK7WebCore19SelectionController15copyTypingStyleEv
    1162 __ZNK7WebCore19SelectionController17isInPasswordFieldEv
    1163 __ZNK7WebCore19SelectionController18isFocusedAndActiveEv
    1164 __ZNK7WebCore19SelectionController31getClippedVisibleTextRectanglesERN3WTF6VectorINS_9FloatRectELm0EEE
    1165 __ZNK7WebCore19SelectionController6boundsEb
    11661166__ZNK7WebCore20HTMLTableCellElement9cellAboveEv
    11671167__ZNK7WebCore20ResourceResponseBase14httpStatusCodeEv
  • trunk/Source/WebCore/WebCore.gypi

    r85850 r85864  
    574574            'editing/EditorInsertAction.h',
    575575            'editing/FindOptions.h',
     576            'editing/FrameSelection.h',
    576577            'editing/HTMLInterchange.h',
    577578            'editing/MoveSelectionCommand.h',
    578579            'editing/ReplaceSelectionCommand.h',
    579             'editing/SelectionController.h',
    580580            'editing/SmartReplace.h',
    581581            'editing/SpellChecker.h',
     
    26172617            'editing/FormatBlockCommand.cpp',
    26182618            'editing/FormatBlockCommand.h',
     2619            'editing/FrameSelection.cpp',
    26192620            'editing/HTMLInterchange.cpp',
    26202621            'editing/IndentOutdentCommand.cpp',
     
    26522653            'editing/ReplaceNodeWithSpanCommand.h',
    26532654            'editing/ReplaceSelectionCommand.cpp',
    2654             'editing/SelectionController.cpp',
    26552655            'editing/SetNodeAttributeCommand.cpp',
    26562656            'editing/SetNodeAttributeCommand.h',
     
    26852685            'editing/brew/EditorBrew.cpp',
    26862686            'editing/chromium/EditorChromium.cpp',
    2687             'editing/chromium/SelectionControllerChromium.cpp',
    2688             'editing/gtk/SelectionControllerGtk.cpp',
     2687            'editing/chromium/FrameSelectionChromium.cpp',
     2688            'editing/gtk/FrameSelectionGtk.cpp',
    26892689            'editing/haiku/EditorHaiku.cpp',
    26902690            'editing/htmlediting.cpp',
    26912691            'editing/mac/EditorMac.mm',
    2692             'editing/mac/SelectionControllerMac.mm',
     2692            'editing/mac/FrameSelectionMac.mm',
    26932693            'editing/markup.cpp',
    26942694            'editing/qt/EditorQt.cpp',
  • trunk/Source/WebCore/WebCore.pro

    r85853 r85864  
    573573    editing/EditorCommand.cpp \
    574574    editing/FormatBlockCommand.cpp \
     575    editing/FrameSelection.cpp \
    575576    editing/htmlediting.cpp \
    576577    editing/HTMLInterchange.cpp \
     
    594595    editing/ReplaceNodeWithSpanCommand.cpp \
    595596    editing/ReplaceSelectionCommand.cpp \
    596     editing/SelectionController.cpp \
    597597    editing/SetNodeAttributeCommand.cpp \
    598598    editing/SmartReplaceICU.cpp \
     
    15451545    editing/FindOptions.h \
    15461546    editing/FormatBlockCommand.h \
     1547    editing/FrameSelection.h \
    15471548    editing/htmlediting.h \
    15481549    editing/HTMLInterchange.h \
     
    15651566    editing/ReplaceNodeWithSpanCommand.h \
    15661567    editing/ReplaceSelectionCommand.h \
    1567     editing/SelectionController.h \
    15681568    editing/SetNodeAttributeCommand.h \
    15691569    editing/SmartReplace.h \
  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r85850 r85864  
    4886748867                        </File>
    4886848868                        <File
     48869                                RelativePath="..\editing\FrameSelection.cpp"
     48870                                >
     48871                                <FileConfiguration
     48872                                        Name="Debug|Win32"
     48873                                        ExcludedFromBuild="true"
     48874                                        >
     48875                                        <Tool
     48876                                                Name="VCCLCompilerTool"
     48877                                        />
     48878                                </FileConfiguration>
     48879                                <FileConfiguration
     48880                                        Name="Release|Win32"
     48881                                        ExcludedFromBuild="true"
     48882                                        >
     48883                                        <Tool
     48884                                                Name="VCCLCompilerTool"
     48885                                        />
     48886                                </FileConfiguration>
     48887                                <FileConfiguration
     48888                                        Name="Debug_Cairo_CFLite|Win32"
     48889                                        ExcludedFromBuild="true"
     48890                                        >
     48891                                        <Tool
     48892                                                Name="VCCLCompilerTool"
     48893                                        />
     48894                                </FileConfiguration>
     48895                                <FileConfiguration
     48896                                        Name="Release_Cairo_CFLite|Win32"
     48897                                        ExcludedFromBuild="true"
     48898                                        >
     48899                                        <Tool
     48900                                                Name="VCCLCompilerTool"
     48901                                        />
     48902                                </FileConfiguration>
     48903                                <FileConfiguration
     48904                                        Name="Debug_All|Win32"
     48905                                        ExcludedFromBuild="true"
     48906                                        >
     48907                                        <Tool
     48908                                                Name="VCCLCompilerTool"
     48909                                        />
     48910                                </FileConfiguration>
     48911                                <FileConfiguration
     48912                                        Name="Production|Win32"
     48913                                        ExcludedFromBuild="true"
     48914                                        >
     48915                                        <Tool
     48916                                                Name="VCCLCompilerTool"
     48917                                        />
     48918                                </FileConfiguration>
     48919                        </File>
     48920                        <File
     48921                                RelativePath="..\editing\FrameSelection.h"
     48922                                >
     48923                        </File>
     48924                        <File
    4886948925                                RelativePath="..\editing\htmlediting.cpp"
    4887048926                                >
     
    5003650092                        <File
    5003750093                                RelativePath="..\editing\ReplaceSelectionCommand.h"
    50038                                 >
    50039                         </File>
    50040                         <File
    50041                                 RelativePath="..\editing\SelectionController.cpp"
    50042                                 >
    50043                                 <FileConfiguration
    50044                                         Name="Debug|Win32"
    50045                                         ExcludedFromBuild="true"
    50046                                         >
    50047                                         <Tool
    50048                                                 Name="VCCLCompilerTool"
    50049                                         />
    50050                                 </FileConfiguration>
    50051                                 <FileConfiguration
    50052                                         Name="Release|Win32"
    50053                                         ExcludedFromBuild="true"
    50054                                         >
    50055                                         <Tool
    50056                                                 Name="VCCLCompilerTool"
    50057                                         />
    50058                                 </FileConfiguration>
    50059                                 <FileConfiguration
    50060                                         Name="Debug_Cairo_CFLite|Win32"
    50061                                         ExcludedFromBuild="true"
    50062                                         >
    50063                                         <Tool
    50064                                                 Name="VCCLCompilerTool"
    50065                                         />
    50066                                 </FileConfiguration>
    50067                                 <FileConfiguration
    50068                                         Name="Release_Cairo_CFLite|Win32"
    50069                                         ExcludedFromBuild="true"
    50070                                         >
    50071                                         <Tool
    50072                                                 Name="VCCLCompilerTool"
    50073                                         />
    50074                                 </FileConfiguration>
    50075                                 <FileConfiguration
    50076                                         Name="Debug_All|Win32"
    50077                                         ExcludedFromBuild="true"
    50078                                         >
    50079                                         <Tool
    50080                                                 Name="VCCLCompilerTool"
    50081                                         />
    50082                                 </FileConfiguration>
    50083                                 <FileConfiguration
    50084                                         Name="Production|Win32"
    50085                                         ExcludedFromBuild="true"
    50086                                         >
    50087                                         <Tool
    50088                                                 Name="VCCLCompilerTool"
    50089                                         />
    50090                                 </FileConfiguration>
    50091                         </File>
    50092                         <File
    50093                                 RelativePath="..\editing\SelectionController.h"
    5009450094                                >
    5009550095                        </File>
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r85850 r85864  
    11651165                4A0DA2FE129B241900AB61E1 /* FormAssociatedElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A0DA2FC129B241900AB61E1 /* FormAssociatedElement.cpp */; };
    11661166                4A0DA2FF129B241900AB61E1 /* FormAssociatedElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A0DA2FD129B241900AB61E1 /* FormAssociatedElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1167                 4A8C96EB0BE69032004EEFF0 /* SelectionControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A8C96EA0BE69032004EEFF0 /* SelectionControllerMac.mm */; };
     1167                4A8C96EB0BE69032004EEFF0 /* FrameSelectionMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A8C96EA0BE69032004EEFF0 /* FrameSelectionMac.mm */; };
    11681168                4ACBC0BE12713CBD0094F9B2 /* ClassList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ACBC0BC12713CBD0094F9B2 /* ClassList.cpp */; };
    11691169                4ACBC0BF12713CBD0094F9B2 /* ClassList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ACBC0BD12713CBD0094F9B2 /* ClassList.h */; };
     
    28182818                93309E09099E64920056E581 /* ReplaceSelectionCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DBA099E64910056E581 /* ReplaceSelectionCommand.cpp */; };
    28192819                93309E0A099E64920056E581 /* ReplaceSelectionCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DBB099E64910056E581 /* ReplaceSelectionCommand.h */; settings = {ATTRIBUTES = (Private, ); }; };
    2820                 93309E0D099E64920056E581 /* SelectionController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DBE099E64910056E581 /* SelectionController.cpp */; };
    2821                 93309E0E099E64920056E581 /* SelectionController.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DBF099E64910056E581 /* SelectionController.h */; settings = {ATTRIBUTES = (Private, ); }; };
     2820                93309E0D099E64920056E581 /* FrameSelection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DBE099E64910056E581 /* FrameSelection.cpp */; };
     2821                93309E0E099E64920056E581 /* FrameSelection.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DBF099E64910056E581 /* FrameSelection.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28222822                93309E0F099E64920056E581 /* SetNodeAttributeCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DC0099E64910056E581 /* SetNodeAttributeCommand.cpp */; };
    28232823                93309E10099E64920056E581 /* SetNodeAttributeCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DC1099E64910056E581 /* SetNodeAttributeCommand.h */; };
     
    76637663                4A0DA2FC129B241900AB61E1 /* FormAssociatedElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormAssociatedElement.cpp; sourceTree = "<group>"; };
    76647664                4A0DA2FD129B241900AB61E1 /* FormAssociatedElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormAssociatedElement.h; sourceTree = "<group>"; };
    7665                 4A8C96EA0BE69032004EEFF0 /* SelectionControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = SelectionControllerMac.mm; path = mac/SelectionControllerMac.mm; sourceTree = "<group>"; };
     7665                4A8C96EA0BE69032004EEFF0 /* FrameSelectionMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = FrameSelectionMac.mm; path = mac/FrameSelectionMac.mm; sourceTree = "<group>"; };
    76667666                4ACBC0BC12713CBD0094F9B2 /* ClassList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClassList.cpp; sourceTree = "<group>"; };
    76677667                4ACBC0BD12713CBD0094F9B2 /* ClassList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClassList.h; sourceTree = "<group>"; };
     
    93159315                93309DBA099E64910056E581 /* ReplaceSelectionCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReplaceSelectionCommand.cpp; sourceTree = "<group>"; };
    93169316                93309DBB099E64910056E581 /* ReplaceSelectionCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReplaceSelectionCommand.h; sourceTree = "<group>"; };
    9317                 93309DBE099E64910056E581 /* SelectionController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectionController.cpp; sourceTree = "<group>"; };
    9318                 93309DBF099E64910056E581 /* SelectionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectionController.h; sourceTree = "<group>"; };
     9317                93309DBE099E64910056E581 /* FrameSelection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameSelection.cpp; sourceTree = "<group>"; };
     9318                93309DBF099E64910056E581 /* FrameSelection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameSelection.h; sourceTree = "<group>"; };
    93199319                93309DC0099E64910056E581 /* SetNodeAttributeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetNodeAttributeCommand.cpp; sourceTree = "<group>"; };
    93209320                93309DC1099E64910056E581 /* SetNodeAttributeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetNodeAttributeCommand.h; sourceTree = "<group>"; };
     
    1547415474                                D05CED270A40BB2C00C5AF38 /* FormatBlockCommand.cpp */,
    1547515475                                D05CED280A40BB2C00C5AF38 /* FormatBlockCommand.h */,
     15476                                93309DBE099E64910056E581 /* FrameSelection.cpp */,
     15477                                93309DBF099E64910056E581 /* FrameSelection.h */,
    1547615478                                93309D98099E64910056E581 /* htmlediting.cpp */,
    1547715479                                93309D99099E64910056E581 /* htmlediting.h */,
     
    1551615518                                93309DBA099E64910056E581 /* ReplaceSelectionCommand.cpp */,
    1551715519                                93309DBB099E64910056E581 /* ReplaceSelectionCommand.h */,
    15518                                 93309DBE099E64910056E581 /* SelectionController.cpp */,
    15519                                 93309DBF099E64910056E581 /* SelectionController.h */,
    1552015520                                93309DC0099E64910056E581 /* SetNodeAttributeCommand.cpp */,
    1552115521                                93309DC1099E64910056E581 /* SetNodeAttributeCommand.h */,
     
    1867818678                        children = (
    1867918679                                ED501DC50B249F2900AE18D9 /* EditorMac.mm */,
    18680                                 4A8C96EA0BE69032004EEFF0 /* SelectionControllerMac.mm */,
     18680                                4A8C96EA0BE69032004EEFF0 /* FrameSelectionMac.mm */,
    1868118681                        );
    1868218682                        name = mac;
     
    2093020930                                658436860AE01B7400E53753 /* FrameLoadRequest.h in Headers */,
    2093120931                                628D214E12131EF40055DCFC /* FrameNetworkingContext.h in Headers */,
     20932                                93309E0E099E64920056E581 /* FrameSelection.h in Headers */,
    2093220933                                65A21485097A3F5300B9050A /* FrameTree.h in Headers */,
    2093320934                                65CBFEFA0974F607001DAC25 /* FrameView.h in Headers */,
     
    2216622167                                B2C3DA2F0D006C1D00EF6F26 /* SegmentedString.h in Headers */,
    2216722168                                084AEBE50FB505FA0038483E /* SelectElement.h in Headers */,
    22168                                 93309E0E099E64920056E581 /* SelectionController.h in Headers */,
    2216922169                                BC7FA6810D1F167900DB22A9 /* SelectorNodeList.h in Headers */,
    2217022170                                A75E497610752ACB00C9B896 /* SerializedScriptValue.h in Headers */,
     
    2374723747                                D000EBA211BDAFD400C47726 /* FrameLoaderStateMachine.cpp in Sources */,
    2374823748                                65BF02450974819000C43196 /* FrameMac.mm in Sources */,
     23749                                93309E0D099E64920056E581 /* FrameSelection.cpp in Sources */,
     23750                                4A8C96EB0BE69032004EEFF0 /* FrameSelectionMac.mm in Sources */,
    2374923751                                65A21484097A3F5300B9050A /* FrameTree.cpp in Sources */,
    2375023752                                65CBFEF90974F607001DAC25 /* FrameView.cpp in Sources */,
     
    2496324965                                B2C3DA2E0D006C1D00EF6F26 /* SegmentedString.cpp in Sources */,
    2496424966                                084AEBE40FB505FA0038483E /* SelectElement.cpp in Sources */,
    24965                                 93309E0D099E64920056E581 /* SelectionController.cpp in Sources */,
    24966                                 4A8C96EB0BE69032004EEFF0 /* SelectionControllerMac.mm in Sources */,
    2496724967                                BC7FA6820D1F167900DB22A9 /* SelectorNodeList.cpp in Sources */,
    2496824968                                A75E497710752ACB00C9B896 /* SerializedScriptValue.cpp in Sources */,
  • trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

    r85157 r85864  
    3636#include "Frame.h"
    3737#include "FrameLoader.h"
     38#include "FrameSelection.h"
    3839#include "LocalizedStrings.h"
    3940#include "NodeList.h"
     
    4849#include "RenderView.h"
    4950#include "RenderWidget.h"
    50 #include "SelectionController.h"
    5151#include "TextIterator.h"
    5252#include "htmlediting.h"
  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r85791 r85864  
    3737#include "Frame.h"
    3838#include "FrameLoader.h"
     39#include "FrameSelection.h"
    3940#include "HTMLAreaElement.h"
    4041#include "HTMLFormElement.h"
     
    7273#include "RenderWidget.h"
    7374#include "SelectElement.h"
    74 #include "SelectionController.h"
    7575#include "Text.h"
    7676#include "TextIterator.h"
     
    24402440    // starting at an empty line.  The resulting selection in that case
    24412441    // will be a caret at visiblePos.
    2442     SelectionController selection;
     2442    FrameSelection selection;
    24432443    selection.setSelection(VisibleSelection(visiblePos));
    2444     selection.modify(SelectionController::AlterationExtend, DirectionRight, LineBoundary);
     2444    selection.modify(FrameSelection::AlterationExtend, DirectionRight, LineBoundary);
    24452445   
    24462446    return VisiblePositionRange(selection.selection().visibleStart(), selection.selection().visibleEnd());
  • trunk/Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm

    r85036 r85864  
    4646#import "Frame.h"
    4747#import "FrameLoaderClient.h"
     48#import "FrameSelection.h"
    4849#import "HTMLAnchorElement.h"
    4950#import "HTMLAreaElement.h"
     
    5758#import "RenderWidget.h"
    5859#import "ScrollView.h"
    59 #import "SelectionController.h"
    6060#import "SimpleFontData.h"
    6161#import "TextCheckerClient.h"
  • trunk/Source/WebCore/bindings/objc/ExceptionHandlers.h

    r34956 r85864  
    4343    typedef int ExceptionCode;
    4444   
    45     class SelectionController;
     45    class FrameSelection;
    4646    class Range;
    4747
  • trunk/Source/WebCore/css/CSSStyleSelector.cpp

    r85834 r85864  
    5757#include "FontValue.h"
    5858#include "Frame.h"
     59#include "FrameSelection.h"
    5960#include "FrameView.h"
    6061#include "HTMLDocument.h"
     
    8485#include "ScaleTransformOperation.h"
    8586#include "SecurityOrigin.h"
    86 #include "SelectionController.h"
    8787#include "Settings.h"
    8888#include "ShadowData.h"
  • trunk/Source/WebCore/dom/ContainerNode.cpp

    r85650 r85864  
    803803    bool isEditorEnabled = false;
    804804    if (document()->frame() && document()->frame()->editor()->canEdit()) {
    805         SelectionController* selection = document()->frame()->selection();
     805        FrameSelection* selection = document()->frame()->selection();
    806806        Element* root = selection ? selection->rootEditableElement() : 0;
    807807        isEditorEnabled = root && isDescendantOf(root);
  • trunk/Source/WebCore/dom/Document.cpp

    r85785 r85864  
    7070#include "FrameLoader.h"
    7171#include "FrameLoaderClient.h"
     72#include "FrameSelection.h"
    7273#include "FrameTree.h"
    7374#include "FrameView.h"
     
    132133#include "SecurityOrigin.h"
    133134#include "SegmentedString.h"
    134 #include "SelectionController.h"
    135135#include "Settings.h"
    136136#include "ShadowRoot.h"
  • trunk/Source/WebCore/dom/InputElement.cpp

    r83016 r85864  
    3939#include "EventNames.h"
    4040#include "Frame.h"
     41#include "FrameSelection.h"
    4142#include "Page.h"
    4243#include "RenderTextControlSingleLine.h"
    43 #include "SelectionController.h"
    4444#include "TextIterator.h"
    4545
  • trunk/Source/WebCore/editing/DeleteButtonController.cpp

    r82946 r85864  
    3636#include "Editor.h"
    3737#include "Frame.h"
     38#include "FrameSelection.h"
    3839#include "htmlediting.h"
    3940#include "HTMLDivElement.h"
     
    4445#include "RemoveNodeCommand.h"
    4546#include "RenderBox.h"
    46 #include "SelectionController.h"
    4747
    4848namespace WebCore {
  • trunk/Source/WebCore/editing/EditCommand.cpp

    r84433 r85864  
    3434#include "EventNames.h"
    3535#include "Frame.h"
     36#include "FrameSelection.h"
    3637#include "ScopedEventQueue.h"
    37 #include "SelectionController.h"
    3838#include "VisiblePosition.h"
    3939#include "htmlediting.h"
  • trunk/Source/WebCore/editing/EditingAllInOne.cpp

    r83344 r85864  
    4141#include <EditorCommand.cpp>
    4242#include <FormatBlockCommand.cpp>
     43#include <FrameSelection.cpp>
    4344#include <HTMLInterchange.cpp>
    4445#include <IndentOutdentCommand.cpp>
     
    6061#include <ReplaceNodeWithSpanCommand.cpp>
    6162#include <ReplaceSelectionCommand.cpp>
    62 #include <SelectionController.cpp>
    6363#include <SetNodeAttributeCommand.cpp>
    6464#include <SmartReplace.cpp>
  • trunk/Source/WebCore/editing/EditingStyle.cpp

    r83618 r85864  
    3636#include "CSSValueList.h"
    3737#include "Frame.h"
     38#include "FrameSelection.h"
    3839#include "HTMLFontElement.h"
    3940#include "HTMLNames.h"
     
    4142#include "Position.h"
    4243#include "RenderStyle.h"
    43 #include "SelectionController.h"
    4444#include "StyledElement.h"
    4545#include "htmlediting.h"
  • trunk/Source/WebCore/editing/Editor.cpp

    r85036 r85864  
    238238    if (imageElementFromImageDocument(m_frame->document()))
    239239        return true;
    240     SelectionController* selection = m_frame->selection();
     240    FrameSelection* selection = m_frame->selection();
    241241    return selection->isRange() && !selection->isInPasswordField();
    242242}
     
    249249bool Editor::canDelete() const
    250250{
    251     SelectionController* selection = m_frame->selection();
     251    FrameSelection* selection = m_frame->selection();
    252252    return selection->isRange() && selection->rootEditableElement();
    253253}
     
    20332033        // Reset the charet one character further.
    20342034        frame()->selection()->moveTo(frame()->selection()->end());
    2035         frame()->selection()->modify(SelectionController::AlterationMove, DirectionForward, CharacterGranularity);
     2035        frame()->selection()->modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity);
    20362036    }
    20372037
     
    22972297            m_frame->selection()->moveTo(selectionRange->endPosition(), DOWNSTREAM);
    22982298            if (adjustSelectionForParagraphBoundaries)
    2299                 m_frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, CharacterGranularity);
     2299                m_frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity);
    23002300        } else {
    23012301            // If this fails for any reason, the fallback is to go one position beyond the last replacement
    23022302            m_frame->selection()->moveTo(m_frame->selection()->end());
    2303             m_frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, CharacterGranularity);
     2303            m_frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity);
    23042304        }
    23052305    }
     
    27152715    bool selectionDidNotChangeDOMPosition = newSelection == m_frame->selection()->selection();
    27162716    if (selectionDidNotChangeDOMPosition || m_frame->selection()->shouldChangeSelection(newSelection)) {
    2717         SelectionController::SetSelectionOptions options = 0;
     2717        FrameSelection::SetSelectionOptions options = 0;
    27182718        if (closeTyping)
    2719             options |= SelectionController::CloseTyping;
     2719            options |= FrameSelection::CloseTyping;
    27202720        if (clearTypingStyle)
    2721             options |= SelectionController::ClearTypingStyle;
     2721            options |= FrameSelection::ClearTypingStyle;
    27222722        m_frame->selection()->setSelection(newSelection, options);
    27232723    }
     
    27272727    // <div contentEditable="true"><div>^Hello</div></div>
    27282728    // WebCore inserts <div><br></div> *before* the current block, which correctly moves the paragraph down but which doesn't
    2729     // change the caret's DOM position (["hello", 0]).  In these situations the above SelectionController::setSelection call
     2729    // change the caret's DOM position (["hello", 0]). In these situations the above FrameSelection::setSelection call
    27302730    // does not call EditorClient::respondToChangedSelection(), which, on the Mac, sends selection change notifications and
    27312731    // starts a new kill ring sequence, but we want to do these things (matches AppKit).
     
    31353135}
    31363136
    3137 void Editor::respondToChangedSelection(const VisibleSelection& oldSelection, SelectionController::SetSelectionOptions options)
     3137void Editor::respondToChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions options)
    31383138{
    31393139    m_spellingCorrector->stopPendingCorrection(oldSelection);
    31403140
    3141     bool closeTyping = options & SelectionController::CloseTyping;
     3141    bool closeTyping = options & FrameSelection::CloseTyping;
    31423142    bool isContinuousSpellCheckingEnabled = this->isContinuousSpellCheckingEnabled();
    31433143    bool isContinuousGrammarCheckingEnabled = isContinuousSpellCheckingEnabled && isGrammarCheckingEnabled();
     
    31543154
    31553155        // Don't check spelling and grammar if the change of selection is triggered by spelling correction itself.
    3156         bool shouldCheckSpellingAndGrammar = !(options & SelectionController::SpellCorrectionTriggered);
     3156        bool shouldCheckSpellingAndGrammar = !(options & FrameSelection::SpellCorrectionTriggered);
    31573157
    31583158        // When typing we check spelling elsewhere, so don't redo it here.
  • trunk/Source/WebCore/editing/Editor.h

    r85442 r85864  
    3535#include "EditorInsertAction.h"
    3636#include "FindOptions.h"
    37 #include "SelectionController.h"
     37#include "FrameSelection.h"
    3838#include "TextChecking.h"
    3939#include "VisibleSelection.h"
     
    356356    IntRect firstRectForRange(Range*) const;
    357357
    358     void respondToChangedSelection(const VisibleSelection& oldSelection, SelectionController::SetSelectionOptions);
     358    void respondToChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions);
    359359    bool shouldChangeSelection(const VisibleSelection& oldSelection, const VisibleSelection& newSelection, EAffinity, bool stillSelecting) const;
    360360
  • trunk/Source/WebCore/editing/EditorCommand.cpp

    r84574 r85864  
    377377    RefPtr<Range> mark = frame->editor()->mark().toNormalizedRange();
    378378    if (mark) {
    379         SelectionController* selection = frame->selection();
     379        FrameSelection* selection = frame->selection();
    380380        bool selected = selection->setSelectedRange(unionDOMRanges(mark.get(), frame->editor()->selectedRange().get()).get(), DOWNSTREAM, true);
    381381        ASSERT(selected);
     
    607607static bool executeMoveBackward(Frame* frame, Event*, EditorCommandSource, const String&)
    608608{
    609     frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, CharacterGranularity, true);
     609    frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, CharacterGranularity, true);
    610610    return true;
    611611}
     
    613613static bool executeMoveBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    614614{
    615     frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, CharacterGranularity, true);
     615    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, CharacterGranularity, true);
    616616    return true;
    617617}
     
    619619static bool executeMoveDown(Frame* frame, Event*, EditorCommandSource, const String&)
    620620{
    621     return frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, LineGranularity, true);
     621    return frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, LineGranularity, true);
    622622}
    623623
    624624static bool executeMoveDownAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    625625{
    626     frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, LineGranularity, true);
     626    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, LineGranularity, true);
    627627    return true;
    628628}
     
    630630static bool executeMoveForward(Frame* frame, Event*, EditorCommandSource, const String&)
    631631{
    632     frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, CharacterGranularity, true);
     632    frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity, true);
    633633    return true;
    634634}
     
    636636static bool executeMoveForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    637637{
    638     frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, CharacterGranularity, true);
     638    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, CharacterGranularity, true);
    639639    return true;
    640640}
     
    642642static bool executeMoveLeft(Frame* frame, Event*, EditorCommandSource, const String&)
    643643{
    644     return frame->selection()->modify(SelectionController::AlterationMove, DirectionLeft, CharacterGranularity, true);
     644    return frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, CharacterGranularity, true);
    645645}
    646646
    647647static bool executeMoveLeftAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    648648{
    649     frame->selection()->modify(SelectionController::AlterationExtend, DirectionLeft, CharacterGranularity, true);
     649    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, CharacterGranularity, true);
    650650    return true;
    651651}
     
    656656    if (!distance)
    657657        return false;
    658     return frame->selection()->modify(SelectionController::AlterationMove, distance, true, SelectionController::AlignCursorOnScrollAlways);
     658    return frame->selection()->modify(FrameSelection::AlterationMove, distance, true, FrameSelection::AlignCursorOnScrollAlways);
    659659}
    660660
     
    664664    if (!distance)
    665665        return false;
    666     return frame->selection()->modify(SelectionController::AlterationExtend, distance, true, SelectionController::AlignCursorOnScrollAlways);
     666    return frame->selection()->modify(FrameSelection::AlterationExtend, distance, true, FrameSelection::AlignCursorOnScrollAlways);
    667667}
    668668
     
    672672    if (!distance)
    673673        return false;
    674     return frame->selection()->modify(SelectionController::AlterationMove, -distance, true, SelectionController::AlignCursorOnScrollAlways);
     674    return frame->selection()->modify(FrameSelection::AlterationMove, -distance, true, FrameSelection::AlignCursorOnScrollAlways);
    675675}
    676676
     
    680680    if (!distance)
    681681        return false;
    682     return frame->selection()->modify(SelectionController::AlterationExtend, -distance, true, SelectionController::AlignCursorOnScrollAlways);
     682    return frame->selection()->modify(FrameSelection::AlterationExtend, -distance, true, FrameSelection::AlignCursorOnScrollAlways);
    683683}
    684684
    685685static bool executeMoveRight(Frame* frame, Event*, EditorCommandSource, const String&)
    686686{
    687     return frame->selection()->modify(SelectionController::AlterationMove, DirectionRight, CharacterGranularity, true);
     687    return frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, CharacterGranularity, true);
    688688}
    689689
    690690static bool executeMoveRightAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    691691{
    692     frame->selection()->modify(SelectionController::AlterationExtend, DirectionRight, CharacterGranularity, true);
     692    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, CharacterGranularity, true);
    693693    return true;
    694694}
     
    696696static bool executeMoveToBeginningOfDocument(Frame* frame, Event*, EditorCommandSource, const String&)
    697697{
    698     frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, DocumentBoundary, true);
     698    frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, DocumentBoundary, true);
    699699    return true;
    700700}
     
    702702static bool executeMoveToBeginningOfDocumentAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    703703{
    704     frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, DocumentBoundary, true);
     704    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, DocumentBoundary, true);
    705705    return true;
    706706}
     
    708708static bool executeMoveToBeginningOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    709709{
    710     frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, LineBoundary, true);
     710    frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, LineBoundary, true);
    711711    return true;
    712712}
     
    714714static bool executeMoveToBeginningOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    715715{
    716     frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, LineBoundary, true);
     716    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, LineBoundary, true);
    717717    return true;
    718718}
     
    720720static bool executeMoveToBeginningOfParagraph(Frame* frame, Event*, EditorCommandSource, const String&)
    721721{
    722     frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, ParagraphBoundary, true);
     722    frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, ParagraphBoundary, true);
    723723    return true;
    724724}
     
    726726static bool executeMoveToBeginningOfParagraphAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    727727{
    728     frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, ParagraphBoundary, true);
     728    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, ParagraphBoundary, true);
    729729    return true;
    730730}
     
    732732static bool executeMoveToBeginningOfSentence(Frame* frame, Event*, EditorCommandSource, const String&)
    733733{
    734     frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, SentenceBoundary, true);
     734    frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, SentenceBoundary, true);
    735735    return true;
    736736}
     
    738738static bool executeMoveToBeginningOfSentenceAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    739739{
    740     frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, SentenceBoundary, true);
     740    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, SentenceBoundary, true);
    741741    return true;
    742742}
     
    744744static bool executeMoveToEndOfDocument(Frame* frame, Event*, EditorCommandSource, const String&)
    745745{
    746     frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, DocumentBoundary, true);
     746    frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, DocumentBoundary, true);
    747747    return true;
    748748}
     
    750750static bool executeMoveToEndOfDocumentAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    751751{
    752     frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, DocumentBoundary, true);
     752    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, DocumentBoundary, true);
    753753    return true;
    754754}
     
    756756static bool executeMoveToEndOfSentence(Frame* frame, Event*, EditorCommandSource, const String&)
    757757{
    758     frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, SentenceBoundary, true);
     758    frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, SentenceBoundary, true);
    759759    return true;
    760760}
     
    762762static bool executeMoveToEndOfSentenceAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    763763{
    764     frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, SentenceBoundary, true);
     764    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, SentenceBoundary, true);
    765765    return true;
    766766}
     
    768768static bool executeMoveToEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    769769{
    770     frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, LineBoundary, true);
     770    frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, LineBoundary, true);
    771771    return true;
    772772}
     
    774774static bool executeMoveToEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    775775{
    776     frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, LineBoundary, true);
     776    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, LineBoundary, true);
    777777    return true;
    778778}
     
    780780static bool executeMoveToEndOfParagraph(Frame* frame, Event*, EditorCommandSource, const String&)
    781781{
    782     frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, ParagraphBoundary, true);
     782    frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, ParagraphBoundary, true);
    783783    return true;
    784784}
     
    786786static bool executeMoveToEndOfParagraphAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    787787{
    788     frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, ParagraphBoundary, true);
     788    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, ParagraphBoundary, true);
    789789    return true;
    790790}
     
    792792static bool executeMoveParagraphBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    793793{
    794     frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, ParagraphGranularity, true);
     794    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, ParagraphGranularity, true);
    795795    return true;
    796796}
     
    798798static bool executeMoveParagraphForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    799799{
    800     frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, ParagraphGranularity, true);
     800    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, ParagraphGranularity, true);
    801801    return true;
    802802}
     
    804804static bool executeMoveUp(Frame* frame, Event*, EditorCommandSource, const String&)
    805805{
    806     return frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, LineGranularity, true);
     806    return frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, LineGranularity, true);
    807807}
    808808
    809809static bool executeMoveUpAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    810810{
    811     frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, LineGranularity, true);
     811    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, LineGranularity, true);
    812812    return true;
    813813}
     
    815815static bool executeMoveWordBackward(Frame* frame, Event*, EditorCommandSource, const String&)
    816816{
    817     frame->selection()->modify(SelectionController::AlterationMove, DirectionBackward, WordGranularity, true);
     817    frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, WordGranularity, true);
    818818    return true;
    819819}
     
    821821static bool executeMoveWordBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    822822{
    823     frame->selection()->modify(SelectionController::AlterationExtend, DirectionBackward, WordGranularity, true);
     823    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, WordGranularity, true);
    824824    return true;
    825825}
     
    827827static bool executeMoveWordForward(Frame* frame, Event*, EditorCommandSource, const String&)
    828828{
    829     frame->selection()->modify(SelectionController::AlterationMove, DirectionForward, WordGranularity, true);
     829    frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, WordGranularity, true);
    830830    return true;
    831831}
     
    833833static bool executeMoveWordForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    834834{
    835     frame->selection()->modify(SelectionController::AlterationExtend, DirectionForward, WordGranularity, true);
     835    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, WordGranularity, true);
    836836    return true;
    837837}
     
    839839static bool executeMoveWordLeft(Frame* frame, Event*, EditorCommandSource, const String&)
    840840{
    841     frame->selection()->modify(SelectionController::AlterationMove, DirectionLeft, WordGranularity, true);
     841    frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, WordGranularity, true);
    842842    return true;
    843843}
     
    845845static bool executeMoveWordLeftAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    846846{
    847     frame->selection()->modify(SelectionController::AlterationExtend, DirectionLeft, WordGranularity, true);
     847    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, WordGranularity, true);
    848848    return true;
    849849}
     
    851851static bool executeMoveWordRight(Frame* frame, Event*, EditorCommandSource, const String&)
    852852{
    853     frame->selection()->modify(SelectionController::AlterationMove, DirectionRight, WordGranularity, true);
     853    frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, WordGranularity, true);
    854854    return true;
    855855}
     
    857857static bool executeMoveWordRightAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    858858{
    859     frame->selection()->modify(SelectionController::AlterationExtend, DirectionRight, WordGranularity, true);
     859    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, WordGranularity, true);
    860860    return true;
    861861}
     
    863863static bool executeMoveToLeftEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    864864{
    865     frame->selection()->modify(SelectionController::AlterationMove, DirectionLeft, LineBoundary, true);
     865    frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, LineBoundary, true);
    866866    return true;
    867867}
     
    869869static bool executeMoveToLeftEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    870870{
    871     frame->selection()->modify(SelectionController::AlterationExtend, DirectionLeft, LineBoundary, true);
     871    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, LineBoundary, true);
    872872    return true;
    873873}
     
    875875static bool executeMoveToRightEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&)
    876876{
    877     frame->selection()->modify(SelectionController::AlterationMove, DirectionRight, LineBoundary, true);
     877    frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, LineBoundary, true);
    878878    return true;
    879879}
     
    881881static bool executeMoveToRightEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&)
    882882{
    883     frame->selection()->modify(SelectionController::AlterationExtend, DirectionRight, LineBoundary, true);
     883    frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, LineBoundary, true);
    884884    return true;
    885885}
  • trunk/Source/WebCore/editing/FrameSelection.cpp

    r85863 r85864  
    2525 
    2626#include "config.h"
    27 #include "SelectionController.h"
     27#include "FrameSelection.h"
    2828
    2929#include "CharacterData.h"
     
    7171const int NoXPosForVerticalArrowNavigation = INT_MIN;
    7272
    73 SelectionController::SelectionController(Frame* frame, bool isDragCaretController)
     73FrameSelection::FrameSelection(Frame* frame, bool isDragCaretController)
    7474    : m_frame(frame)
    7575    , m_xPosForVerticalArrowNavigation(NoXPosForVerticalArrowNavigation)
    7676    , m_granularity(CharacterGranularity)
    77     , m_caretBlinkTimer(this, &SelectionController::caretBlinkTimerFired)
     77    , m_caretBlinkTimer(this, &FrameSelection::caretBlinkTimerFired)
    7878    , m_caretRectNeedsUpdate(true)
    7979    , m_absCaretBoundsDirty(true)
     
    8787}
    8888
    89 void SelectionController::moveTo(const VisiblePosition &pos, bool userTriggered, CursorAlignOnScroll align)
     89void FrameSelection::moveTo(const VisiblePosition &pos, bool userTriggered, CursorAlignOnScroll align)
    9090{
    9191    SetSelectionOptions options = CloseTyping | ClearTypingStyle;
     
    9595}
    9696
    97 void SelectionController::moveTo(const VisiblePosition &base, const VisiblePosition &extent, bool userTriggered)
     97void FrameSelection::moveTo(const VisiblePosition &base, const VisiblePosition &extent, bool userTriggered)
    9898{
    9999    SetSelectionOptions options = CloseTyping | ClearTypingStyle;
     
    103103}
    104104
    105 void SelectionController::moveTo(const Position &pos, EAffinity affinity, bool userTriggered)
     105void FrameSelection::moveTo(const Position &pos, EAffinity affinity, bool userTriggered)
    106106{
    107107    SetSelectionOptions options = CloseTyping | ClearTypingStyle;
     
    111111}
    112112
    113 void SelectionController::moveTo(const Range *r, EAffinity affinity, bool userTriggered)
     113void FrameSelection::moveTo(const Range *r, EAffinity affinity, bool userTriggered)
    114114{
    115115    SetSelectionOptions options = CloseTyping | ClearTypingStyle;
     
    120120}
    121121
    122 void SelectionController::moveTo(const Position &base, const Position &extent, EAffinity affinity, bool userTriggered)
     122void FrameSelection::moveTo(const Position &base, const Position &extent, EAffinity affinity, bool userTriggered)
    123123{
    124124    SetSelectionOptions options = CloseTyping | ClearTypingStyle;
     
    128128}
    129129
    130 void SelectionController::setSelection(const VisibleSelection& s, SetSelectionOptions options, CursorAlignOnScroll align, TextGranularity granularity, DirectionalityPolicy directionalityPolicy)
     130void FrameSelection::setSelection(const VisibleSelection& s, SetSelectionOptions options, CursorAlignOnScroll align, TextGranularity granularity, DirectionalityPolicy directionalityPolicy)
    131131{
    132132    m_granularity = granularity;
     
    151151    }
    152152
    153     // <http://bugs.webkit.org/show_bug.cgi?id=23464>: Infinite recursion at SelectionController::setSelection
     153    // <http://bugs.webkit.org/show_bug.cgi?id=23464>: Infinite recursion at FrameSelection::setSelection
    154154    // if document->frame() == m_frame we can get into an infinite loop
    155155    if (s.base().anchorNode()) {
     
    220220}
    221221
    222 void SelectionController::nodeWillBeRemoved(Node *node)
     222void FrameSelection::nodeWillBeRemoved(Node *node)
    223223{
    224224    if (isNone())
     
    234234}
    235235
    236 void SelectionController::respondToNodeModification(Node* node, bool baseRemoved, bool extentRemoved, bool startRemoved, bool endRemoved)
     236void FrameSelection::respondToNodeModification(Node* node, bool baseRemoved, bool extentRemoved, bool startRemoved, bool endRemoved)
    237237{
    238238    bool clearRenderTreeSelection = false;
     
    296296}
    297297
    298 void SelectionController::textWillBeReplaced(CharacterData* node, unsigned offset, unsigned oldLength, unsigned newLength)
     298void FrameSelection::textWillBeReplaced(CharacterData* node, unsigned offset, unsigned oldLength, unsigned newLength)
    299299{
    300300    // The fragment check is a performance optimization. See http://trac.webkit.org/changeset/30062.
     
    330330}
    331331
    332 void SelectionController::setIsDirectional(bool isDirectional)
     332void FrameSelection::setIsDirectional(bool isDirectional)
    333333{
    334334    m_isDirectional = !m_frame || m_frame->editor()->behavior().shouldConsiderSelectionAsDirectional() || isDirectional;
    335335}
    336336
    337 TextDirection SelectionController::directionOfEnclosingBlock()
     337TextDirection FrameSelection::directionOfEnclosingBlock()
    338338{
    339339    return WebCore::directionOfEnclosingBlock(m_selection.extent());
    340340}
    341341
    342 void SelectionController::willBeModified(EAlteration alter, SelectionDirection direction)
     342void FrameSelection::willBeModified(EAlteration alter, SelectionDirection direction)
    343343{
    344344    if (alter != AlterationExtend)
     
    389389}
    390390
    391 VisiblePosition SelectionController::positionForPlatform(bool isGetStart) const
     391VisiblePosition FrameSelection::positionForPlatform(bool isGetStart) const
    392392{
    393393    Settings* settings = m_frame ? m_frame->settings() : 0;
     
    402402}
    403403
    404 VisiblePosition SelectionController::startForPlatform() const
     404VisiblePosition FrameSelection::startForPlatform() const
    405405{
    406406    return positionForPlatform(true);
    407407}
    408408
    409 VisiblePosition SelectionController::endForPlatform() const
     409VisiblePosition FrameSelection::endForPlatform() const
    410410{
    411411    return positionForPlatform(false);
    412412}
    413413
    414 VisiblePosition SelectionController::modifyExtendingRight(TextGranularity granularity)
     414VisiblePosition FrameSelection::modifyExtendingRight(TextGranularity granularity)
    415415{
    416416    VisiblePosition pos(m_selection.extent(), m_selection.affinity());
     
    455455}
    456456
    457 VisiblePosition SelectionController::modifyExtendingForward(TextGranularity granularity)
     457VisiblePosition FrameSelection::modifyExtendingForward(TextGranularity granularity)
    458458{
    459459    VisiblePosition pos(m_selection.extent(), m_selection.affinity());
     
    497497}
    498498
    499 VisiblePosition SelectionController::modifyMovingRight(TextGranularity granularity)
     499VisiblePosition FrameSelection::modifyMovingRight(TextGranularity granularity)
    500500{
    501501    VisiblePosition pos;
     
    530530}
    531531
    532 VisiblePosition SelectionController::modifyMovingForward(TextGranularity granularity)
     532VisiblePosition FrameSelection::modifyMovingForward(TextGranularity granularity)
    533533{
    534534    VisiblePosition pos;
     
    580580}
    581581
    582 VisiblePosition SelectionController::modifyExtendingLeft(TextGranularity granularity)
     582VisiblePosition FrameSelection::modifyExtendingLeft(TextGranularity granularity)
    583583{
    584584    VisiblePosition pos(m_selection.extent(), m_selection.affinity());
     
    622622}
    623623       
    624 VisiblePosition SelectionController::modifyExtendingBackward(TextGranularity granularity)
     624VisiblePosition FrameSelection::modifyExtendingBackward(TextGranularity granularity)
    625625{
    626626    VisiblePosition pos(m_selection.extent(), m_selection.affinity());
     
    668668}
    669669
    670 VisiblePosition SelectionController::modifyMovingLeft(TextGranularity granularity)
     670VisiblePosition FrameSelection::modifyMovingLeft(TextGranularity granularity)
    671671{
    672672    VisiblePosition pos;
     
    701701}
    702702
    703 VisiblePosition SelectionController::modifyMovingBackward(TextGranularity granularity)
     703VisiblePosition FrameSelection::modifyMovingBackward(TextGranularity granularity)
    704704{
    705705    VisiblePosition pos;
     
    750750}   
    751751
    752 bool SelectionController::modify(EAlteration alter, SelectionDirection direction, TextGranularity granularity, bool userTriggered)
     752bool FrameSelection::modify(EAlteration alter, SelectionDirection direction, TextGranularity granularity, bool userTriggered)
    753753{
    754754    if (userTriggered) {
    755         SelectionController trialSelectionController;
    756         trialSelectionController.setSelection(m_selection);
    757         trialSelectionController.setIsDirectional(m_isDirectional);
    758         trialSelectionController.modify(alter, direction, granularity, false);
    759 
    760         bool change = shouldChangeSelection(trialSelectionController.selection());
     755        FrameSelection trialFrameSelection;
     756        trialFrameSelection.setSelection(m_selection);
     757        trialFrameSelection.setIsDirectional(m_isDirectional);
     758        trialFrameSelection.modify(alter, direction, granularity, false);
     759
     760        bool change = shouldChangeSelection(trialFrameSelection.selection());
    761761        if (!change)
    762762            return false;
     
    851851}
    852852
    853 bool SelectionController::modify(EAlteration alter, int verticalDistance, bool userTriggered, CursorAlignOnScroll align)
     853bool FrameSelection::modify(EAlteration alter, int verticalDistance, bool userTriggered, CursorAlignOnScroll align)
    854854{
    855855    if (!verticalDistance)
     
    857857
    858858    if (userTriggered) {
    859         SelectionController trialSelectionController;
    860         trialSelectionController.setSelection(m_selection);
    861         trialSelectionController.setIsDirectional(m_isDirectional);
    862         trialSelectionController.modify(alter, verticalDistance, false);
    863 
    864         bool change = shouldChangeSelection(trialSelectionController.selection());
     859        FrameSelection trialFrameSelection;
     860        trialFrameSelection.setSelection(m_selection);
     861        trialFrameSelection.setIsDirectional(m_isDirectional);
     862        trialFrameSelection.modify(alter, verticalDistance, false);
     863
     864        bool change = shouldChangeSelection(trialFrameSelection.selection());
    865865        if (!change)
    866866            return false;
     
    934934}
    935935
    936 int SelectionController::xPosForVerticalArrowNavigation(EPositionType type)
     936int FrameSelection::xPosForVerticalArrowNavigation(EPositionType type)
    937937{
    938938    int x = 0;
     
    973973}
    974974
    975 void SelectionController::clear()
     975void FrameSelection::clear()
    976976{
    977977    m_granularity = CharacterGranularity;
     
    979979}
    980980
    981 void SelectionController::setStart(const VisiblePosition &pos, bool userTriggered)
     981void FrameSelection::setStart(const VisiblePosition &pos, bool userTriggered)
    982982{
    983983    if (m_selection.isBaseFirst())
     
    987987}
    988988
    989 void SelectionController::setEnd(const VisiblePosition &pos, bool userTriggered)
     989void FrameSelection::setEnd(const VisiblePosition &pos, bool userTriggered)
    990990{
    991991    if (m_selection.isBaseFirst())
     
    995995}
    996996
    997 void SelectionController::setBase(const VisiblePosition &pos, bool userTriggered)
     997void FrameSelection::setBase(const VisiblePosition &pos, bool userTriggered)
    998998{
    999999    SetSelectionOptions options = CloseTyping | ClearTypingStyle;
     
    10031003}
    10041004
    1005 void SelectionController::setExtent(const VisiblePosition &pos, bool userTriggered)
     1005void FrameSelection::setExtent(const VisiblePosition &pos, bool userTriggered)
    10061006{
    10071007    SetSelectionOptions options = CloseTyping | ClearTypingStyle;
     
    10111011}
    10121012
    1013 void SelectionController::setBase(const Position &pos, EAffinity affinity, bool userTriggered)
     1013void FrameSelection::setBase(const Position &pos, EAffinity affinity, bool userTriggered)
    10141014{
    10151015    SetSelectionOptions options = CloseTyping | ClearTypingStyle;
     
    10191019}
    10201020
    1021 void SelectionController::setExtent(const Position &pos, EAffinity affinity, bool userTriggered)
     1021void FrameSelection::setExtent(const Position &pos, EAffinity affinity, bool userTriggered)
    10221022{
    10231023    SetSelectionOptions options = CloseTyping | ClearTypingStyle;
     
    10271027}
    10281028
    1029 void SelectionController::setCaretRectNeedsUpdate(bool flag)
     1029void FrameSelection::setCaretRectNeedsUpdate(bool flag)
    10301030{
    10311031    m_caretRectNeedsUpdate = flag;
    10321032}
    10331033
    1034 void SelectionController::updateCaretRect()
     1034void FrameSelection::updateCaretRect()
    10351035{
    10361036    if (isNone() || !m_selection.start().anchorNode()->inDocument() || !m_selection.end().anchorNode()->inDocument()) {
     
    10781078}
    10791079
    1080 RenderObject* SelectionController::caretRenderer() const
     1080RenderObject* FrameSelection::caretRenderer() const
    10811081{
    10821082    Node* node = m_selection.start().deprecatedNode();
     
    10931093}
    10941094
    1095 IntRect SelectionController::localCaretRect()
     1095IntRect FrameSelection::localCaretRect()
    10961096{
    10971097    if (m_caretRectNeedsUpdate)
     
    11011101}
    11021102
    1103 IntRect SelectionController::absoluteBoundsForLocalRect(const IntRect& rect) const
     1103IntRect FrameSelection::absoluteBoundsForLocalRect(const IntRect& rect) const
    11041104{
    11051105    RenderObject* caretPainter = caretRenderer();
     
    11131113}
    11141114
    1115 IntRect SelectionController::absoluteCaretBounds()
     1115IntRect FrameSelection::absoluteCaretBounds()
    11161116{
    11171117    recomputeCaretRect();
     
    11291129}
    11301130
    1131 IntRect SelectionController::caretRepaintRect() const
     1131IntRect FrameSelection::caretRepaintRect() const
    11321132{
    11331133    return absoluteBoundsForLocalRect(repaintRectForCaret(localCaretRectForPainting()));
    11341134}
    11351135
    1136 bool SelectionController::recomputeCaretRect()
     1136bool FrameSelection::recomputeCaretRect()
    11371137{
    11381138    if (!m_caretRectNeedsUpdate)
     
    11741174}
    11751175
    1176 bool SelectionController::shouldRepaintCaret(const RenderView* view) const
     1176bool FrameSelection::shouldRepaintCaret(const RenderView* view) const
    11771177{
    11781178    ASSERT(view);
     
    11821182}
    11831183
    1184 void SelectionController::invalidateCaretRect()
     1184void FrameSelection::invalidateCaretRect()
    11851185{
    11861186    if (!isCaret())
     
    12131213}
    12141214
    1215 void SelectionController::paintCaret(GraphicsContext* context, int tx, int ty, const IntRect& clipRect)
     1215void FrameSelection::paintCaret(GraphicsContext* context, int tx, int ty, const IntRect& clipRect)
    12161216{
    12171217#if ENABLE(TEXT_CARET)
     
    12481248}
    12491249
    1250 void SelectionController::debugRenderer(RenderObject *r, bool selected) const
     1250void FrameSelection::debugRenderer(RenderObject *r, bool selected) const
    12511251{
    12521252    if (r->node()->isElementNode()) {
     
    13131313}
    13141314
    1315 bool SelectionController::contains(const IntPoint& point)
     1315bool FrameSelection::contains(const IntPoint& point)
    13161316{
    13171317    Document* document = m_frame->document();
     
    13501350// for the focus to move to another frame. So instead we call it from places where we are selecting with the
    13511351// mouse or the keyboard after setting the selection.
    1352 void SelectionController::selectFrameElementInParentIfFullySelected()
     1352void FrameSelection::selectFrameElementInParentIfFullySelected()
    13531353{
    13541354    // Find the parent frame; if there is none, then we have nothing to do.
     
    13931393}
    13941394
    1395 void SelectionController::selectAll()
     1395void FrameSelection::selectAll()
    13961396{
    13971397    Document* document = m_frame->document();
     
    14191419}
    14201420
    1421 bool SelectionController::setSelectedRange(Range* range, EAffinity affinity, bool closeTyping)
     1421bool FrameSelection::setSelectedRange(Range* range, EAffinity affinity, bool closeTyping)
    14221422{
    14231423    if (!range)
     
    14631463}
    14641464
    1465 bool SelectionController::isInPasswordField() const
     1465bool FrameSelection::isInPasswordField() const
    14661466{
    14671467    ASSERT(start().isNull() || start().anchorType() == Position::PositionIsOffsetInAnchor
     
    14811481}
    14821482
    1483 bool SelectionController::caretRendersInsideNode(Node* node) const
     1483bool FrameSelection::caretRendersInsideNode(Node* node) const
    14841484{
    14851485    if (!node)
     
    14881488}
    14891489
    1490 void SelectionController::focusedOrActiveStateChanged()
     1490void FrameSelection::focusedOrActiveStateChanged()
    14911491{
    14921492    bool activeAndFocused = isFocusedAndActive();
     
    15211521}
    15221522
    1523 void SelectionController::pageActivationChanged()
     1523void FrameSelection::pageActivationChanged()
    15241524{
    15251525    focusedOrActiveStateChanged();
    15261526}
    15271527
    1528 void SelectionController::updateSecureKeyboardEntryIfActive()
     1528void FrameSelection::updateSecureKeyboardEntryIfActive()
    15291529{
    15301530    if (m_frame->document() && isFocusedAndActive())
     
    15321532}
    15331533
    1534 void SelectionController::setUseSecureKeyboardEntry(bool enable)
     1534void FrameSelection::setUseSecureKeyboardEntry(bool enable)
    15351535{
    15361536    if (enable)
     
    15401540}
    15411541
    1542 void SelectionController::setFocused(bool flag)
     1542void FrameSelection::setFocused(bool flag)
    15431543{
    15441544    if (m_focused == flag)
     
    15491549}
    15501550
    1551 bool SelectionController::isFocusedAndActive() const
     1551bool FrameSelection::isFocusedAndActive() const
    15521552{
    15531553    return m_focused && m_frame->page() && m_frame->page()->focusController()->isActive();
    15541554}
    15551555
    1556 void SelectionController::updateAppearance()
     1556void FrameSelection::updateAppearance()
    15571557{
    15581558    ASSERT(!m_isDragCaretController);
     
    16111611
    16121612    // We can get into a state where the selection endpoints map to the same VisiblePosition when a selection is deleted
    1613     // because we don't yet notify the SelectionController of text removal.
     1613    // because we don't yet notify the FrameSelection of text removal.
    16141614    if (startPos.isNotNull() && endPos.isNotNull() && selection.visibleStart() != selection.visibleEnd()) {
    16151615        RenderObject* startRenderer = startPos.deprecatedNode()->renderer();
     
    16191619}
    16201620
    1621 void SelectionController::setCaretVisible(bool flag)
     1621void FrameSelection::setCaretVisible(bool flag)
    16221622{
    16231623    if (m_caretVisible == flag)
     
    16281628}
    16291629
    1630 void SelectionController::clearCaretRectIfNeeded()
     1630void FrameSelection::clearCaretRectIfNeeded()
    16311631{
    16321632#if ENABLE(TEXT_CARET)
     
    16381638}
    16391639
    1640 void SelectionController::caretBlinkTimerFired(Timer<SelectionController>*)
     1640void FrameSelection::caretBlinkTimerFired(Timer<FrameSelection>*)
    16411641{
    16421642#if ENABLE(TEXT_CARET)
     
    16511651}
    16521652
    1653 void SelectionController::notifyRendererOfSelectionChange(bool userTriggered)
     1653void FrameSelection::notifyRendererOfSelectionChange(bool userTriggered)
    16541654{
    16551655    m_frame->document()->updateStyleIfNeeded();
     
    16781678}
    16791679
    1680 void SelectionController::setFocusedNodeIfNeeded()
     1680void FrameSelection::setFocusedNodeIfNeeded()
    16811681{
    16821682    if (isNone() || !isFocused())
     
    17101710}
    17111711
    1712 void SelectionController::paintDragCaret(GraphicsContext* p, int tx, int ty, const IntRect& clipRect) const
     1712void FrameSelection::paintDragCaret(GraphicsContext* p, int tx, int ty, const IntRect& clipRect) const
    17131713{
    17141714#if ENABLE(TEXT_CARET)
    1715     SelectionController* dragCaretController = m_frame->page()->dragCaretController();
     1715    FrameSelection* dragCaretController = m_frame->page()->dragCaretController();
    17161716    ASSERT(dragCaretController->selection().isCaret());
    17171717    if (dragCaretController->selection().start().anchorNode()->document()->frame() == m_frame)
     
    17251725}
    17261726
    1727 PassRefPtr<CSSMutableStyleDeclaration> SelectionController::copyTypingStyle() const
     1727PassRefPtr<CSSMutableStyleDeclaration> FrameSelection::copyTypingStyle() const
    17281728{
    17291729    if (!m_typingStyle || !m_typingStyle->style())
     
    17321732}
    17331733
    1734 bool SelectionController::shouldDeleteSelection(const VisibleSelection& selection) const
     1734bool FrameSelection::shouldDeleteSelection(const VisibleSelection& selection) const
    17351735{
    17361736    return m_frame->editor()->client()->shouldDeleteRange(selection.toNormalizedRange().get());
    17371737}
    17381738
    1739 FloatRect SelectionController::bounds(bool clipToVisibleContent) const
     1739FloatRect FrameSelection::bounds(bool clipToVisibleContent) const
    17401740{
    17411741    RenderView* root = m_frame->contentRenderer();
     
    17481748}
    17491749
    1750 void SelectionController::getClippedVisibleTextRectangles(Vector<FloatRect>& rectangles) const
     1750void FrameSelection::getClippedVisibleTextRectangles(Vector<FloatRect>& rectangles) const
    17511751{
    17521752    RenderView* root = m_frame->contentRenderer();
     
    17841784
    17851785// We look for either the form containing the current focus, or for one immediately after it
    1786 HTMLFormElement* SelectionController::currentForm() const
     1786HTMLFormElement* FrameSelection::currentForm() const
    17871787{
    17881788    // Start looking either at the active (first responder) node, or where the selection is.
     
    18041804}
    18051805
    1806 void SelectionController::revealSelection(const ScrollAlignment& alignment, bool revealExtent)
     1806void FrameSelection::revealSelection(const ScrollAlignment& alignment, bool revealExtent)
    18071807{
    18081808    IntRect rect;
     
    18321832}
    18331833
    1834 void SelectionController::setSelectionFromNone()
     1834void FrameSelection::setSelectionFromNone()
    18351835{
    18361836    // Put a caret inside the body if the entire frame is editable (either the
     
    18491849}
    18501850
    1851 bool SelectionController::shouldChangeSelection(const VisibleSelection& newSelection) const
     1851bool FrameSelection::shouldChangeSelection(const VisibleSelection& newSelection) const
    18521852{
    18531853    return m_frame->editor()->shouldChangeSelection(selection(), newSelection, newSelection.affinity(), false);
     
    18561856#ifndef NDEBUG
    18571857
    1858 void SelectionController::formatForDebugger(char* buffer, unsigned length) const
     1858void FrameSelection::formatForDebugger(char* buffer, unsigned length) const
    18591859{
    18601860    m_selection.formatForDebugger(buffer, length);
    18611861}
    18621862
    1863 void SelectionController::showTreeForThis() const
     1863void FrameSelection::showTreeForThis() const
    18641864{
    18651865    m_selection.showTreeForThis();
     
    18721872#ifndef NDEBUG
    18731873
    1874 void showTree(const WebCore::SelectionController& sel)
     1874void showTree(const WebCore::FrameSelection& sel)
    18751875{
    18761876    sel.showTreeForThis();
    18771877}
    18781878
    1879 void showTree(const WebCore::SelectionController* sel)
     1879void showTree(const WebCore::FrameSelection* sel)
    18801880{
    18811881    if (sel)
  • trunk/Source/WebCore/editing/FrameSelection.h

    r85863 r85864  
    2424 */
    2525
    26 #ifndef SelectionController_h
    27 #define SelectionController_h
     26#ifndef FrameSelection_h
     27#define FrameSelection_h
    2828
    2929#include "EditingStyle.h"
     
    4949enum DirectionalityPolicy { MakeNonDirectionalSelection, MakeDirectionalSelection };
    5050
    51 class SelectionController {
    52     WTF_MAKE_NONCOPYABLE(SelectionController); WTF_MAKE_FAST_ALLOCATED;
     51class FrameSelection {
     52    WTF_MAKE_NONCOPYABLE(FrameSelection);
     53    WTF_MAKE_FAST_ALLOCATED;
    5354public:
    5455    enum EAlteration { AlterationMove, AlterationExtend };
     
    6364    typedef unsigned SetSelectionOptions;
    6465
    65     SelectionController(Frame* = 0, bool isDragCaretController = false);
     66    FrameSelection(Frame* = 0, bool isDragCaretController = false);
    6667
    6768    Element* rootEditableElement() const { return m_selection.rootEditableElement(); }
     
    216217    IntRect absoluteBoundsForLocalRect(const IntRect&) const;
    217218
    218     void caretBlinkTimerFired(Timer<SelectionController>*);
     219    void caretBlinkTimerFired(Timer<FrameSelection>*);
    219220
    220221    void setUseSecureKeyboardEntry(bool);
     
    229230    RefPtr<EditingStyle> m_typingStyle;
    230231
    231     Timer<SelectionController> m_caretBlinkTimer;
     232    Timer<FrameSelection> m_caretBlinkTimer;
    232233
    233234    IntRect m_caretRect; // caret rect in coords local to the renderer responsible for painting the caret
     
    245246};
    246247
    247 inline EditingStyle* SelectionController::typingStyle() const
     248inline EditingStyle* FrameSelection::typingStyle() const
    248249{
    249250    return m_typingStyle.get();
    250251}
    251252
    252 inline void SelectionController::clearTypingStyle()
     253inline void FrameSelection::clearTypingStyle()
    253254{
    254255    m_typingStyle.clear();
    255256}
    256257
    257 inline void SelectionController::setTypingStyle(PassRefPtr<EditingStyle> style)
     258inline void FrameSelection::setTypingStyle(PassRefPtr<EditingStyle> style)
    258259{
    259260    m_typingStyle = style;
     
    261262
    262263#if !(PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(CHROMIUM))
    263 inline void SelectionController::notifyAccessibilityForSelectionChange()
     264inline void FrameSelection::notifyAccessibilityForSelectionChange()
    264265{
    265266}
     
    270271#ifndef NDEBUG
    271272// Outside the WebCore namespace for ease of invocation from gdb.
    272 void showTree(const WebCore::SelectionController&);
    273 void showTree(const WebCore::SelectionController*);
     273void showTree(const WebCore::FrameSelection&);
     274void showTree(const WebCore::FrameSelection*);
    274275#endif
    275276
    276 #endif // SelectionController_h
    277 
     277#endif // FrameSelection_h
     278
  • trunk/Source/WebCore/editing/ModifySelectionListLevel.cpp

    r80317 r85864  
    2929#include "Document.h"
    3030#include "Frame.h"
     31#include "FrameSelection.h"
    3132#include "HTMLElement.h"
    3233#include "RenderObject.h"
    33 #include "SelectionController.h"
    3434#include "htmlediting.h"
    3535
  • trunk/Source/WebCore/editing/RemoveFormatCommand.cpp

    r73416 r85864  
    3232#include "Element.h"
    3333#include "Frame.h"
     34#include "FrameSelection.h"
    3435#include "HTMLNames.h"
    35 #include "SelectionController.h"
    3636
    3737namespace WebCore {
  • trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

    r85818 r85864  
    4040#include "EventNames.h"
    4141#include "Frame.h"
     42#include "FrameSelection.h"
    4243#include "HTMLElement.h"
    4344#include "HTMLInputElement.h"
     
    4546#include "HTMLNames.h"
    4647#include "NodeList.h"
    47 #include "SelectionController.h"
    4848#include "SmartReplace.h"
    4949#include "TextIterator.h"
  • trunk/Source/WebCore/editing/SetSelectionCommand.cpp

    r79196 r85864  
    3131namespace WebCore {
    3232
    33 SetSelectionCommand::SetSelectionCommand(const VisibleSelection& selection, SelectionController::SetSelectionOptions options)
     33SetSelectionCommand::SetSelectionCommand(const VisibleSelection& selection, FrameSelection::SetSelectionOptions options)
    3434    : SimpleEditCommand(selection.base().anchorNode()->document())
    3535    , m_options(options)
     
    4040void SetSelectionCommand::doApply()
    4141{
    42     SelectionController* selectionController = document()->frame()->selection();
    43     ASSERT(selectionController);
     42    FrameSelection* selection = document()->frame()->selection();
     43    ASSERT(selection);
    4444
    45     if (selectionController->shouldChangeSelection(m_selectionToSet) && m_selectionToSet.isNonOrphanedCaretOrRange()) {
    46         selectionController->setSelection(m_selectionToSet, m_options);
     45    if (selection->shouldChangeSelection(m_selectionToSet) && m_selectionToSet.isNonOrphanedCaretOrRange()) {
     46        selection->setSelection(m_selectionToSet, m_options);
    4747        setEndingSelection(m_selectionToSet);
    4848    }
     
    5151void SetSelectionCommand::doUnapply()
    5252{
    53     SelectionController* selectionController = document()->frame()->selection();
    54     ASSERT(selectionController);
     53    FrameSelection* selection = document()->frame()->selection();
     54    ASSERT(selection);
    5555
    56     if (selectionController->shouldChangeSelection(startingSelection()) && startingSelection().isNonOrphanedCaretOrRange())
    57         selectionController->setSelection(startingSelection(), m_options);
     56    if (selection->shouldChangeSelection(startingSelection()) && startingSelection().isNonOrphanedCaretOrRange())
     57        selection->setSelection(startingSelection(), m_options);
    5858}
    5959
  • trunk/Source/WebCore/editing/SetSelectionCommand.h

    r78632 r85864  
    2828
    2929#include "EditCommand.h"
    30 #include "SelectionController.h"
     30#include "FrameSelection.h"
    3131
    3232namespace WebCore {
     
    3434class SetSelectionCommand : public SimpleEditCommand {
    3535public:
    36     static PassRefPtr<SetSelectionCommand> create(const VisibleSelection& selection, SelectionController::SetSelectionOptions options)
     36    static PassRefPtr<SetSelectionCommand> create(const VisibleSelection& selection, FrameSelection::SetSelectionOptions options)
    3737    {
    3838        return adoptRef(new SetSelectionCommand(selection, options));
     
    4040
    4141private:
    42     SetSelectionCommand(const VisibleSelection&, SelectionController::SetSelectionOptions);
     42    SetSelectionCommand(const VisibleSelection&, FrameSelection::SetSelectionOptions);
    4343    virtual void doApply();
    4444    virtual void doUnapply();
    4545
    46     SelectionController::SetSelectionOptions m_options;
     46    FrameSelection::SetSelectionOptions m_options;
    4747    VisibleSelection m_selectionToSet;
    4848};
  • trunk/Source/WebCore/editing/SpellingCorrectionCommand.cpp

    r83344 r85864  
    9595        return;
    9696
    97     applyCommandToComposite(SetSelectionCommand::create(m_selectionToBeCorrected, SelectionController::SpellCorrectionTriggered | SelectionController::CloseTyping | SelectionController::ClearTypingStyle));
     97    applyCommandToComposite(SetSelectionCommand::create(m_selectionToBeCorrected, FrameSelection::SpellCorrectionTriggered | FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle));
    9898#if SUPPORT_AUTOCORRECTION_PANEL
    9999    applyCommandToComposite(SpellingCorrectionRecordUndoCommand::create(document(), m_corrected, m_correction));
  • trunk/Source/WebCore/editing/SpellingCorrectionController.cpp

    r85687 r85864  
    271271    client()->recordAutocorrectionResponse(EditorClient::AutocorrectionReverted, corrected, correction);
    272272    m_frame->document()->updateLayout();
    273     m_frame->selection()->setSelection(selectionOfCorrected, SelectionController::CloseTyping | SelectionController::ClearTypingStyle | SelectionController::SpellCorrectionTriggered);
     273    m_frame->selection()->setSelection(selectionOfCorrected, FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle | FrameSelection::SpellCorrectionTriggered);
    274274    RefPtr<Range> range = Range::create(m_frame->document(), m_frame->selection()->selection().start(), m_frame->selection()->selection().end());
    275275
  • trunk/Source/WebCore/editing/TypingCommand.cpp

    r85036 r85864  
    3434#include "Element.h"
    3535#include "Frame.h"
     36#include "FrameSelection.h"
    3637#include "HTMLNames.h"
    3738#include "InsertLineBreakCommand.h"
     
    3940#include "InsertTextCommand.h"
    4041#include "RenderObject.h"
    41 #include "SelectionController.h"
    4242#include "TextIterator.h"
    4343#include "VisiblePosition.h"
     
    162162}
    163163
    164 // FIXME: We shouldn't need to take selectionForInsertion. It should be identical to SelectionController's current selection.
     164// FIXME: We shouldn't need to take selectionForInsertion. It should be identical to FrameSelection's current selection.
    165165void TypingCommand::insertText(Document* document, const String& text, const VisibleSelection& selectionForInsertion, Options options, TextCompositionType compositionType)
    166166{
     
    486486        m_smartDelete = false;
    487487
    488         SelectionController selection;
     488        FrameSelection selection;
    489489        selection.setSelection(endingSelection());
    490         selection.modify(SelectionController::AlterationExtend, DirectionBackward, granularity);
     490        selection.modify(FrameSelection::AlterationExtend, DirectionBackward, granularity);
    491491        if (killRing && selection.isCaret() && granularity != CharacterGranularity)
    492             selection.modify(SelectionController::AlterationExtend, DirectionBackward, CharacterGranularity);
     492            selection.modify(FrameSelection::AlterationExtend, DirectionBackward, CharacterGranularity);
    493493
    494494        if (endingSelection().visibleStart().previous(CannotCrossEditingBoundary).isNull()) {
     
    516516                return;
    517517            // Extend the selection backward into the last cell, then deletion will handle the move.
    518             selection.modify(SelectionController::AlterationExtend, DirectionBackward, granularity);
     518            selection.modify(FrameSelection::AlterationExtend, DirectionBackward, granularity);
    519519        // If the caret is just after a table, select the table and don't delete anything.
    520520        } else if (Node* table = isFirstPositionAfterTable(visibleStart)) {
     
    583583        // Do nothing in the case that the caret is at the start of a
    584584        // root editable element or at the start of a document.
    585         SelectionController selection;
     585        FrameSelection selection;
    586586        selection.setSelection(endingSelection());
    587         selection.modify(SelectionController::AlterationExtend, DirectionForward, granularity);
     587        selection.modify(FrameSelection::AlterationExtend, DirectionForward, granularity);
    588588        if (killRing && selection.isCaret() && granularity != CharacterGranularity)
    589             selection.modify(SelectionController::AlterationExtend, DirectionForward, CharacterGranularity);
     589            selection.modify(FrameSelection::AlterationExtend, DirectionForward, CharacterGranularity);
    590590
    591591        Position downstreamEnd = endingSelection().end().downstream();
     
    603603        // deleting to end of paragraph when at end of paragraph needs to merge the next paragraph (if any)
    604604        if (granularity == ParagraphBoundary && selection.selection().isCaret() && isEndOfParagraph(selection.selection().visibleEnd()))
    605             selection.modify(SelectionController::AlterationExtend, DirectionForward, CharacterGranularity);
     605            selection.modify(FrameSelection::AlterationExtend, DirectionForward, CharacterGranularity);
    606606
    607607        selectionToDelete = selection.selection();
  • trunk/Source/WebCore/editing/chromium/FrameSelectionChromium.cpp

    r85863 r85864  
    3030
    3131#include "config.h"
    32 #include "SelectionController.h"
     32#include "FrameSelection.h"
    3333
    3434#include "AXObjectCache.h"
     
    3838namespace WebCore {
    3939
    40 void SelectionController::notifyAccessibilityForSelectionChange()
     40void FrameSelection::notifyAccessibilityForSelectionChange()
    4141{
    4242    // FIXME: Support editable text in chromium.
  • trunk/Source/WebCore/editing/gtk/FrameSelectionGtk.cpp

    r85863 r85864  
    1919 
    2020#include "config.h"
    21 #include "SelectionController.h"
     21#include "FrameSelection.h"
    2222
    2323#include "AccessibilityObjectWrapperAtk.h"
     
    7676
    7777
    78 void SelectionController::notifyAccessibilityForSelectionChange()
     78void FrameSelection::notifyAccessibilityForSelectionChange()
    7979{
    8080    if (!AXObjectCache::accessibilityEnabled())
  • trunk/Source/WebCore/editing/mac/EditorMac.mm

    r85036 r85864  
    191191bool Editor::canCopyExcludingStandaloneImages()
    192192{
    193     SelectionController* selection = m_frame->selection();
     193    FrameSelection* selection = m_frame->selection();
    194194    return selection->isRange() && !selection->isInPasswordField();
    195195}
  • trunk/Source/WebCore/editing/mac/FrameSelectionMac.mm

    r85863 r85864  
    2525 
    2626#import "config.h"
    27 #import "SelectionController.h"
     27#import "FrameSelection.h"
    2828
    2929#import "AXObjectCache.h"
     
    4747   
    4848   
    49 void SelectionController::notifyAccessibilityForSelectionChange()
     49void FrameSelection::notifyAccessibilityForSelectionChange()
    5050{
    5151    Document* document = m_frame->document();
  • trunk/Source/WebCore/editing/qt/EditorQt.cpp

    r85648 r85864  
    3131#include "ClipboardQt.h"
    3232#include "Document.h"
    33 #include "Element.h"
    34 #include "SelectionController.h"
    35 #include "TextIterator.h"
    36 #include "VisibleSelection.h"
    37 #include "htmlediting.h"
    38 #include "visible_units.h"
    3933
    4034namespace WebCore {
  • trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp

    r81484 r85864  
    3535#include "Frame.h"
    3636#include "FrameLoader.h"
     37#include "FrameSelection.h"
    3738#include "FrameTree.h"
    3839#include "HTMLFrameOwnerElement.h"
     
    4546#include "Node.h"
    4647#include "Range.h"
    47 #include "SelectionController.h"
    4848#include "SharedBuffer.h"
    4949#include <wtf/text/CString.h>
  • trunk/Source/WebCore/page/ContextMenuController.cpp

    r85603 r85864  
    4848#include "FrameLoadRequest.h"
    4949#include "FrameLoader.h"
     50#include "FrameSelection.h"
    5051#include "HTMLFormElement.h"
    5152#include "HitTestRequest.h"
     
    6162#include "ReplaceSelectionCommand.h"
    6263#include "ResourceRequest.h"
    63 #include "SelectionController.h"
    6464#include "Settings.h"
    6565#include "TextIterator.h"
     
    804804        }
    805805    } else { // Make an editing context menu
    806         SelectionController* selection = frame->selection();
     806        FrameSelection* selection = frame->selection();
    807807        bool inPasswordField = selection->isInPasswordField();
    808808        bool spellCheckingEnabled = frame->editor()->isSpellCheckingEnabledFor(node);
  • trunk/Source/WebCore/page/DOMSelection.cpp

    r84265 r85864  
    3333#include "ExceptionCode.h"
    3434#include "Frame.h"
     35#include "FrameSelection.h"
    3536#include "Node.h"
    3637#include "PlatformString.h"
    3738#include "Range.h"
    38 #include "SelectionController.h"
    3939#include "TextIterator.h"
    4040#include "htmlediting.h"
     
    180180        return String();
    181181
    182     SelectionController* selection = m_frame->selection();
     182    FrameSelection* selection = m_frame->selection();
    183183
    184184    // This is a WebKit DOM extension, incompatible with an IE extension
     
    294294        return;
    295295
    296     SelectionController::EAlteration alter;
     296    FrameSelection::EAlteration alter;
    297297    if (equalIgnoringCase(alterString, "extend"))
    298         alter = SelectionController::AlterationExtend;
     298        alter = FrameSelection::AlterationExtend;
    299299    else if (equalIgnoringCase(alterString, "move"))
    300         alter = SelectionController::AlterationMove;
     300        alter = FrameSelection::AlterationMove;
    301301    else
    302302        return;
     
    400400        return;
    401401
    402     SelectionController* selection = m_frame->selection();
     402    FrameSelection* selection = m_frame->selection();
    403403
    404404    if (selection->isNone()) {
     
    437437        return;
    438438
    439     SelectionController* selection = m_frame->selection();
     439    FrameSelection* selection = m_frame->selection();
    440440
    441441    if (selection->isNone())
     
    443443
    444444    if (isCollapsed())
    445         selection->modify(SelectionController::AlterationExtend, DirectionBackward, CharacterGranularity);
     445        selection->modify(FrameSelection::AlterationExtend, DirectionBackward, CharacterGranularity);
    446446
    447447    RefPtr<Range> selectedRange = selection->selection().toNormalizedRange();
     
    462462        return false;
    463463
    464     SelectionController* selection = m_frame->selection();
     464    FrameSelection* selection = m_frame->selection();
    465465
    466466    if (!n || m_frame->document() != n->document() || selection->isNone())
  • trunk/Source/WebCore/page/DragController.cpp

    r85484 r85864  
    4444#include "Frame.h"
    4545#include "FrameLoader.h"
     46#include "FrameSelection.h"
    4647#include "FrameView.h"
    4748#include "HTMLAnchorElement.h"
     
    6263#include "ResourceRequest.h"
    6364#include "SecurityOrigin.h"
    64 #include "SelectionController.h"
    6565#include "Settings.h"
    6666#include "Text.h"
     
    143143}
    144144
    145 bool DragController::dragIsMove(SelectionController* selection, DragData* dragData)
     145bool DragController::dragIsMove(FrameSelection* selection, DragData* dragData)
    146146{
    147147    return m_documentUnderMouse == m_dragInitiator && selection->isContentEditable() && !isCopyKeyDown(dragData);
  • trunk/Source/WebCore/page/DragController.h

    r81330 r85864  
    4040    class Element;
    4141    class Frame;
     42    class FrameSelection;
    4243    class Image;
    4344    class IntRect;
     
    4647    class PlatformMouseEvent;
    4748    class Range;
    48     class SelectionController;
    4949   
    5050    class DragController {
     
    100100        DragOperation dragOperation(DragData*);
    101101        void cancelDrag();
    102         bool dragIsMove(SelectionController*, DragData*);
     102        bool dragIsMove(FrameSelection*, DragData*);
    103103        bool isCopyKeyDown(DragData*);
    104104
  • trunk/Source/WebCore/page/EventHandler.cpp

    r85826 r85864  
    4444#include "Frame.h"
    4545#include "FrameLoader.h"
     46#include "FrameSelection.h"
    4647#include "FrameTree.h"
    4748#include "FrameView.h"
     
    6970#include "ScrollAnimator.h"
    7071#include "Scrollbar.h"
    71 #include "SelectionController.h"
    7272#include "Settings.h"
    7373#include "StyleCachedImage.h"
     
    257257}
    258258
    259 static void setSelectionIfNeeded(SelectionController* selection, const VisibleSelection& newSelection)
     259static void setSelectionIfNeeded(FrameSelection* selection, const VisibleSelection& newSelection)
    260260{
    261261    ASSERT(selection);
     
    264264}
    265265
    266 static void setNonDirectionalSelectionIfNeeded(SelectionController* selection, const VisibleSelection& newSelection, TextGranularity granularity)
     266static void setNonDirectionalSelectionIfNeeded(FrameSelection* selection, const VisibleSelection& newSelection, TextGranularity granularity)
    267267{
    268268    ASSERT(selection);
     
    22242224
    22252225    Node* focusedNode = doc->focusedNode();
    2226     SelectionController* selectionController = m_frame->selection();
    2227     Position start = selectionController->selection().start();
    2228 
    2229     if (start.deprecatedNode() && (selectionController->rootEditableElement() || selectionController->isRange())) {
    2230         RefPtr<Range> selection = selectionController->toNormalizedRange();
    2231         IntRect firstRect = m_frame->editor()->firstRectForRange(selection.get());
     2226    FrameSelection* selection = m_frame->selection();
     2227    Position start = selection->selection().start();
     2228
     2229    if (start.deprecatedNode() && (selection->rootEditableElement() || selection->isRange())) {
     2230        RefPtr<Range> selectionRange = selection->toNormalizedRange();
     2231        IntRect firstRect = m_frame->editor()->firstRectForRange(selectionRange.get());
    22322232
    22332233        int x = rightAligned ? firstRect.maxX() : firstRect.x();
     
    25442544   
    25452545    if (key == "Up") {
    2546         m_frame->selection()->modify((isShifted) ? SelectionController::AlterationExtend : SelectionController::AlterationMove, DirectionBackward, (isCommanded) ? DocumentBoundary : LineGranularity, true);
     2546        m_frame->selection()->modify((isShifted) ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, DirectionBackward, (isCommanded) ? DocumentBoundary : LineGranularity, true);
    25472547        event->setDefaultHandled();
    25482548    } else if (key == "Down") {
    2549         m_frame->selection()->modify((isShifted) ? SelectionController::AlterationExtend : SelectionController::AlterationMove, DirectionForward, (isCommanded) ? DocumentBoundary : LineGranularity, true);
     2549        m_frame->selection()->modify((isShifted) ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, DirectionForward, (isCommanded) ? DocumentBoundary : LineGranularity, true);
    25502550        event->setDefaultHandled();
    25512551    } else if (key == "Left") {
    2552         m_frame->selection()->modify((isShifted) ? SelectionController::AlterationExtend : SelectionController::AlterationMove, DirectionLeft, (isCommanded) ? LineBoundary : (isOptioned) ? WordGranularity : CharacterGranularity, true);
     2552        m_frame->selection()->modify((isShifted) ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, DirectionLeft, (isCommanded) ? LineBoundary : (isOptioned) ? WordGranularity : CharacterGranularity, true);
    25532553        event->setDefaultHandled();
    25542554    } else if (key == "Right") {
    2555         m_frame->selection()->modify((isShifted) ? SelectionController::AlterationExtend : SelectionController::AlterationMove, DirectionRight, (isCommanded) ? LineBoundary : (isOptioned) ? WordGranularity : CharacterGranularity, true);
     2555        m_frame->selection()->modify((isShifted) ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, DirectionRight, (isCommanded) ? LineBoundary : (isOptioned) ? WordGranularity : CharacterGranularity, true);
    25562556        event->setDefaultHandled();
    25572557    }   
  • trunk/Source/WebCore/page/EventHandler.h

    r85826 r85864  
    192192    void focusDocumentView();
    193193
    194     void capsLockStateMayHaveChanged(); // Only called by SelectionController
     194    void capsLockStateMayHaveChanged(); // Only called by FrameSelection
    195195   
    196196    void sendResizeEvent(); // Only called in FrameView
  • trunk/Source/WebCore/page/FocusController.cpp

    r83075 r85864  
    3939#include "ExceptionCode.h"
    4040#include "Frame.h"
     41#include "FrameSelection.h"
    4142#include "FrameTree.h"
    4243#include "FrameView.h"
     
    5253#include "RenderWidget.h"
    5354#include "ScrollAnimator.h"
    54 #include "SelectionController.h"
    5555#include "Settings.h"
    5656#include "SpatialNavigation.h"
     
    328328        return;
    329329   
    330     SelectionController* s = oldFocusedFrame->selection();
     330    FrameSelection* s = oldFocusedFrame->selection();
    331331    if (s->isNone())
    332332        return;
  • trunk/Source/WebCore/page/Frame.cpp

    r85745 r85864  
    153153    , m_script(this)
    154154    , m_editor(this)
    155     , m_selectionController(this)
     155    , m_selection(this)
    156156    , m_eventHandler(this)
    157157    , m_animationController(this)
  • trunk/Source/WebCore/page/Frame.h

    r85745 r85864  
    3434#include "EventHandler.h"
    3535#include "FrameLoader.h"
     36#include "FrameSelection.h"
    3637#include "FrameTree.h"
    3738#include "NavigationScheduler.h"
    38 #include "SelectionController.h"
    3939#include "ScriptController.h"
    4040#include "UserScriptTypes.h"
     
    110110        FrameLoader* loader() const;
    111111        NavigationScheduler* navigationScheduler() const;
    112         SelectionController* selection() const;
     112        FrameSelection* selection() const;
    113113        FrameTree* tree() const;
    114114        AnimationController* animation() const;
     
    233233
    234234        mutable Editor m_editor;
    235         mutable SelectionController m_selectionController;
     235        mutable FrameSelection m_selection;
    236236        mutable EventHandler m_eventHandler;
    237237        mutable AnimationController m_animationController;
     
    306306    }
    307307
    308     inline SelectionController* Frame::selection() const
    309     {
    310         return &m_selectionController;
     308    inline FrameSelection* Frame::selection() const
     309    {
     310        return &m_selection;
    311311    }
    312312
  • trunk/Source/WebCore/page/Page.cpp

    r85745 r85864  
    4343#include "FrameLoader.h"
    4444#include "FrameLoaderClient.h"
     45#include "FrameSelection.h"
    4546#include "FrameTree.h"
    4647#include "FrameView.h"
     
    6465#include "RenderWidget.h"
    6566#include "RuntimeEnabledFeatures.h"
    66 #include "SelectionController.h"
    6767#include "Settings.h"
    6868#include "SharedBuffer.h"
     
    116116Page::Page(const PageClients& pageClients)
    117117    : m_chrome(adoptPtr(new Chrome(this, pageClients.chromeClient)))
    118     , m_dragCaretController(adoptPtr(new SelectionController(0, true)))
     118    , m_dragCaretController(adoptPtr(new FrameSelection(0, true)))
    119119#if ENABLE(DRAG_SUPPORT)
    120120    , m_dragController(adoptPtr(new DragController(this, pageClients.dragClient)))
  • trunk/Source/WebCore/page/Page.h

    r85745 r85864  
    6060    class FocusController;
    6161    class Frame;
     62    class FrameSelection;
    6263    class GeolocationClient;
    6364    class GeolocationController;
     
    7879    class VisibleSelection;
    7980    class ScrollableArea;
    80     class SelectionController;
    8181    class Settings;
    8282    class SharedGraphicsContext3D;
     
    166166
    167167        Chrome* chrome() const { return m_chrome.get(); }
    168         SelectionController* dragCaretController() const { return m_dragCaretController.get(); }
     168        FrameSelection* dragCaretController() const { return m_dragCaretController.get(); }
    169169#if ENABLE(DRAG_SUPPORT)
    170170        DragController* dragController() const { return m_dragController.get(); }
     
    316316
    317317        OwnPtr<Chrome> m_chrome;
    318         OwnPtr<SelectionController> m_dragCaretController;
     318        OwnPtr<FrameSelection> m_dragCaretController;
    319319
    320320#if ENABLE(ACCELERATED_2D_CANVAS)
  • trunk/Source/WebCore/page/chromium/DragControllerChromium.cpp

    r75743 r85864  
    2929
    3030#include "DragData.h"
    31 #include "SelectionController.h"
     31#include "FrameSelection.h"
    3232#include <wtf/RefPtr.h>
    3333
  • trunk/Source/WebCore/page/chromium/EventHandlerChromium.cpp

    r84921 r85864  
    3333#include "FloatPoint.h"
    3434#include "FocusController.h"
     35#include "Frame.h"
     36#include "FrameSelection.h"
    3537#include "FrameView.h"
    36 #include "Frame.h"
    3738#include "HitTestRequest.h"
    3839#include "HitTestResult.h"
     
    4344#include "PlatformWheelEvent.h"
    4445#include "RenderWidget.h"
    45 #include "SelectionController.h"
    4646
    4747namespace WebCore {
  • trunk/Source/WebCore/page/win/DragControllerWin.cpp

    r75743 r85864  
    2828
    2929#include "DragData.h"
    30 #include "windows.h"
    31 #include "SelectionController.h"
     30#include "FrameSelection.h"
     31#include "windows.h"
    3232#include <wtf/RefPtr.h>
    3333
  • trunk/Source/WebCore/page/win/EventHandlerWin.cpp

    r80172 r85864  
    3333#include "FrameView.h"
    3434#include "Frame.h"
     35#include "FrameSelection.h"
    3536#include "HitTestRequest.h"
    3637#include "HitTestResult.h"
     
    4041#include "PlatformWheelEvent.h"
    4142#include "Scrollbar.h"
    42 #include "SelectionController.h"
    4343#include "WCDataObject.h"
    4444#include "NotImplemented.h"
  • trunk/Source/WebCore/rendering/HitTestResult.cpp

    r85256 r85864  
    2424#include "DocumentMarkerController.h"
    2525#include "Frame.h"
     26#include "FrameSelection.h"
    2627#include "FrameTree.h"
    2728#include "HTMLAnchorElement.h"
     
    3536#include "RenderInline.h"
    3637#include "Scrollbar.h"
    37 #include "SelectionController.h"
    3838
    3939#if ENABLE(SVG)
  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r85705 r85864  
    3030#include "FloatQuad.h"
    3131#include "Frame.h"
     32#include "FrameSelection.h"
    3233#include "FrameView.h"
    3334#include "GraphicsContext.h"
     
    4950#include "RenderTheme.h"
    5051#include "RenderView.h"
    51 #include "SelectionController.h"
    5252#include "Settings.h"
    5353#include "TextRun.h"
     
    169169            // We can't wait for RenderBox::destroy to clear the selection,
    170170            // because by then we will have nuked the line boxes.
    171             // FIXME: The SelectionController should be responsible for this when it
     171            // FIXME: The FrameSelection should be responsible for this when it
    172172            // is notified of DOM mutations.
    173173            if (isSelectionBorder())
     
    24182418void RenderBlock::paintCaret(PaintInfo& paintInfo, int tx, int ty, CaretType type)
    24192419{
    2420     SelectionController* selection = type == CursorCaret ? frame()->selection() : frame()->page()->dragCaretController();
    2421 
    2422     // Paint the caret if the SelectionController says so or if caret browsing is enabled
     2420    FrameSelection* selection = type == CursorCaret ? frame()->selection() : frame()->page()->dragCaretController();
     2421
     2422    // Paint the caret if the FrameSelection says so or if caret browsing is enabled
    24232423    bool caretBrowsing = frame()->settings() && frame()->settings()->caretBrowsingEnabled();
    24242424    RenderObject* caretPainter = selection->caretRenderer();
    24252425    if (caretPainter == this && (selection->isContentEditable() || caretBrowsing)) {
    24262426        // Convert the painting offset into the local coordinate system of this renderer,
    2427         // to match the localCaretRect computed by the SelectionController
     2427        // to match the localCaretRect computed by the FrameSelection
    24282428        offsetForContents(tx, ty);
    24292429
  • trunk/Source/WebCore/rendering/RenderImage.cpp

    r85619 r85864  
    2929
    3030#include "Frame.h"
     31#include "FrameSelection.h"
    3132#include "GraphicsContext.h"
    3233#include "HTMLAreaElement.h"
     
    3940#include "RenderLayer.h"
    4041#include "RenderView.h"
    41 #include "SelectionController.h"
    4242#include "TextRun.h"
    4343#include <wtf/UnusedParam.h>
  • trunk/Source/WebCore/rendering/RenderInline.cpp

    r85623 r85864  
    8686            // We can't wait for RenderBoxModelObject::destroy to clear the selection,
    8787            // because by then we will have nuked the line boxes.
    88             // FIXME: The SelectionController should be responsible for this when it
     88            // FIXME: The FrameSelection should be responsible for this when it
    8989            // is notified of DOM mutations.
    9090            if (isSelectionBorder())
  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r85799 r85864  
    5757#include "FocusController.h"
    5858#include "Frame.h"
     59#include "FrameSelection.h"
    5960#include "FrameTree.h"
    6061#include "FrameView.h"
     
    8182#include "Scrollbar.h"
    8283#include "ScrollbarTheme.h"
    83 #include "SelectionController.h"
    8484#include "TextStream.h"
    8585#include "TransformState.h"
  • trunk/Source/WebCore/rendering/RenderListBox.cpp

    r85143 r85864  
    3838#include "FocusController.h"
    3939#include "Frame.h"
     40#include "FrameSelection.h"
    4041#include "FrameView.h"
    4142#include "GraphicsContext.h"
     
    5455#include "ScrollbarTheme.h"
    5556#include "SelectElement.h"
    56 #include "SelectionController.h"
    5757#include "TextRun.h"
    5858#include <math.h>
  • trunk/Source/WebCore/rendering/RenderObjectChildList.cpp

    r83787 r85864  
    110110    // If oldChild is the start or end of the selection, then clear the selection to
    111111    // avoid problems of invalid pointers.
    112     // FIXME: The SelectionController should be responsible for this when it
     112    // FIXME: The FrameSelection should be responsible for this when it
    113113    // is notified of DOM mutations.
    114114    if (!owner->documentBeingDestroyed() && oldChild->isSelectionBorder())
  • trunk/Source/WebCore/rendering/RenderTextControl.cpp

    r85560 r85864  
    2828#include "EventNames.h"
    2929#include "Frame.h"
     30#include "FrameSelection.h"
    3031#include "HTMLBRElement.h"
    3132#include "HTMLFormControlElement.h"
     
    3738#include "RenderText.h"
    3839#include "ScrollbarTheme.h"
    39 #include "SelectionController.h"
    4040#include "Text.h"
    4141#include "TextControlInnerElements.h"
  • trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

    r85726 r85864  
    3030#include "EventNames.h"
    3131#include "Frame.h"
     32#include "FrameSelection.h"
    3233#include "FrameView.h"
    3334#include "HTMLInputElement.h"
     
    4142#include "RenderScrollbar.h"
    4243#include "RenderTheme.h"
    43 #include "SelectionController.h"
    4444#include "Settings.h"
    4545#include "SimpleFontData.h"
  • trunk/Source/WebCore/rendering/RenderTheme.cpp

    r85653 r85864  
    2929#include "FontSelector.h"
    3030#include "Frame.h"
     31#include "FrameSelection.h"
    3132#include "GraphicsContext.h"
    3233#include "HTMLInputElement.h"
     
    3738#include "RenderStyle.h"
    3839#include "RenderView.h"
    39 #include "SelectionController.h"
    4040#include "Settings.h"
    4141#include "TextControlInnerElements.h"
  • trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

    r84589 r85864  
    3030#include "Document.h"
    3131#include "Frame.h"
     32#include "FrameSelection.h"
    3233#include "FrameView.h"
    3334#include "HTMLElement.h"
     
    4647#include "RenderView.h"
    4748#include "RenderWidget.h"
    48 #include "SelectionController.h"
    4949#include <wtf/HexNumber.h>
    5050#include <wtf/UnusedParam.h>
  • trunk/Source/WebCore/svg/SVGSVGElement.cpp

    r85617 r85864  
    3434#include "FloatConversion.h"
    3535#include "FloatRect.h"
     36#include "FrameSelection.h"
    3637#include "FrameView.h"
    3738#include "HTMLNames.h"
     
    4950#include "SVGZoomEvent.h"
    5051#include "ScriptEventListener.h"
    51 #include "SelectionController.h"
    5252#include <wtf/StdLibExtras.h>
    5353
  • trunk/Source/WebCore/svg/SVGTextContentElement.cpp

    r83710 r85864  
    2727#include "CSSValueKeywords.h"
    2828#include "Frame.h"
     29#include "FrameSelection.h"
    2930#include "RenderObject.h"
    3031#include "RenderSVGResource.h"
     
    3233#include "SVGNames.h"
    3334#include "SVGTextQuery.h"
    34 #include "SelectionController.h"
    3535#include "XMLNames.h"
    3636
     
    163163    ASSERT(document()->frame());
    164164
    165     SelectionController* controller = document()->frame()->selection();
    166     if (!controller)
     165    FrameSelection* selection = document()->frame()->selection();
     166    if (!selection)
    167167        return;
    168168
     
    177177        end = end.next();
    178178
    179     controller->setSelection(VisibleSelection(start, end));
     179    selection->setSelection(VisibleSelection(start, end));
    180180}
    181181
  • trunk/Source/WebKit/chromium/ChangeLog

    r85844 r85864  
     12011-05-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename SelectionController to FrameSelection
     6        https://bugs.webkit.org/show_bug.cgi?id=60234
     7
     8        * src/WebFrameImpl.cpp:
     9        (WebKit::WebFrameImpl::selectWordAroundCaret):
     10        * src/WebViewImpl.cpp:
     11        (WebKit::WebViewImpl::textInputType):
     12        (WebKit::WebViewImpl::caretOrSelectionBounds):
     13        (WebKit::WebViewImpl::caretOrSelectionRange):
     14        (WebKit::WebViewImpl::clearFocusedNode):
     15
    1162011-05-03  Hans Wennborg  <hans@chromium.org>
    217
  • trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

    r85787 r85864  
    9090#include "FrameLoadRequest.h"
    9191#include "FrameLoader.h"
     92#include "FrameSelection.h"
    9293#include "FrameTree.h"
    9394#include "FrameView.h"
     
    124125#include "ScrollTypes.h"
    125126#include "ScrollbarTheme.h"
    126 #include "SelectionController.h"
    127127#include "Settings.h"
    128128#include "SkiaUtils.h"
     
    13461346bool WebFrameImpl::selectWordAroundCaret()
    13471347{
    1348     SelectionController* controller = frame()->selection();
    1349     ASSERT(!controller->isNone());
    1350     if (controller->isNone() || controller->isRange())
     1348    FrameSelection* selection = frame()->selection();
     1349    ASSERT(!selection->isNone());
     1350    if (selection->isNone() || selection->isRange())
    13511351        return false;
    1352     selectWordAroundPosition(frame(), controller->selection().visibleStart());
     1352    selectWordAroundPosition(frame(), selection->selection().visibleStart());
    13531353    return true;
    13541354}
  • trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

    r85823 r85864  
    5757#include "FontDescription.h"
    5858#include "FrameLoader.h"
     59#include "FrameSelection.h"
    5960#include "FrameTree.h"
    6061#include "FrameView.h"
     
    8990#include "ResourceHandle.h"
    9091#include "SecurityOrigin.h"
    91 #include "SelectionController.h"
    9292#include "Settings.h"
    9393#include "SpeechInputClientImpl.h"
     
    14371437        return type;
    14381438
    1439     SelectionController* controller = focused->selection();
    1440     if (!controller)
     1439    FrameSelection* selection = focused->selection();
     1440    if (!selection)
    14411441        return type;
    14421442
    1443     const Node* node = controller->start().deprecatedNode();
     1443    const Node* node = selection->start().deprecatedNode();
    14441444    if (!node)
    14451445        return type;
     
    14471447    // FIXME: Support more text input types when necessary, eg. Number,
    14481448    // Date, Email, URL, etc.
    1449     if (controller->isInPasswordField())
     1449    if (selection->isInPasswordField())
    14501450        type = WebTextInputTypePassword;
    14511451    else if (node->shouldUseInputMethod())
     
    14621462        return rect;
    14631463
    1464     SelectionController* controller = focused->selection();
    1465     if (!controller)
     1464    FrameSelection* selection = focused->selection();
     1465    if (!selection)
    14661466        return rect;
    14671467
     
    14701470        return rect;
    14711471
    1472     const Node* node = controller->base().containerNode();
     1472    const Node* node = selection->base().containerNode();
    14731473    if (!node || !node->renderer())
    14741474        return rect;
    14751475
    1476     if (controller->isCaret())
    1477         rect = view->contentsToWindow(controller->absoluteCaretBounds());
    1478     else if (controller->isRange()) {
    1479         node = controller->extent().containerNode();
    1480         RefPtr<Range> range = controller->toNormalizedRange();
     1476    if (selection->isCaret())
     1477        rect = view->contentsToWindow(selection->absoluteCaretBounds());
     1478    else if (selection->isRange()) {
     1479        node = selection->extent().containerNode();
     1480        RefPtr<Range> range = selection->toNormalizedRange();
    14811481        if (!node || !node->renderer() || !range)
    14821482            return rect;
     
    15231523        return false;
    15241524
    1525     SelectionController* controller = focused->selection();
    1526     if (!controller)
     1525    FrameSelection* selection = focused->selection();
     1526    if (!selection)
    15271527        return false;
    15281528
    1529     RefPtr<Range> range = controller->selection().firstRange();
     1529    RefPtr<Range> range = selection->selection().firstRange();
    15301530    if (!range.get())
    15311531        return false;
     
    17131713        || (oldFocusedNode->hasTagName(HTMLNames::inputTag)
    17141714            && static_cast<HTMLInputElement*>(oldFocusedNode.get())->isTextField())) {
    1715         // Clear the selection.
    1716         SelectionController* selection = frame->selection();
    1717         selection->clear();
     1715        frame->selection()->clear();
    17181716    }
    17191717}
  • trunk/Source/WebKit/efl/ChangeLog

    r85823 r85864  
     12011-05-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename SelectionController to FrameSelection
     6        https://bugs.webkit.org/show_bug.cgi?id=60234
     7
     8        * WebCoreSupport/EditorClientEfl.cpp:
     9        (WebCore::EditorClientEfl::handleEditingKeyboardEvent):
     10
    1112011-05-04  Cris Neckar  <cdn@chromium.org>
    212
  • trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp

    r84574 r85864  
    347347        switch (keyEvent->windowsVirtualKeyCode()) {
    348348        case VK_LEFT:
    349             frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
     349            frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    350350                    DirectionLeft,
    351351                    keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
     
    353353            return true;
    354354        case VK_RIGHT:
    355             frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
     355            frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    356356                    DirectionRight,
    357357                    keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
     
    359359            return true;
    360360        case VK_UP:
    361             frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
     361            frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    362362                    DirectionBackward,
    363363                    keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
     
    365365            return true;
    366366        case VK_DOWN:
    367             frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
     367            frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    368368                    DirectionForward,
    369369                    keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
  • trunk/Source/WebKit/gtk/ChangeLog

    r85832 r85864  
     12011-05-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename SelectionController to FrameSelection
     6        https://bugs.webkit.org/show_bug.cgi?id=60234
     7
     8        * webkit/webkitwebview.cpp:
     9        (getLocationForKeyboardGeneratedContextMenu):
     10
    1112011-05-04  Ryosuke Niwa  <rniwa@webkit.org>
    212
  • trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

    r85832 r85864  
    385385static IntPoint getLocationForKeyboardGeneratedContextMenu(Frame* frame)
    386386{
    387     SelectionController* selection = frame->selection();
     387    FrameSelection* selection = frame->selection();
    388388    if (!selection->selection().isNonOrphanedCaretOrRange()
    389389         || (selection->selection().isCaret() && !selection->selection().isContentEditable())) {
  • trunk/Source/WebKit/haiku/ChangeLog

    r85823 r85864  
     12011-05-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename SelectionController to FrameSelection
     6        https://bugs.webkit.org/show_bug.cgi?id=60234
     7
     8        * WebCoreSupport/EditorClientHaiku.cpp:
     9        (WebCore::EditorClientHaiku::handleKeyboardEvent):
     10
    1112011-05-04  Cris Neckar  <cdn@chromium.org>
    212
  • trunk/Source/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp

    r84574 r85864  
    268268            break;
    269269        case VK_LEFT:
    270             frame->selection()->modify(kevent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
     270            frame->selection()->modify(kevent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    271271                                       DirectionLeft,
    272272                                       kevent->ctrlKey() ? WordGranularity : CharacterGranularity,
     
    274274            break;
    275275        case VK_RIGHT:
    276             frame->selection()->modify(kevent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
     276            frame->selection()->modify(kevent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    277277                                       DirectionRight,
    278278                                       kevent->ctrlKey() ? WordGranularity : CharacterGranularity,
     
    280280            break;
    281281        case VK_UP:
    282             frame->selection()->modify(kevent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
     282            frame->selection()->modify(kevent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    283283                                       DirectionBackward,
    284284                                       kevent->ctrlKey() ? ParagraphGranularity : LineGranularity,
     
    286286            break;
    287287        case VK_DOWN:
    288             frame->selection()->modify(kevent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
     288            frame->selection()->modify(kevent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    289289                                       DirectionForward,
    290290                                       kevent->ctrlKey() ? ParagraphGranularity : LineGranularity,
  • trunk/Source/WebKit/mac/ChangeLog

    r85823 r85864  
     12011-05-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename SelectionController to FrameSelection
     6        https://bugs.webkit.org/show_bug.cgi?id=60234
     7
     8        * WebView/WebFrame.mm:
     9        (-[WebFrame _rangeByAlteringCurrentSelection:FrameSelection::direction:granularity:]):
     10        * WebView/WebFrameInternal.h:
     11        * WebView/WebHTMLView.mm:
     12        * WebView/WebTextCompletionController.mm:
     13        (-[WebTextCompletionController doCompletion]):
     14        * WebView/WebView.mm:
     15
    1162011-05-04  Cris Neckar  <cdn@chromium.org>
    217
  • trunk/Source/WebKit/mac/WebView/WebFrame.mm

    r85823 r85864  
    652652}
    653653
    654 - (DOMRange *)_rangeByAlteringCurrentSelection:(SelectionController::EAlteration)alteration direction:(SelectionDirection)direction granularity:(TextGranularity)granularity
     654- (DOMRange *)_rangeByAlteringCurrentSelection:(FrameSelection::EAlteration)alteration direction:(SelectionDirection)direction granularity:(TextGranularity)granularity
    655655{
    656656    if (_private->coreFrame->selection()->isNone())
    657657        return nil;
    658658
    659     SelectionController selection;
     659    FrameSelection selection;
    660660    selection.setSelection(_private->coreFrame->selection()->selection());
    661661    selection.modify(alteration, direction, granularity);
  • trunk/Source/WebKit/mac/WebView/WebFrameInternal.h

    r85036 r85864  
    3333#import <WebCore/EditAction.h>
    3434#import <WebCore/FrameLoaderTypes.h>
     35#import <WebCore/FrameSelection.h>
    3536#import <WebCore/Position.h>
    36 #import <WebCore/SelectionController.h>
    3737#import <WebCore/Settings.h>
    3838
     
    137137- (void)_scrollDOMRangeToVisible:(DOMRange *)range;
    138138
    139 - (DOMRange *)_rangeByAlteringCurrentSelection:(WebCore::SelectionController::EAlteration)alteration direction:(WebCore::SelectionDirection)direction granularity:(WebCore::TextGranularity)granularity;
     139- (DOMRange *)_rangeByAlteringCurrentSelection:(WebCore::FrameSelection::EAlteration)alteration direction:(WebCore::SelectionDirection)direction granularity:(WebCore::TextGranularity)granularity;
    140140- (NSRange)_convertToNSRange:(WebCore::Range*)range;
    141141- (DOMRange *)_convertNSRangeToDOMRange:(NSRange)range;
  • trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

    r85428 r85864  
    9494#import <WebCore/Frame.h>
    9595#import <WebCore/FrameLoader.h>
     96#import <WebCore/FrameSelection.h>
    9697#import <WebCore/FrameView.h>
    9798#import <WebCore/HTMLConverter.h>
     
    108109#import <WebCore/RenderView.h>
    109110#import <WebCore/RuntimeApplicationChecks.h>
    110 #import <WebCore/SelectionController.h>
    111111#import <WebCore/SharedBuffer.h>
    112112#import <WebCore/SimpleFontData.h>
  • trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm

    r80059 r85864  
    175175        WebFrame *frame = [_htmlView _frame];
    176176        DOMRange *selection = kit(core(frame)->selection()->toNormalizedRange().get());
    177         DOMRange *wholeWord = [frame _rangeByAlteringCurrentSelection:SelectionController::AlterationExtend
     177        DOMRange *wholeWord = [frame _rangeByAlteringCurrentSelection:FrameSelection::AlterationExtend
    178178            direction:DirectionBackward granularity:WordGranularity];
    179179        DOMRange *prefix = [wholeWord cloneRange];
  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r85603 r85864  
    126126#import <WebCore/Frame.h>
    127127#import <WebCore/FrameLoader.h>
     128#import <WebCore/FrameSelection.h>
    128129#import <WebCore/FrameTree.h>
    129130#import <WebCore/FrameView.h>
     
    155156#import <WebCore/ScriptValue.h>
    156157#import <WebCore/SecurityOrigin.h>
    157 #import <WebCore/SelectionController.h>
    158158#import <WebCore/Settings.h>
    159159#import <WebCore/TextResourceDecoder.h>
  • trunk/Source/WebKit/qt/Api/qwebframe.cpp

    r83892 r85864  
    3535#include "Frame.h"
    3636#include "FrameLoaderClientQt.h"
     37#include "FrameSelection.h"
    3738#include "FrameTree.h"
    3839#include "FrameView.h"
     
    7576#include "Scrollbar.h"
    7677#include "Settings.h"
    77 #include "SelectionController.h"
    7878#include "SubstituteData.h"
    7979#include "SVGSMILElement.h"
  • trunk/Source/WebKit/qt/ChangeLog

    r85851 r85864  
     12011-05-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename SelectionController to FrameSelection
     6        https://bugs.webkit.org/show_bug.cgi?id=60234
     7
     8        * Api/qwebframe.cpp:
     9
    1102011-05-05  Alexis Menard  <alexis.menard@openbossa.org>
    211
  • trunk/Source/WebKit/win/ChangeLog

    r85831 r85864  
     12011-05-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename SelectionController to FrameSelection
     6        https://bugs.webkit.org/show_bug.cgi?id=60234
     7
     8        * WebView.cpp:
     9
    1102011-05-04  Ryosuke Niwa  <rniwa@webkit.org>
    211
  • trunk/Source/WebKit/win/WebView.cpp

    r85831 r85864  
    8888#include <WebCore/FocusController.h>
    8989#include <WebCore/FrameLoader.h>
     90#include <WebCore/FrameSelection.h>
    9091#include <WebCore/FrameTree.h>
    9192#include <WebCore/FrameView.h>
     
    128129#include <WebCore/ScrollbarTheme.h>
    129130#include <WebCore/SecurityOrigin.h>
    130 #include <WebCore/SelectionController.h>
    131131#include <WebCore/Settings.h>
    132132#include <WebCore/SimpleFontData.h>
  • trunk/Source/WebKit/wince/ChangeLog

    r85823 r85864  
     12011-05-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename SelectionController to FrameSelection
     6        https://bugs.webkit.org/show_bug.cgi?id=60234
     7
     8        * WebCoreSupport/EditorClientWinCE.cpp:
     9        (WebKit::EditorClientWinCE::handleEditingKeyboardEvent):
     10
    1112011-05-04  Cris Neckar  <cdn@chromium.org>
    212
  • trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp

    r84585 r85864  
    357357        switch (keyEvent->windowsVirtualKeyCode()) {
    358358        case VK_LEFT:
    359             frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
     359            frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    360360                    DirectionLeft,
    361361                    keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
     
    363363            return true;
    364364        case VK_RIGHT:
    365             frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
     365            frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    366366                    DirectionRight,
    367367                    keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
     
    369369            return true;
    370370        case VK_UP:
    371             frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
     371            frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    372372                    DirectionBackward,
    373373                    keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
     
    375375            return true;
    376376        case VK_DOWN:
    377             frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
     377            frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove,
    378378                    DirectionForward,
    379379                    keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
  • trunk/Source/WebKit/wx/ChangeLog

    r85823 r85864  
     12011-05-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Rename SelectionController to FrameSelection
     6        https://bugs.webkit.org/show_bug.cgi?id=60234
     7
     8        * WebDOMSelection.cpp:
     9        * WebDOMSelection.h:
     10        * WebKitSupport/EditorClientWx.cpp:
     11        * WebView.cpp:
     12
    1132011-05-04  Cris Neckar  <cdn@chromium.org>
    214
  • trunk/Source/WebKit/wx/WebDOMSelection.cpp

    r64229 r85864  
    3030
    3131#include "Element.h"
    32 #include "SelectionController.h"
     32#include "FrameSelection.h"
    3333#include "WebDOMElement.h"
    3434#include "WebDOMRange.h"
  • trunk/Source/WebKit/wx/WebDOMSelection.h

    r64229 r85864  
    4141namespace WebCore {
    4242
    43 class SelectionController;
     43class FrameSelection;
    4444
    4545}
     
    5252public:
    5353    wxWebKitSelection() {}
    54     wxWebKitSelection(WebCore::SelectionController* selection)
     54    wxWebKitSelection(WebCore::FrameSelection* selection)
    5555        : m_selection(selection)
    5656        { }
     
    6363
    6464private:
    65     WebCore::SelectionController* m_selection;
     65    WebCore::FrameSelection* m_selection;
    6666
    6767};
  • trunk/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp

    r84574 r85864  
    3232#include "FocusController.h"
    3333#include "Frame.h"
     34#include "FrameSelection.h"
    3435#include "FrameView.h"
    3536#include "HostWindow.h"
     
    3940#include "PlatformKeyboardEvent.h"
    4041#include "PlatformString.h"
    41 #include "SelectionController.h"
    4242#include "WebFrame.h"
    4343#include "WebFramePrivate.h"
  • trunk/Source/WebKit/wx/WebView.cpp

    r84743 r85864  
    3939#include "Frame.h"
    4040#include "FrameLoader.h"
     41#include "FrameSelection.h"
    4142#include "FrameView.h"
    4243#include "GraphicsContext.h"
     
    5455#include "ResourceHandleManager.h"
    5556#include "Scrollbar.h"
    56 #include "SelectionController.h"
    5757#include "Settings.h"
    5858#include "SubstituteData.h"
Note: See TracChangeset for help on using the changeset viewer.