Changeset 85864 in webkit
- Timestamp:
- May 5, 2011 11:14:43 AM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 88 edited
- 5 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r85850 r85864 653 653 editing/EditorCommand.cpp 654 654 editing/FormatBlockCommand.cpp 655 editing/FrameSelection.cpp 655 656 editing/HTMLInterchange.cpp 656 657 editing/IndentOutdentCommand.cpp … … 672 673 editing/ReplaceNodeWithSpanCommand.cpp 673 674 editing/ReplaceSelectionCommand.cpp 674 editing/SelectionController.cpp675 675 editing/SetNodeAttributeCommand.cpp 676 676 editing/SmartReplace.cpp -
trunk/Source/WebCore/ChangeLog
r85862 r85864 1 2011-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 1 241 2011-05-05 Brent Fulgham <bfulgham@webkit.org> 2 242 -
trunk/Source/WebCore/GNUmakefile.list.am
r85850 r85864 1324 1324 Source/WebCore/editing/FormatBlockCommand.cpp \ 1325 1325 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 \ 1327 1329 Source/WebCore/editing/htmlediting.cpp \ 1328 1330 Source/WebCore/editing/htmlediting.h \ … … 1367 1369 Source/WebCore/editing/ReplaceSelectionCommand.cpp \ 1368 1370 Source/WebCore/editing/ReplaceSelectionCommand.h \ 1369 Source/WebCore/editing/SelectionController.cpp \1370 Source/WebCore/editing/SelectionController.h \1371 1371 Source/WebCore/editing/SetNodeAttributeCommand.cpp \ 1372 1372 Source/WebCore/editing/SetNodeAttributeCommand.h \ -
trunk/Source/WebCore/WebCore.exp.in
r85826 r85864 349 349 __ZN7WebCore14DocumentLoaderD2Ev 350 350 __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 351 360 __ZN7WebCore14ResourceHandle12releaseProxyEv 352 361 __ZN7WebCore14ResourceHandle20forceContentSniffingEv … … 521 530 __ZN7WebCore19ResourceRequestBase25setDefaultTimeoutIntervalEd 522 531 __ZN7WebCore19ResourceRequestBase6setURLERKNS_4KURLE 523 __ZN7WebCore19SelectionController10setFocusedEb524 __ZN7WebCore19SelectionController12setSelectionERKNS_16VisibleSelectionEjNS0_19CursorAlignOnScrollENS_15TextGranularityENS_20DirectionalityPolicyE525 __ZN7WebCore19SelectionController15revealSelectionERKNS_15ScrollAlignmentEb526 __ZN7WebCore19SelectionController16setSelectedRangeEPNS_5RangeENS_9EAffinityEb527 __ZN7WebCore19SelectionController20setSelectionFromNoneEv528 __ZN7WebCore19SelectionController5clearEv529 __ZN7WebCore19SelectionController6modifyENS0_11EAlterationENS_18SelectionDirectionENS_15TextGranularityEb530 __ZN7WebCore19SelectionController9selectAllEv531 __ZN7WebCore19SelectionControllerC1EPNS_5FrameEb532 532 __ZN7WebCore19TextResourceDecoder5flushEv 533 533 __ZN7WebCore19TextResourceDecoder6decodeEPKcm … … 1118 1118 __ZNK7WebCore14DocumentLoader28urlForHistoryReflectsFailureEv 1119 1119 __ZNK7WebCore14DocumentLoader3urlEv 1120 __ZNK7WebCore14FrameSelection11currentFormEv 1121 __ZNK7WebCore14FrameSelection15copyTypingStyleEv 1122 __ZNK7WebCore14FrameSelection17isInPasswordFieldEv 1123 __ZNK7WebCore14FrameSelection18isFocusedAndActiveEv 1124 __ZNK7WebCore14FrameSelection31getClippedVisibleTextRectanglesERN3WTF6VectorINS_9FloatRectELm0EEE 1125 __ZNK7WebCore14FrameSelection6boundsEb 1120 1126 __ZNK7WebCore14RenderListItem10markerTextEv 1121 1127 __ZNK7WebCore14ResourceHandle10connectionEv … … 1158 1164 __ZNK7WebCore19ResourceRequestBase6isNullEv 1159 1165 __ZNK7WebCore19ResourceRequestBase7isEmptyEv 1160 __ZNK7WebCore19SelectionController11currentFormEv1161 __ZNK7WebCore19SelectionController15copyTypingStyleEv1162 __ZNK7WebCore19SelectionController17isInPasswordFieldEv1163 __ZNK7WebCore19SelectionController18isFocusedAndActiveEv1164 __ZNK7WebCore19SelectionController31getClippedVisibleTextRectanglesERN3WTF6VectorINS_9FloatRectELm0EEE1165 __ZNK7WebCore19SelectionController6boundsEb1166 1166 __ZNK7WebCore20HTMLTableCellElement9cellAboveEv 1167 1167 __ZNK7WebCore20ResourceResponseBase14httpStatusCodeEv -
trunk/Source/WebCore/WebCore.gypi
r85850 r85864 574 574 'editing/EditorInsertAction.h', 575 575 'editing/FindOptions.h', 576 'editing/FrameSelection.h', 576 577 'editing/HTMLInterchange.h', 577 578 'editing/MoveSelectionCommand.h', 578 579 'editing/ReplaceSelectionCommand.h', 579 'editing/SelectionController.h',580 580 'editing/SmartReplace.h', 581 581 'editing/SpellChecker.h', … … 2617 2617 'editing/FormatBlockCommand.cpp', 2618 2618 'editing/FormatBlockCommand.h', 2619 'editing/FrameSelection.cpp', 2619 2620 'editing/HTMLInterchange.cpp', 2620 2621 'editing/IndentOutdentCommand.cpp', … … 2652 2653 'editing/ReplaceNodeWithSpanCommand.h', 2653 2654 'editing/ReplaceSelectionCommand.cpp', 2654 'editing/SelectionController.cpp',2655 2655 'editing/SetNodeAttributeCommand.cpp', 2656 2656 'editing/SetNodeAttributeCommand.h', … … 2685 2685 'editing/brew/EditorBrew.cpp', 2686 2686 'editing/chromium/EditorChromium.cpp', 2687 'editing/chromium/ SelectionControllerChromium.cpp',2688 'editing/gtk/ SelectionControllerGtk.cpp',2687 'editing/chromium/FrameSelectionChromium.cpp', 2688 'editing/gtk/FrameSelectionGtk.cpp', 2689 2689 'editing/haiku/EditorHaiku.cpp', 2690 2690 'editing/htmlediting.cpp', 2691 2691 'editing/mac/EditorMac.mm', 2692 'editing/mac/ SelectionControllerMac.mm',2692 'editing/mac/FrameSelectionMac.mm', 2693 2693 'editing/markup.cpp', 2694 2694 'editing/qt/EditorQt.cpp', -
trunk/Source/WebCore/WebCore.pro
r85853 r85864 573 573 editing/EditorCommand.cpp \ 574 574 editing/FormatBlockCommand.cpp \ 575 editing/FrameSelection.cpp \ 575 576 editing/htmlediting.cpp \ 576 577 editing/HTMLInterchange.cpp \ … … 594 595 editing/ReplaceNodeWithSpanCommand.cpp \ 595 596 editing/ReplaceSelectionCommand.cpp \ 596 editing/SelectionController.cpp \597 597 editing/SetNodeAttributeCommand.cpp \ 598 598 editing/SmartReplaceICU.cpp \ … … 1545 1545 editing/FindOptions.h \ 1546 1546 editing/FormatBlockCommand.h \ 1547 editing/FrameSelection.h \ 1547 1548 editing/htmlediting.h \ 1548 1549 editing/HTMLInterchange.h \ … … 1565 1566 editing/ReplaceNodeWithSpanCommand.h \ 1566 1567 editing/ReplaceSelectionCommand.h \ 1567 editing/SelectionController.h \1568 1568 editing/SetNodeAttributeCommand.h \ 1569 1569 editing/SmartReplace.h \ -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r85850 r85864 48867 48867 </File> 48868 48868 <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 48869 48925 RelativePath="..\editing\htmlediting.cpp" 48870 48926 > … … 50036 50092 <File 50037 50093 RelativePath="..\editing\ReplaceSelectionCommand.h" 50038 >50039 </File>50040 <File50041 RelativePath="..\editing\SelectionController.cpp"50042 >50043 <FileConfiguration50044 Name="Debug|Win32"50045 ExcludedFromBuild="true"50046 >50047 <Tool50048 Name="VCCLCompilerTool"50049 />50050 </FileConfiguration>50051 <FileConfiguration50052 Name="Release|Win32"50053 ExcludedFromBuild="true"50054 >50055 <Tool50056 Name="VCCLCompilerTool"50057 />50058 </FileConfiguration>50059 <FileConfiguration50060 Name="Debug_Cairo_CFLite|Win32"50061 ExcludedFromBuild="true"50062 >50063 <Tool50064 Name="VCCLCompilerTool"50065 />50066 </FileConfiguration>50067 <FileConfiguration50068 Name="Release_Cairo_CFLite|Win32"50069 ExcludedFromBuild="true"50070 >50071 <Tool50072 Name="VCCLCompilerTool"50073 />50074 </FileConfiguration>50075 <FileConfiguration50076 Name="Debug_All|Win32"50077 ExcludedFromBuild="true"50078 >50079 <Tool50080 Name="VCCLCompilerTool"50081 />50082 </FileConfiguration>50083 <FileConfiguration50084 Name="Production|Win32"50085 ExcludedFromBuild="true"50086 >50087 <Tool50088 Name="VCCLCompilerTool"50089 />50090 </FileConfiguration>50091 </File>50092 <File50093 RelativePath="..\editing\SelectionController.h"50094 50094 > 50095 50095 </File> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r85850 r85864 1165 1165 4A0DA2FE129B241900AB61E1 /* FormAssociatedElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A0DA2FC129B241900AB61E1 /* FormAssociatedElement.cpp */; }; 1166 1166 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 */; }; 1168 1168 4ACBC0BE12713CBD0094F9B2 /* ClassList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ACBC0BC12713CBD0094F9B2 /* ClassList.cpp */; }; 1169 1169 4ACBC0BF12713CBD0094F9B2 /* ClassList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ACBC0BD12713CBD0094F9B2 /* ClassList.h */; }; … … 2818 2818 93309E09099E64920056E581 /* ReplaceSelectionCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DBA099E64910056E581 /* ReplaceSelectionCommand.cpp */; }; 2819 2819 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, ); }; }; 2822 2822 93309E0F099E64920056E581 /* SetNodeAttributeCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DC0099E64910056E581 /* SetNodeAttributeCommand.cpp */; }; 2823 2823 93309E10099E64920056E581 /* SetNodeAttributeCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DC1099E64910056E581 /* SetNodeAttributeCommand.h */; }; … … 7663 7663 4A0DA2FC129B241900AB61E1 /* FormAssociatedElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormAssociatedElement.cpp; sourceTree = "<group>"; }; 7664 7664 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>"; }; 7666 7666 4ACBC0BC12713CBD0094F9B2 /* ClassList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClassList.cpp; sourceTree = "<group>"; }; 7667 7667 4ACBC0BD12713CBD0094F9B2 /* ClassList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClassList.h; sourceTree = "<group>"; }; … … 9315 9315 93309DBA099E64910056E581 /* ReplaceSelectionCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReplaceSelectionCommand.cpp; sourceTree = "<group>"; }; 9316 9316 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>"; }; 9319 9319 93309DC0099E64910056E581 /* SetNodeAttributeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetNodeAttributeCommand.cpp; sourceTree = "<group>"; }; 9320 9320 93309DC1099E64910056E581 /* SetNodeAttributeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetNodeAttributeCommand.h; sourceTree = "<group>"; }; … … 15474 15474 D05CED270A40BB2C00C5AF38 /* FormatBlockCommand.cpp */, 15475 15475 D05CED280A40BB2C00C5AF38 /* FormatBlockCommand.h */, 15476 93309DBE099E64910056E581 /* FrameSelection.cpp */, 15477 93309DBF099E64910056E581 /* FrameSelection.h */, 15476 15478 93309D98099E64910056E581 /* htmlediting.cpp */, 15477 15479 93309D99099E64910056E581 /* htmlediting.h */, … … 15516 15518 93309DBA099E64910056E581 /* ReplaceSelectionCommand.cpp */, 15517 15519 93309DBB099E64910056E581 /* ReplaceSelectionCommand.h */, 15518 93309DBE099E64910056E581 /* SelectionController.cpp */,15519 93309DBF099E64910056E581 /* SelectionController.h */,15520 15520 93309DC0099E64910056E581 /* SetNodeAttributeCommand.cpp */, 15521 15521 93309DC1099E64910056E581 /* SetNodeAttributeCommand.h */, … … 18678 18678 children = ( 18679 18679 ED501DC50B249F2900AE18D9 /* EditorMac.mm */, 18680 4A8C96EA0BE69032004EEFF0 /* SelectionControllerMac.mm */,18680 4A8C96EA0BE69032004EEFF0 /* FrameSelectionMac.mm */, 18681 18681 ); 18682 18682 name = mac; … … 20930 20930 658436860AE01B7400E53753 /* FrameLoadRequest.h in Headers */, 20931 20931 628D214E12131EF40055DCFC /* FrameNetworkingContext.h in Headers */, 20932 93309E0E099E64920056E581 /* FrameSelection.h in Headers */, 20932 20933 65A21485097A3F5300B9050A /* FrameTree.h in Headers */, 20933 20934 65CBFEFA0974F607001DAC25 /* FrameView.h in Headers */, … … 22166 22167 B2C3DA2F0D006C1D00EF6F26 /* SegmentedString.h in Headers */, 22167 22168 084AEBE50FB505FA0038483E /* SelectElement.h in Headers */, 22168 93309E0E099E64920056E581 /* SelectionController.h in Headers */,22169 22169 BC7FA6810D1F167900DB22A9 /* SelectorNodeList.h in Headers */, 22170 22170 A75E497610752ACB00C9B896 /* SerializedScriptValue.h in Headers */, … … 23747 23747 D000EBA211BDAFD400C47726 /* FrameLoaderStateMachine.cpp in Sources */, 23748 23748 65BF02450974819000C43196 /* FrameMac.mm in Sources */, 23749 93309E0D099E64920056E581 /* FrameSelection.cpp in Sources */, 23750 4A8C96EB0BE69032004EEFF0 /* FrameSelectionMac.mm in Sources */, 23749 23751 65A21484097A3F5300B9050A /* FrameTree.cpp in Sources */, 23750 23752 65CBFEF90974F607001DAC25 /* FrameView.cpp in Sources */, … … 24963 24965 B2C3DA2E0D006C1D00EF6F26 /* SegmentedString.cpp in Sources */, 24964 24966 084AEBE40FB505FA0038483E /* SelectElement.cpp in Sources */, 24965 93309E0D099E64920056E581 /* SelectionController.cpp in Sources */,24966 4A8C96EB0BE69032004EEFF0 /* SelectionControllerMac.mm in Sources */,24967 24967 BC7FA6820D1F167900DB22A9 /* SelectorNodeList.cpp in Sources */, 24968 24968 A75E497710752ACB00C9B896 /* SerializedScriptValue.cpp in Sources */, -
trunk/Source/WebCore/accessibility/AccessibilityObject.cpp
r85157 r85864 36 36 #include "Frame.h" 37 37 #include "FrameLoader.h" 38 #include "FrameSelection.h" 38 39 #include "LocalizedStrings.h" 39 40 #include "NodeList.h" … … 48 49 #include "RenderView.h" 49 50 #include "RenderWidget.h" 50 #include "SelectionController.h"51 51 #include "TextIterator.h" 52 52 #include "htmlediting.h" -
trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
r85791 r85864 37 37 #include "Frame.h" 38 38 #include "FrameLoader.h" 39 #include "FrameSelection.h" 39 40 #include "HTMLAreaElement.h" 40 41 #include "HTMLFormElement.h" … … 72 73 #include "RenderWidget.h" 73 74 #include "SelectElement.h" 74 #include "SelectionController.h"75 75 #include "Text.h" 76 76 #include "TextIterator.h" … … 2440 2440 // starting at an empty line. The resulting selection in that case 2441 2441 // will be a caret at visiblePos. 2442 SelectionControllerselection;2442 FrameSelection selection; 2443 2443 selection.setSelection(VisibleSelection(visiblePos)); 2444 selection.modify( SelectionController::AlterationExtend, DirectionRight, LineBoundary);2444 selection.modify(FrameSelection::AlterationExtend, DirectionRight, LineBoundary); 2445 2445 2446 2446 return VisiblePositionRange(selection.selection().visibleStart(), selection.selection().visibleEnd()); -
trunk/Source/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
r85036 r85864 46 46 #import "Frame.h" 47 47 #import "FrameLoaderClient.h" 48 #import "FrameSelection.h" 48 49 #import "HTMLAnchorElement.h" 49 50 #import "HTMLAreaElement.h" … … 57 58 #import "RenderWidget.h" 58 59 #import "ScrollView.h" 59 #import "SelectionController.h"60 60 #import "SimpleFontData.h" 61 61 #import "TextCheckerClient.h" -
trunk/Source/WebCore/bindings/objc/ExceptionHandlers.h
r34956 r85864 43 43 typedef int ExceptionCode; 44 44 45 class SelectionController;45 class FrameSelection; 46 46 class Range; 47 47 -
trunk/Source/WebCore/css/CSSStyleSelector.cpp
r85834 r85864 57 57 #include "FontValue.h" 58 58 #include "Frame.h" 59 #include "FrameSelection.h" 59 60 #include "FrameView.h" 60 61 #include "HTMLDocument.h" … … 84 85 #include "ScaleTransformOperation.h" 85 86 #include "SecurityOrigin.h" 86 #include "SelectionController.h"87 87 #include "Settings.h" 88 88 #include "ShadowData.h" -
trunk/Source/WebCore/dom/ContainerNode.cpp
r85650 r85864 803 803 bool isEditorEnabled = false; 804 804 if (document()->frame() && document()->frame()->editor()->canEdit()) { 805 SelectionController* selection = document()->frame()->selection();805 FrameSelection* selection = document()->frame()->selection(); 806 806 Element* root = selection ? selection->rootEditableElement() : 0; 807 807 isEditorEnabled = root && isDescendantOf(root); -
trunk/Source/WebCore/dom/Document.cpp
r85785 r85864 70 70 #include "FrameLoader.h" 71 71 #include "FrameLoaderClient.h" 72 #include "FrameSelection.h" 72 73 #include "FrameTree.h" 73 74 #include "FrameView.h" … … 132 133 #include "SecurityOrigin.h" 133 134 #include "SegmentedString.h" 134 #include "SelectionController.h"135 135 #include "Settings.h" 136 136 #include "ShadowRoot.h" -
trunk/Source/WebCore/dom/InputElement.cpp
r83016 r85864 39 39 #include "EventNames.h" 40 40 #include "Frame.h" 41 #include "FrameSelection.h" 41 42 #include "Page.h" 42 43 #include "RenderTextControlSingleLine.h" 43 #include "SelectionController.h"44 44 #include "TextIterator.h" 45 45 -
trunk/Source/WebCore/editing/DeleteButtonController.cpp
r82946 r85864 36 36 #include "Editor.h" 37 37 #include "Frame.h" 38 #include "FrameSelection.h" 38 39 #include "htmlediting.h" 39 40 #include "HTMLDivElement.h" … … 44 45 #include "RemoveNodeCommand.h" 45 46 #include "RenderBox.h" 46 #include "SelectionController.h"47 47 48 48 namespace WebCore { -
trunk/Source/WebCore/editing/EditCommand.cpp
r84433 r85864 34 34 #include "EventNames.h" 35 35 #include "Frame.h" 36 #include "FrameSelection.h" 36 37 #include "ScopedEventQueue.h" 37 #include "SelectionController.h"38 38 #include "VisiblePosition.h" 39 39 #include "htmlediting.h" -
trunk/Source/WebCore/editing/EditingAllInOne.cpp
r83344 r85864 41 41 #include <EditorCommand.cpp> 42 42 #include <FormatBlockCommand.cpp> 43 #include <FrameSelection.cpp> 43 44 #include <HTMLInterchange.cpp> 44 45 #include <IndentOutdentCommand.cpp> … … 60 61 #include <ReplaceNodeWithSpanCommand.cpp> 61 62 #include <ReplaceSelectionCommand.cpp> 62 #include <SelectionController.cpp>63 63 #include <SetNodeAttributeCommand.cpp> 64 64 #include <SmartReplace.cpp> -
trunk/Source/WebCore/editing/EditingStyle.cpp
r83618 r85864 36 36 #include "CSSValueList.h" 37 37 #include "Frame.h" 38 #include "FrameSelection.h" 38 39 #include "HTMLFontElement.h" 39 40 #include "HTMLNames.h" … … 41 42 #include "Position.h" 42 43 #include "RenderStyle.h" 43 #include "SelectionController.h"44 44 #include "StyledElement.h" 45 45 #include "htmlediting.h" -
trunk/Source/WebCore/editing/Editor.cpp
r85036 r85864 238 238 if (imageElementFromImageDocument(m_frame->document())) 239 239 return true; 240 SelectionController* selection = m_frame->selection();240 FrameSelection* selection = m_frame->selection(); 241 241 return selection->isRange() && !selection->isInPasswordField(); 242 242 } … … 249 249 bool Editor::canDelete() const 250 250 { 251 SelectionController* selection = m_frame->selection();251 FrameSelection* selection = m_frame->selection(); 252 252 return selection->isRange() && selection->rootEditableElement(); 253 253 } … … 2033 2033 // Reset the charet one character further. 2034 2034 frame()->selection()->moveTo(frame()->selection()->end()); 2035 frame()->selection()->modify( SelectionController::AlterationMove, DirectionForward, CharacterGranularity);2035 frame()->selection()->modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity); 2036 2036 } 2037 2037 … … 2297 2297 m_frame->selection()->moveTo(selectionRange->endPosition(), DOWNSTREAM); 2298 2298 if (adjustSelectionForParagraphBoundaries) 2299 m_frame->selection()->modify( SelectionController::AlterationMove, DirectionForward, CharacterGranularity);2299 m_frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity); 2300 2300 } else { 2301 2301 // If this fails for any reason, the fallback is to go one position beyond the last replacement 2302 2302 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); 2304 2304 } 2305 2305 } … … 2715 2715 bool selectionDidNotChangeDOMPosition = newSelection == m_frame->selection()->selection(); 2716 2716 if (selectionDidNotChangeDOMPosition || m_frame->selection()->shouldChangeSelection(newSelection)) { 2717 SelectionController::SetSelectionOptions options = 0;2717 FrameSelection::SetSelectionOptions options = 0; 2718 2718 if (closeTyping) 2719 options |= SelectionController::CloseTyping;2719 options |= FrameSelection::CloseTyping; 2720 2720 if (clearTypingStyle) 2721 options |= SelectionController::ClearTypingStyle;2721 options |= FrameSelection::ClearTypingStyle; 2722 2722 m_frame->selection()->setSelection(newSelection, options); 2723 2723 } … … 2727 2727 // <div contentEditable="true"><div>^Hello</div></div> 2728 2728 // 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 call2729 // change the caret's DOM position (["hello", 0]). In these situations the above FrameSelection::setSelection call 2730 2730 // does not call EditorClient::respondToChangedSelection(), which, on the Mac, sends selection change notifications and 2731 2731 // starts a new kill ring sequence, but we want to do these things (matches AppKit). … … 3135 3135 } 3136 3136 3137 void Editor::respondToChangedSelection(const VisibleSelection& oldSelection, SelectionController::SetSelectionOptions options)3137 void Editor::respondToChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions options) 3138 3138 { 3139 3139 m_spellingCorrector->stopPendingCorrection(oldSelection); 3140 3140 3141 bool closeTyping = options & SelectionController::CloseTyping;3141 bool closeTyping = options & FrameSelection::CloseTyping; 3142 3142 bool isContinuousSpellCheckingEnabled = this->isContinuousSpellCheckingEnabled(); 3143 3143 bool isContinuousGrammarCheckingEnabled = isContinuousSpellCheckingEnabled && isGrammarCheckingEnabled(); … … 3154 3154 3155 3155 // 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); 3157 3157 3158 3158 // When typing we check spelling elsewhere, so don't redo it here. -
trunk/Source/WebCore/editing/Editor.h
r85442 r85864 35 35 #include "EditorInsertAction.h" 36 36 #include "FindOptions.h" 37 #include " SelectionController.h"37 #include "FrameSelection.h" 38 38 #include "TextChecking.h" 39 39 #include "VisibleSelection.h" … … 356 356 IntRect firstRectForRange(Range*) const; 357 357 358 void respondToChangedSelection(const VisibleSelection& oldSelection, SelectionController::SetSelectionOptions);358 void respondToChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions); 359 359 bool shouldChangeSelection(const VisibleSelection& oldSelection, const VisibleSelection& newSelection, EAffinity, bool stillSelecting) const; 360 360 -
trunk/Source/WebCore/editing/EditorCommand.cpp
r84574 r85864 377 377 RefPtr<Range> mark = frame->editor()->mark().toNormalizedRange(); 378 378 if (mark) { 379 SelectionController* selection = frame->selection();379 FrameSelection* selection = frame->selection(); 380 380 bool selected = selection->setSelectedRange(unionDOMRanges(mark.get(), frame->editor()->selectedRange().get()).get(), DOWNSTREAM, true); 381 381 ASSERT(selected); … … 607 607 static bool executeMoveBackward(Frame* frame, Event*, EditorCommandSource, const String&) 608 608 { 609 frame->selection()->modify( SelectionController::AlterationMove, DirectionBackward, CharacterGranularity, true);609 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, CharacterGranularity, true); 610 610 return true; 611 611 } … … 613 613 static bool executeMoveBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 614 614 { 615 frame->selection()->modify( SelectionController::AlterationExtend, DirectionBackward, CharacterGranularity, true);615 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, CharacterGranularity, true); 616 616 return true; 617 617 } … … 619 619 static bool executeMoveDown(Frame* frame, Event*, EditorCommandSource, const String&) 620 620 { 621 return frame->selection()->modify( SelectionController::AlterationMove, DirectionForward, LineGranularity, true);621 return frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, LineGranularity, true); 622 622 } 623 623 624 624 static bool executeMoveDownAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 625 625 { 626 frame->selection()->modify( SelectionController::AlterationExtend, DirectionForward, LineGranularity, true);626 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, LineGranularity, true); 627 627 return true; 628 628 } … … 630 630 static bool executeMoveForward(Frame* frame, Event*, EditorCommandSource, const String&) 631 631 { 632 frame->selection()->modify( SelectionController::AlterationMove, DirectionForward, CharacterGranularity, true);632 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, CharacterGranularity, true); 633 633 return true; 634 634 } … … 636 636 static bool executeMoveForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 637 637 { 638 frame->selection()->modify( SelectionController::AlterationExtend, DirectionForward, CharacterGranularity, true);638 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, CharacterGranularity, true); 639 639 return true; 640 640 } … … 642 642 static bool executeMoveLeft(Frame* frame, Event*, EditorCommandSource, const String&) 643 643 { 644 return frame->selection()->modify( SelectionController::AlterationMove, DirectionLeft, CharacterGranularity, true);644 return frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, CharacterGranularity, true); 645 645 } 646 646 647 647 static bool executeMoveLeftAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 648 648 { 649 frame->selection()->modify( SelectionController::AlterationExtend, DirectionLeft, CharacterGranularity, true);649 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, CharacterGranularity, true); 650 650 return true; 651 651 } … … 656 656 if (!distance) 657 657 return false; 658 return frame->selection()->modify( SelectionController::AlterationMove, distance, true, SelectionController::AlignCursorOnScrollAlways);658 return frame->selection()->modify(FrameSelection::AlterationMove, distance, true, FrameSelection::AlignCursorOnScrollAlways); 659 659 } 660 660 … … 664 664 if (!distance) 665 665 return false; 666 return frame->selection()->modify( SelectionController::AlterationExtend, distance, true, SelectionController::AlignCursorOnScrollAlways);666 return frame->selection()->modify(FrameSelection::AlterationExtend, distance, true, FrameSelection::AlignCursorOnScrollAlways); 667 667 } 668 668 … … 672 672 if (!distance) 673 673 return false; 674 return frame->selection()->modify( SelectionController::AlterationMove, -distance, true, SelectionController::AlignCursorOnScrollAlways);674 return frame->selection()->modify(FrameSelection::AlterationMove, -distance, true, FrameSelection::AlignCursorOnScrollAlways); 675 675 } 676 676 … … 680 680 if (!distance) 681 681 return false; 682 return frame->selection()->modify( SelectionController::AlterationExtend, -distance, true, SelectionController::AlignCursorOnScrollAlways);682 return frame->selection()->modify(FrameSelection::AlterationExtend, -distance, true, FrameSelection::AlignCursorOnScrollAlways); 683 683 } 684 684 685 685 static bool executeMoveRight(Frame* frame, Event*, EditorCommandSource, const String&) 686 686 { 687 return frame->selection()->modify( SelectionController::AlterationMove, DirectionRight, CharacterGranularity, true);687 return frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, CharacterGranularity, true); 688 688 } 689 689 690 690 static bool executeMoveRightAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 691 691 { 692 frame->selection()->modify( SelectionController::AlterationExtend, DirectionRight, CharacterGranularity, true);692 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, CharacterGranularity, true); 693 693 return true; 694 694 } … … 696 696 static bool executeMoveToBeginningOfDocument(Frame* frame, Event*, EditorCommandSource, const String&) 697 697 { 698 frame->selection()->modify( SelectionController::AlterationMove, DirectionBackward, DocumentBoundary, true);698 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, DocumentBoundary, true); 699 699 return true; 700 700 } … … 702 702 static bool executeMoveToBeginningOfDocumentAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 703 703 { 704 frame->selection()->modify( SelectionController::AlterationExtend, DirectionBackward, DocumentBoundary, true);704 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, DocumentBoundary, true); 705 705 return true; 706 706 } … … 708 708 static bool executeMoveToBeginningOfLine(Frame* frame, Event*, EditorCommandSource, const String&) 709 709 { 710 frame->selection()->modify( SelectionController::AlterationMove, DirectionBackward, LineBoundary, true);710 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, LineBoundary, true); 711 711 return true; 712 712 } … … 714 714 static bool executeMoveToBeginningOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 715 715 { 716 frame->selection()->modify( SelectionController::AlterationExtend, DirectionBackward, LineBoundary, true);716 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, LineBoundary, true); 717 717 return true; 718 718 } … … 720 720 static bool executeMoveToBeginningOfParagraph(Frame* frame, Event*, EditorCommandSource, const String&) 721 721 { 722 frame->selection()->modify( SelectionController::AlterationMove, DirectionBackward, ParagraphBoundary, true);722 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, ParagraphBoundary, true); 723 723 return true; 724 724 } … … 726 726 static bool executeMoveToBeginningOfParagraphAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 727 727 { 728 frame->selection()->modify( SelectionController::AlterationExtend, DirectionBackward, ParagraphBoundary, true);728 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, ParagraphBoundary, true); 729 729 return true; 730 730 } … … 732 732 static bool executeMoveToBeginningOfSentence(Frame* frame, Event*, EditorCommandSource, const String&) 733 733 { 734 frame->selection()->modify( SelectionController::AlterationMove, DirectionBackward, SentenceBoundary, true);734 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, SentenceBoundary, true); 735 735 return true; 736 736 } … … 738 738 static bool executeMoveToBeginningOfSentenceAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 739 739 { 740 frame->selection()->modify( SelectionController::AlterationExtend, DirectionBackward, SentenceBoundary, true);740 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, SentenceBoundary, true); 741 741 return true; 742 742 } … … 744 744 static bool executeMoveToEndOfDocument(Frame* frame, Event*, EditorCommandSource, const String&) 745 745 { 746 frame->selection()->modify( SelectionController::AlterationMove, DirectionForward, DocumentBoundary, true);746 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, DocumentBoundary, true); 747 747 return true; 748 748 } … … 750 750 static bool executeMoveToEndOfDocumentAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 751 751 { 752 frame->selection()->modify( SelectionController::AlterationExtend, DirectionForward, DocumentBoundary, true);752 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, DocumentBoundary, true); 753 753 return true; 754 754 } … … 756 756 static bool executeMoveToEndOfSentence(Frame* frame, Event*, EditorCommandSource, const String&) 757 757 { 758 frame->selection()->modify( SelectionController::AlterationMove, DirectionForward, SentenceBoundary, true);758 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, SentenceBoundary, true); 759 759 return true; 760 760 } … … 762 762 static bool executeMoveToEndOfSentenceAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 763 763 { 764 frame->selection()->modify( SelectionController::AlterationExtend, DirectionForward, SentenceBoundary, true);764 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, SentenceBoundary, true); 765 765 return true; 766 766 } … … 768 768 static bool executeMoveToEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&) 769 769 { 770 frame->selection()->modify( SelectionController::AlterationMove, DirectionForward, LineBoundary, true);770 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, LineBoundary, true); 771 771 return true; 772 772 } … … 774 774 static bool executeMoveToEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 775 775 { 776 frame->selection()->modify( SelectionController::AlterationExtend, DirectionForward, LineBoundary, true);776 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, LineBoundary, true); 777 777 return true; 778 778 } … … 780 780 static bool executeMoveToEndOfParagraph(Frame* frame, Event*, EditorCommandSource, const String&) 781 781 { 782 frame->selection()->modify( SelectionController::AlterationMove, DirectionForward, ParagraphBoundary, true);782 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, ParagraphBoundary, true); 783 783 return true; 784 784 } … … 786 786 static bool executeMoveToEndOfParagraphAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 787 787 { 788 frame->selection()->modify( SelectionController::AlterationExtend, DirectionForward, ParagraphBoundary, true);788 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, ParagraphBoundary, true); 789 789 return true; 790 790 } … … 792 792 static bool executeMoveParagraphBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 793 793 { 794 frame->selection()->modify( SelectionController::AlterationExtend, DirectionBackward, ParagraphGranularity, true);794 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, ParagraphGranularity, true); 795 795 return true; 796 796 } … … 798 798 static bool executeMoveParagraphForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 799 799 { 800 frame->selection()->modify( SelectionController::AlterationExtend, DirectionForward, ParagraphGranularity, true);800 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, ParagraphGranularity, true); 801 801 return true; 802 802 } … … 804 804 static bool executeMoveUp(Frame* frame, Event*, EditorCommandSource, const String&) 805 805 { 806 return frame->selection()->modify( SelectionController::AlterationMove, DirectionBackward, LineGranularity, true);806 return frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, LineGranularity, true); 807 807 } 808 808 809 809 static bool executeMoveUpAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 810 810 { 811 frame->selection()->modify( SelectionController::AlterationExtend, DirectionBackward, LineGranularity, true);811 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, LineGranularity, true); 812 812 return true; 813 813 } … … 815 815 static bool executeMoveWordBackward(Frame* frame, Event*, EditorCommandSource, const String&) 816 816 { 817 frame->selection()->modify( SelectionController::AlterationMove, DirectionBackward, WordGranularity, true);817 frame->selection()->modify(FrameSelection::AlterationMove, DirectionBackward, WordGranularity, true); 818 818 return true; 819 819 } … … 821 821 static bool executeMoveWordBackwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 822 822 { 823 frame->selection()->modify( SelectionController::AlterationExtend, DirectionBackward, WordGranularity, true);823 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionBackward, WordGranularity, true); 824 824 return true; 825 825 } … … 827 827 static bool executeMoveWordForward(Frame* frame, Event*, EditorCommandSource, const String&) 828 828 { 829 frame->selection()->modify( SelectionController::AlterationMove, DirectionForward, WordGranularity, true);829 frame->selection()->modify(FrameSelection::AlterationMove, DirectionForward, WordGranularity, true); 830 830 return true; 831 831 } … … 833 833 static bool executeMoveWordForwardAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 834 834 { 835 frame->selection()->modify( SelectionController::AlterationExtend, DirectionForward, WordGranularity, true);835 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionForward, WordGranularity, true); 836 836 return true; 837 837 } … … 839 839 static bool executeMoveWordLeft(Frame* frame, Event*, EditorCommandSource, const String&) 840 840 { 841 frame->selection()->modify( SelectionController::AlterationMove, DirectionLeft, WordGranularity, true);841 frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, WordGranularity, true); 842 842 return true; 843 843 } … … 845 845 static bool executeMoveWordLeftAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 846 846 { 847 frame->selection()->modify( SelectionController::AlterationExtend, DirectionLeft, WordGranularity, true);847 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, WordGranularity, true); 848 848 return true; 849 849 } … … 851 851 static bool executeMoveWordRight(Frame* frame, Event*, EditorCommandSource, const String&) 852 852 { 853 frame->selection()->modify( SelectionController::AlterationMove, DirectionRight, WordGranularity, true);853 frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, WordGranularity, true); 854 854 return true; 855 855 } … … 857 857 static bool executeMoveWordRightAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 858 858 { 859 frame->selection()->modify( SelectionController::AlterationExtend, DirectionRight, WordGranularity, true);859 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, WordGranularity, true); 860 860 return true; 861 861 } … … 863 863 static bool executeMoveToLeftEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&) 864 864 { 865 frame->selection()->modify( SelectionController::AlterationMove, DirectionLeft, LineBoundary, true);865 frame->selection()->modify(FrameSelection::AlterationMove, DirectionLeft, LineBoundary, true); 866 866 return true; 867 867 } … … 869 869 static bool executeMoveToLeftEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 870 870 { 871 frame->selection()->modify( SelectionController::AlterationExtend, DirectionLeft, LineBoundary, true);871 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionLeft, LineBoundary, true); 872 872 return true; 873 873 } … … 875 875 static bool executeMoveToRightEndOfLine(Frame* frame, Event*, EditorCommandSource, const String&) 876 876 { 877 frame->selection()->modify( SelectionController::AlterationMove, DirectionRight, LineBoundary, true);877 frame->selection()->modify(FrameSelection::AlterationMove, DirectionRight, LineBoundary, true); 878 878 return true; 879 879 } … … 881 881 static bool executeMoveToRightEndOfLineAndModifySelection(Frame* frame, Event*, EditorCommandSource, const String&) 882 882 { 883 frame->selection()->modify( SelectionController::AlterationExtend, DirectionRight, LineBoundary, true);883 frame->selection()->modify(FrameSelection::AlterationExtend, DirectionRight, LineBoundary, true); 884 884 return true; 885 885 } -
trunk/Source/WebCore/editing/FrameSelection.cpp
r85863 r85864 25 25 26 26 #include "config.h" 27 #include " SelectionController.h"27 #include "FrameSelection.h" 28 28 29 29 #include "CharacterData.h" … … 71 71 const int NoXPosForVerticalArrowNavigation = INT_MIN; 72 72 73 SelectionController::SelectionController(Frame* frame, bool isDragCaretController)73 FrameSelection::FrameSelection(Frame* frame, bool isDragCaretController) 74 74 : m_frame(frame) 75 75 , m_xPosForVerticalArrowNavigation(NoXPosForVerticalArrowNavigation) 76 76 , m_granularity(CharacterGranularity) 77 , m_caretBlinkTimer(this, & SelectionController::caretBlinkTimerFired)77 , m_caretBlinkTimer(this, &FrameSelection::caretBlinkTimerFired) 78 78 , m_caretRectNeedsUpdate(true) 79 79 , m_absCaretBoundsDirty(true) … … 87 87 } 88 88 89 void SelectionController::moveTo(const VisiblePosition &pos, bool userTriggered, CursorAlignOnScroll align)89 void FrameSelection::moveTo(const VisiblePosition &pos, bool userTriggered, CursorAlignOnScroll align) 90 90 { 91 91 SetSelectionOptions options = CloseTyping | ClearTypingStyle; … … 95 95 } 96 96 97 void SelectionController::moveTo(const VisiblePosition &base, const VisiblePosition &extent, bool userTriggered)97 void FrameSelection::moveTo(const VisiblePosition &base, const VisiblePosition &extent, bool userTriggered) 98 98 { 99 99 SetSelectionOptions options = CloseTyping | ClearTypingStyle; … … 103 103 } 104 104 105 void SelectionController::moveTo(const Position &pos, EAffinity affinity, bool userTriggered)105 void FrameSelection::moveTo(const Position &pos, EAffinity affinity, bool userTriggered) 106 106 { 107 107 SetSelectionOptions options = CloseTyping | ClearTypingStyle; … … 111 111 } 112 112 113 void SelectionController::moveTo(const Range *r, EAffinity affinity, bool userTriggered)113 void FrameSelection::moveTo(const Range *r, EAffinity affinity, bool userTriggered) 114 114 { 115 115 SetSelectionOptions options = CloseTyping | ClearTypingStyle; … … 120 120 } 121 121 122 void SelectionController::moveTo(const Position &base, const Position &extent, EAffinity affinity, bool userTriggered)122 void FrameSelection::moveTo(const Position &base, const Position &extent, EAffinity affinity, bool userTriggered) 123 123 { 124 124 SetSelectionOptions options = CloseTyping | ClearTypingStyle; … … 128 128 } 129 129 130 void SelectionController::setSelection(const VisibleSelection& s, SetSelectionOptions options, CursorAlignOnScroll align, TextGranularity granularity, DirectionalityPolicy directionalityPolicy)130 void FrameSelection::setSelection(const VisibleSelection& s, SetSelectionOptions options, CursorAlignOnScroll align, TextGranularity granularity, DirectionalityPolicy directionalityPolicy) 131 131 { 132 132 m_granularity = granularity; … … 151 151 } 152 152 153 // <http://bugs.webkit.org/show_bug.cgi?id=23464>: Infinite recursion at SelectionController::setSelection153 // <http://bugs.webkit.org/show_bug.cgi?id=23464>: Infinite recursion at FrameSelection::setSelection 154 154 // if document->frame() == m_frame we can get into an infinite loop 155 155 if (s.base().anchorNode()) { … … 220 220 } 221 221 222 void SelectionController::nodeWillBeRemoved(Node *node)222 void FrameSelection::nodeWillBeRemoved(Node *node) 223 223 { 224 224 if (isNone()) … … 234 234 } 235 235 236 void SelectionController::respondToNodeModification(Node* node, bool baseRemoved, bool extentRemoved, bool startRemoved, bool endRemoved)236 void FrameSelection::respondToNodeModification(Node* node, bool baseRemoved, bool extentRemoved, bool startRemoved, bool endRemoved) 237 237 { 238 238 bool clearRenderTreeSelection = false; … … 296 296 } 297 297 298 void SelectionController::textWillBeReplaced(CharacterData* node, unsigned offset, unsigned oldLength, unsigned newLength)298 void FrameSelection::textWillBeReplaced(CharacterData* node, unsigned offset, unsigned oldLength, unsigned newLength) 299 299 { 300 300 // The fragment check is a performance optimization. See http://trac.webkit.org/changeset/30062. … … 330 330 } 331 331 332 void SelectionController::setIsDirectional(bool isDirectional)332 void FrameSelection::setIsDirectional(bool isDirectional) 333 333 { 334 334 m_isDirectional = !m_frame || m_frame->editor()->behavior().shouldConsiderSelectionAsDirectional() || isDirectional; 335 335 } 336 336 337 TextDirection SelectionController::directionOfEnclosingBlock()337 TextDirection FrameSelection::directionOfEnclosingBlock() 338 338 { 339 339 return WebCore::directionOfEnclosingBlock(m_selection.extent()); 340 340 } 341 341 342 void SelectionController::willBeModified(EAlteration alter, SelectionDirection direction)342 void FrameSelection::willBeModified(EAlteration alter, SelectionDirection direction) 343 343 { 344 344 if (alter != AlterationExtend) … … 389 389 } 390 390 391 VisiblePosition SelectionController::positionForPlatform(bool isGetStart) const391 VisiblePosition FrameSelection::positionForPlatform(bool isGetStart) const 392 392 { 393 393 Settings* settings = m_frame ? m_frame->settings() : 0; … … 402 402 } 403 403 404 VisiblePosition SelectionController::startForPlatform() const404 VisiblePosition FrameSelection::startForPlatform() const 405 405 { 406 406 return positionForPlatform(true); 407 407 } 408 408 409 VisiblePosition SelectionController::endForPlatform() const409 VisiblePosition FrameSelection::endForPlatform() const 410 410 { 411 411 return positionForPlatform(false); 412 412 } 413 413 414 VisiblePosition SelectionController::modifyExtendingRight(TextGranularity granularity)414 VisiblePosition FrameSelection::modifyExtendingRight(TextGranularity granularity) 415 415 { 416 416 VisiblePosition pos(m_selection.extent(), m_selection.affinity()); … … 455 455 } 456 456 457 VisiblePosition SelectionController::modifyExtendingForward(TextGranularity granularity)457 VisiblePosition FrameSelection::modifyExtendingForward(TextGranularity granularity) 458 458 { 459 459 VisiblePosition pos(m_selection.extent(), m_selection.affinity()); … … 497 497 } 498 498 499 VisiblePosition SelectionController::modifyMovingRight(TextGranularity granularity)499 VisiblePosition FrameSelection::modifyMovingRight(TextGranularity granularity) 500 500 { 501 501 VisiblePosition pos; … … 530 530 } 531 531 532 VisiblePosition SelectionController::modifyMovingForward(TextGranularity granularity)532 VisiblePosition FrameSelection::modifyMovingForward(TextGranularity granularity) 533 533 { 534 534 VisiblePosition pos; … … 580 580 } 581 581 582 VisiblePosition SelectionController::modifyExtendingLeft(TextGranularity granularity)582 VisiblePosition FrameSelection::modifyExtendingLeft(TextGranularity granularity) 583 583 { 584 584 VisiblePosition pos(m_selection.extent(), m_selection.affinity()); … … 622 622 } 623 623 624 VisiblePosition SelectionController::modifyExtendingBackward(TextGranularity granularity)624 VisiblePosition FrameSelection::modifyExtendingBackward(TextGranularity granularity) 625 625 { 626 626 VisiblePosition pos(m_selection.extent(), m_selection.affinity()); … … 668 668 } 669 669 670 VisiblePosition SelectionController::modifyMovingLeft(TextGranularity granularity)670 VisiblePosition FrameSelection::modifyMovingLeft(TextGranularity granularity) 671 671 { 672 672 VisiblePosition pos; … … 701 701 } 702 702 703 VisiblePosition SelectionController::modifyMovingBackward(TextGranularity granularity)703 VisiblePosition FrameSelection::modifyMovingBackward(TextGranularity granularity) 704 704 { 705 705 VisiblePosition pos; … … 750 750 } 751 751 752 bool SelectionController::modify(EAlteration alter, SelectionDirection direction, TextGranularity granularity, bool userTriggered)752 bool FrameSelection::modify(EAlteration alter, SelectionDirection direction, TextGranularity granularity, bool userTriggered) 753 753 { 754 754 if (userTriggered) { 755 SelectionController trialSelectionController;756 trial SelectionController.setSelection(m_selection);757 trial SelectionController.setIsDirectional(m_isDirectional);758 trial SelectionController.modify(alter, direction, granularity, false);759 760 bool change = shouldChangeSelection(trial SelectionController.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()); 761 761 if (!change) 762 762 return false; … … 851 851 } 852 852 853 bool SelectionController::modify(EAlteration alter, int verticalDistance, bool userTriggered, CursorAlignOnScroll align)853 bool FrameSelection::modify(EAlteration alter, int verticalDistance, bool userTriggered, CursorAlignOnScroll align) 854 854 { 855 855 if (!verticalDistance) … … 857 857 858 858 if (userTriggered) { 859 SelectionController trialSelectionController;860 trial SelectionController.setSelection(m_selection);861 trial SelectionController.setIsDirectional(m_isDirectional);862 trial SelectionController.modify(alter, verticalDistance, false);863 864 bool change = shouldChangeSelection(trial SelectionController.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()); 865 865 if (!change) 866 866 return false; … … 934 934 } 935 935 936 int SelectionController::xPosForVerticalArrowNavigation(EPositionType type)936 int FrameSelection::xPosForVerticalArrowNavigation(EPositionType type) 937 937 { 938 938 int x = 0; … … 973 973 } 974 974 975 void SelectionController::clear()975 void FrameSelection::clear() 976 976 { 977 977 m_granularity = CharacterGranularity; … … 979 979 } 980 980 981 void SelectionController::setStart(const VisiblePosition &pos, bool userTriggered)981 void FrameSelection::setStart(const VisiblePosition &pos, bool userTriggered) 982 982 { 983 983 if (m_selection.isBaseFirst()) … … 987 987 } 988 988 989 void SelectionController::setEnd(const VisiblePosition &pos, bool userTriggered)989 void FrameSelection::setEnd(const VisiblePosition &pos, bool userTriggered) 990 990 { 991 991 if (m_selection.isBaseFirst()) … … 995 995 } 996 996 997 void SelectionController::setBase(const VisiblePosition &pos, bool userTriggered)997 void FrameSelection::setBase(const VisiblePosition &pos, bool userTriggered) 998 998 { 999 999 SetSelectionOptions options = CloseTyping | ClearTypingStyle; … … 1003 1003 } 1004 1004 1005 void SelectionController::setExtent(const VisiblePosition &pos, bool userTriggered)1005 void FrameSelection::setExtent(const VisiblePosition &pos, bool userTriggered) 1006 1006 { 1007 1007 SetSelectionOptions options = CloseTyping | ClearTypingStyle; … … 1011 1011 } 1012 1012 1013 void SelectionController::setBase(const Position &pos, EAffinity affinity, bool userTriggered)1013 void FrameSelection::setBase(const Position &pos, EAffinity affinity, bool userTriggered) 1014 1014 { 1015 1015 SetSelectionOptions options = CloseTyping | ClearTypingStyle; … … 1019 1019 } 1020 1020 1021 void SelectionController::setExtent(const Position &pos, EAffinity affinity, bool userTriggered)1021 void FrameSelection::setExtent(const Position &pos, EAffinity affinity, bool userTriggered) 1022 1022 { 1023 1023 SetSelectionOptions options = CloseTyping | ClearTypingStyle; … … 1027 1027 } 1028 1028 1029 void SelectionController::setCaretRectNeedsUpdate(bool flag)1029 void FrameSelection::setCaretRectNeedsUpdate(bool flag) 1030 1030 { 1031 1031 m_caretRectNeedsUpdate = flag; 1032 1032 } 1033 1033 1034 void SelectionController::updateCaretRect()1034 void FrameSelection::updateCaretRect() 1035 1035 { 1036 1036 if (isNone() || !m_selection.start().anchorNode()->inDocument() || !m_selection.end().anchorNode()->inDocument()) { … … 1078 1078 } 1079 1079 1080 RenderObject* SelectionController::caretRenderer() const1080 RenderObject* FrameSelection::caretRenderer() const 1081 1081 { 1082 1082 Node* node = m_selection.start().deprecatedNode(); … … 1093 1093 } 1094 1094 1095 IntRect SelectionController::localCaretRect()1095 IntRect FrameSelection::localCaretRect() 1096 1096 { 1097 1097 if (m_caretRectNeedsUpdate) … … 1101 1101 } 1102 1102 1103 IntRect SelectionController::absoluteBoundsForLocalRect(const IntRect& rect) const1103 IntRect FrameSelection::absoluteBoundsForLocalRect(const IntRect& rect) const 1104 1104 { 1105 1105 RenderObject* caretPainter = caretRenderer(); … … 1113 1113 } 1114 1114 1115 IntRect SelectionController::absoluteCaretBounds()1115 IntRect FrameSelection::absoluteCaretBounds() 1116 1116 { 1117 1117 recomputeCaretRect(); … … 1129 1129 } 1130 1130 1131 IntRect SelectionController::caretRepaintRect() const1131 IntRect FrameSelection::caretRepaintRect() const 1132 1132 { 1133 1133 return absoluteBoundsForLocalRect(repaintRectForCaret(localCaretRectForPainting())); 1134 1134 } 1135 1135 1136 bool SelectionController::recomputeCaretRect()1136 bool FrameSelection::recomputeCaretRect() 1137 1137 { 1138 1138 if (!m_caretRectNeedsUpdate) … … 1174 1174 } 1175 1175 1176 bool SelectionController::shouldRepaintCaret(const RenderView* view) const1176 bool FrameSelection::shouldRepaintCaret(const RenderView* view) const 1177 1177 { 1178 1178 ASSERT(view); … … 1182 1182 } 1183 1183 1184 void SelectionController::invalidateCaretRect()1184 void FrameSelection::invalidateCaretRect() 1185 1185 { 1186 1186 if (!isCaret()) … … 1213 1213 } 1214 1214 1215 void SelectionController::paintCaret(GraphicsContext* context, int tx, int ty, const IntRect& clipRect)1215 void FrameSelection::paintCaret(GraphicsContext* context, int tx, int ty, const IntRect& clipRect) 1216 1216 { 1217 1217 #if ENABLE(TEXT_CARET) … … 1248 1248 } 1249 1249 1250 void SelectionController::debugRenderer(RenderObject *r, bool selected) const1250 void FrameSelection::debugRenderer(RenderObject *r, bool selected) const 1251 1251 { 1252 1252 if (r->node()->isElementNode()) { … … 1313 1313 } 1314 1314 1315 bool SelectionController::contains(const IntPoint& point)1315 bool FrameSelection::contains(const IntPoint& point) 1316 1316 { 1317 1317 Document* document = m_frame->document(); … … 1350 1350 // for the focus to move to another frame. So instead we call it from places where we are selecting with the 1351 1351 // mouse or the keyboard after setting the selection. 1352 void SelectionController::selectFrameElementInParentIfFullySelected()1352 void FrameSelection::selectFrameElementInParentIfFullySelected() 1353 1353 { 1354 1354 // Find the parent frame; if there is none, then we have nothing to do. … … 1393 1393 } 1394 1394 1395 void SelectionController::selectAll()1395 void FrameSelection::selectAll() 1396 1396 { 1397 1397 Document* document = m_frame->document(); … … 1419 1419 } 1420 1420 1421 bool SelectionController::setSelectedRange(Range* range, EAffinity affinity, bool closeTyping)1421 bool FrameSelection::setSelectedRange(Range* range, EAffinity affinity, bool closeTyping) 1422 1422 { 1423 1423 if (!range) … … 1463 1463 } 1464 1464 1465 bool SelectionController::isInPasswordField() const1465 bool FrameSelection::isInPasswordField() const 1466 1466 { 1467 1467 ASSERT(start().isNull() || start().anchorType() == Position::PositionIsOffsetInAnchor … … 1481 1481 } 1482 1482 1483 bool SelectionController::caretRendersInsideNode(Node* node) const1483 bool FrameSelection::caretRendersInsideNode(Node* node) const 1484 1484 { 1485 1485 if (!node) … … 1488 1488 } 1489 1489 1490 void SelectionController::focusedOrActiveStateChanged()1490 void FrameSelection::focusedOrActiveStateChanged() 1491 1491 { 1492 1492 bool activeAndFocused = isFocusedAndActive(); … … 1521 1521 } 1522 1522 1523 void SelectionController::pageActivationChanged()1523 void FrameSelection::pageActivationChanged() 1524 1524 { 1525 1525 focusedOrActiveStateChanged(); 1526 1526 } 1527 1527 1528 void SelectionController::updateSecureKeyboardEntryIfActive()1528 void FrameSelection::updateSecureKeyboardEntryIfActive() 1529 1529 { 1530 1530 if (m_frame->document() && isFocusedAndActive()) … … 1532 1532 } 1533 1533 1534 void SelectionController::setUseSecureKeyboardEntry(bool enable)1534 void FrameSelection::setUseSecureKeyboardEntry(bool enable) 1535 1535 { 1536 1536 if (enable) … … 1540 1540 } 1541 1541 1542 void SelectionController::setFocused(bool flag)1542 void FrameSelection::setFocused(bool flag) 1543 1543 { 1544 1544 if (m_focused == flag) … … 1549 1549 } 1550 1550 1551 bool SelectionController::isFocusedAndActive() const1551 bool FrameSelection::isFocusedAndActive() const 1552 1552 { 1553 1553 return m_focused && m_frame->page() && m_frame->page()->focusController()->isActive(); 1554 1554 } 1555 1555 1556 void SelectionController::updateAppearance()1556 void FrameSelection::updateAppearance() 1557 1557 { 1558 1558 ASSERT(!m_isDragCaretController); … … 1611 1611 1612 1612 // 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 SelectionControllerof text removal.1613 // because we don't yet notify the FrameSelection of text removal. 1614 1614 if (startPos.isNotNull() && endPos.isNotNull() && selection.visibleStart() != selection.visibleEnd()) { 1615 1615 RenderObject* startRenderer = startPos.deprecatedNode()->renderer(); … … 1619 1619 } 1620 1620 1621 void SelectionController::setCaretVisible(bool flag)1621 void FrameSelection::setCaretVisible(bool flag) 1622 1622 { 1623 1623 if (m_caretVisible == flag) … … 1628 1628 } 1629 1629 1630 void SelectionController::clearCaretRectIfNeeded()1630 void FrameSelection::clearCaretRectIfNeeded() 1631 1631 { 1632 1632 #if ENABLE(TEXT_CARET) … … 1638 1638 } 1639 1639 1640 void SelectionController::caretBlinkTimerFired(Timer<SelectionController>*)1640 void FrameSelection::caretBlinkTimerFired(Timer<FrameSelection>*) 1641 1641 { 1642 1642 #if ENABLE(TEXT_CARET) … … 1651 1651 } 1652 1652 1653 void SelectionController::notifyRendererOfSelectionChange(bool userTriggered)1653 void FrameSelection::notifyRendererOfSelectionChange(bool userTriggered) 1654 1654 { 1655 1655 m_frame->document()->updateStyleIfNeeded(); … … 1678 1678 } 1679 1679 1680 void SelectionController::setFocusedNodeIfNeeded()1680 void FrameSelection::setFocusedNodeIfNeeded() 1681 1681 { 1682 1682 if (isNone() || !isFocused()) … … 1710 1710 } 1711 1711 1712 void SelectionController::paintDragCaret(GraphicsContext* p, int tx, int ty, const IntRect& clipRect) const1712 void FrameSelection::paintDragCaret(GraphicsContext* p, int tx, int ty, const IntRect& clipRect) const 1713 1713 { 1714 1714 #if ENABLE(TEXT_CARET) 1715 SelectionController* dragCaretController = m_frame->page()->dragCaretController();1715 FrameSelection* dragCaretController = m_frame->page()->dragCaretController(); 1716 1716 ASSERT(dragCaretController->selection().isCaret()); 1717 1717 if (dragCaretController->selection().start().anchorNode()->document()->frame() == m_frame) … … 1725 1725 } 1726 1726 1727 PassRefPtr<CSSMutableStyleDeclaration> SelectionController::copyTypingStyle() const1727 PassRefPtr<CSSMutableStyleDeclaration> FrameSelection::copyTypingStyle() const 1728 1728 { 1729 1729 if (!m_typingStyle || !m_typingStyle->style()) … … 1732 1732 } 1733 1733 1734 bool SelectionController::shouldDeleteSelection(const VisibleSelection& selection) const1734 bool FrameSelection::shouldDeleteSelection(const VisibleSelection& selection) const 1735 1735 { 1736 1736 return m_frame->editor()->client()->shouldDeleteRange(selection.toNormalizedRange().get()); 1737 1737 } 1738 1738 1739 FloatRect SelectionController::bounds(bool clipToVisibleContent) const1739 FloatRect FrameSelection::bounds(bool clipToVisibleContent) const 1740 1740 { 1741 1741 RenderView* root = m_frame->contentRenderer(); … … 1748 1748 } 1749 1749 1750 void SelectionController::getClippedVisibleTextRectangles(Vector<FloatRect>& rectangles) const1750 void FrameSelection::getClippedVisibleTextRectangles(Vector<FloatRect>& rectangles) const 1751 1751 { 1752 1752 RenderView* root = m_frame->contentRenderer(); … … 1784 1784 1785 1785 // We look for either the form containing the current focus, or for one immediately after it 1786 HTMLFormElement* SelectionController::currentForm() const1786 HTMLFormElement* FrameSelection::currentForm() const 1787 1787 { 1788 1788 // Start looking either at the active (first responder) node, or where the selection is. … … 1804 1804 } 1805 1805 1806 void SelectionController::revealSelection(const ScrollAlignment& alignment, bool revealExtent)1806 void FrameSelection::revealSelection(const ScrollAlignment& alignment, bool revealExtent) 1807 1807 { 1808 1808 IntRect rect; … … 1832 1832 } 1833 1833 1834 void SelectionController::setSelectionFromNone()1834 void FrameSelection::setSelectionFromNone() 1835 1835 { 1836 1836 // Put a caret inside the body if the entire frame is editable (either the … … 1849 1849 } 1850 1850 1851 bool SelectionController::shouldChangeSelection(const VisibleSelection& newSelection) const1851 bool FrameSelection::shouldChangeSelection(const VisibleSelection& newSelection) const 1852 1852 { 1853 1853 return m_frame->editor()->shouldChangeSelection(selection(), newSelection, newSelection.affinity(), false); … … 1856 1856 #ifndef NDEBUG 1857 1857 1858 void SelectionController::formatForDebugger(char* buffer, unsigned length) const1858 void FrameSelection::formatForDebugger(char* buffer, unsigned length) const 1859 1859 { 1860 1860 m_selection.formatForDebugger(buffer, length); 1861 1861 } 1862 1862 1863 void SelectionController::showTreeForThis() const1863 void FrameSelection::showTreeForThis() const 1864 1864 { 1865 1865 m_selection.showTreeForThis(); … … 1872 1872 #ifndef NDEBUG 1873 1873 1874 void showTree(const WebCore:: SelectionController& sel)1874 void showTree(const WebCore::FrameSelection& sel) 1875 1875 { 1876 1876 sel.showTreeForThis(); 1877 1877 } 1878 1878 1879 void showTree(const WebCore:: SelectionController* sel)1879 void showTree(const WebCore::FrameSelection* sel) 1880 1880 { 1881 1881 if (sel) -
trunk/Source/WebCore/editing/FrameSelection.h
r85863 r85864 24 24 */ 25 25 26 #ifndef SelectionController_h27 #define SelectionController_h26 #ifndef FrameSelection_h 27 #define FrameSelection_h 28 28 29 29 #include "EditingStyle.h" … … 49 49 enum DirectionalityPolicy { MakeNonDirectionalSelection, MakeDirectionalSelection }; 50 50 51 class SelectionController { 52 WTF_MAKE_NONCOPYABLE(SelectionController); WTF_MAKE_FAST_ALLOCATED; 51 class FrameSelection { 52 WTF_MAKE_NONCOPYABLE(FrameSelection); 53 WTF_MAKE_FAST_ALLOCATED; 53 54 public: 54 55 enum EAlteration { AlterationMove, AlterationExtend }; … … 63 64 typedef unsigned SetSelectionOptions; 64 65 65 SelectionController(Frame* = 0, bool isDragCaretController = false);66 FrameSelection(Frame* = 0, bool isDragCaretController = false); 66 67 67 68 Element* rootEditableElement() const { return m_selection.rootEditableElement(); } … … 216 217 IntRect absoluteBoundsForLocalRect(const IntRect&) const; 217 218 218 void caretBlinkTimerFired(Timer< SelectionController>*);219 void caretBlinkTimerFired(Timer<FrameSelection>*); 219 220 220 221 void setUseSecureKeyboardEntry(bool); … … 229 230 RefPtr<EditingStyle> m_typingStyle; 230 231 231 Timer< SelectionController> m_caretBlinkTimer;232 Timer<FrameSelection> m_caretBlinkTimer; 232 233 233 234 IntRect m_caretRect; // caret rect in coords local to the renderer responsible for painting the caret … … 245 246 }; 246 247 247 inline EditingStyle* SelectionController::typingStyle() const248 inline EditingStyle* FrameSelection::typingStyle() const 248 249 { 249 250 return m_typingStyle.get(); 250 251 } 251 252 252 inline void SelectionController::clearTypingStyle()253 inline void FrameSelection::clearTypingStyle() 253 254 { 254 255 m_typingStyle.clear(); 255 256 } 256 257 257 inline void SelectionController::setTypingStyle(PassRefPtr<EditingStyle> style)258 inline void FrameSelection::setTypingStyle(PassRefPtr<EditingStyle> style) 258 259 { 259 260 m_typingStyle = style; … … 261 262 262 263 #if !(PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(CHROMIUM)) 263 inline void SelectionController::notifyAccessibilityForSelectionChange()264 inline void FrameSelection::notifyAccessibilityForSelectionChange() 264 265 { 265 266 } … … 270 271 #ifndef NDEBUG 271 272 // Outside the WebCore namespace for ease of invocation from gdb. 272 void showTree(const WebCore:: SelectionController&);273 void showTree(const WebCore:: SelectionController*);273 void showTree(const WebCore::FrameSelection&); 274 void showTree(const WebCore::FrameSelection*); 274 275 #endif 275 276 276 #endif // SelectionController_h277 277 #endif // FrameSelection_h 278 -
trunk/Source/WebCore/editing/ModifySelectionListLevel.cpp
r80317 r85864 29 29 #include "Document.h" 30 30 #include "Frame.h" 31 #include "FrameSelection.h" 31 32 #include "HTMLElement.h" 32 33 #include "RenderObject.h" 33 #include "SelectionController.h"34 34 #include "htmlediting.h" 35 35 -
trunk/Source/WebCore/editing/RemoveFormatCommand.cpp
r73416 r85864 32 32 #include "Element.h" 33 33 #include "Frame.h" 34 #include "FrameSelection.h" 34 35 #include "HTMLNames.h" 35 #include "SelectionController.h"36 36 37 37 namespace WebCore { -
trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp
r85818 r85864 40 40 #include "EventNames.h" 41 41 #include "Frame.h" 42 #include "FrameSelection.h" 42 43 #include "HTMLElement.h" 43 44 #include "HTMLInputElement.h" … … 45 46 #include "HTMLNames.h" 46 47 #include "NodeList.h" 47 #include "SelectionController.h"48 48 #include "SmartReplace.h" 49 49 #include "TextIterator.h" -
trunk/Source/WebCore/editing/SetSelectionCommand.cpp
r79196 r85864 31 31 namespace WebCore { 32 32 33 SetSelectionCommand::SetSelectionCommand(const VisibleSelection& selection, SelectionController::SetSelectionOptions options)33 SetSelectionCommand::SetSelectionCommand(const VisibleSelection& selection, FrameSelection::SetSelectionOptions options) 34 34 : SimpleEditCommand(selection.base().anchorNode()->document()) 35 35 , m_options(options) … … 40 40 void SetSelectionCommand::doApply() 41 41 { 42 SelectionController* selectionController= document()->frame()->selection();43 ASSERT(selection Controller);42 FrameSelection* selection = document()->frame()->selection(); 43 ASSERT(selection); 44 44 45 if (selection Controller->shouldChangeSelection(m_selectionToSet) && m_selectionToSet.isNonOrphanedCaretOrRange()) {46 selection Controller->setSelection(m_selectionToSet, m_options);45 if (selection->shouldChangeSelection(m_selectionToSet) && m_selectionToSet.isNonOrphanedCaretOrRange()) { 46 selection->setSelection(m_selectionToSet, m_options); 47 47 setEndingSelection(m_selectionToSet); 48 48 } … … 51 51 void SetSelectionCommand::doUnapply() 52 52 { 53 SelectionController* selectionController= document()->frame()->selection();54 ASSERT(selection Controller);53 FrameSelection* selection = document()->frame()->selection(); 54 ASSERT(selection); 55 55 56 if (selection Controller->shouldChangeSelection(startingSelection()) && startingSelection().isNonOrphanedCaretOrRange())57 selection Controller->setSelection(startingSelection(), m_options);56 if (selection->shouldChangeSelection(startingSelection()) && startingSelection().isNonOrphanedCaretOrRange()) 57 selection->setSelection(startingSelection(), m_options); 58 58 } 59 59 -
trunk/Source/WebCore/editing/SetSelectionCommand.h
r78632 r85864 28 28 29 29 #include "EditCommand.h" 30 #include " SelectionController.h"30 #include "FrameSelection.h" 31 31 32 32 namespace WebCore { … … 34 34 class SetSelectionCommand : public SimpleEditCommand { 35 35 public: 36 static PassRefPtr<SetSelectionCommand> create(const VisibleSelection& selection, SelectionController::SetSelectionOptions options)36 static PassRefPtr<SetSelectionCommand> create(const VisibleSelection& selection, FrameSelection::SetSelectionOptions options) 37 37 { 38 38 return adoptRef(new SetSelectionCommand(selection, options)); … … 40 40 41 41 private: 42 SetSelectionCommand(const VisibleSelection&, SelectionController::SetSelectionOptions);42 SetSelectionCommand(const VisibleSelection&, FrameSelection::SetSelectionOptions); 43 43 virtual void doApply(); 44 44 virtual void doUnapply(); 45 45 46 SelectionController::SetSelectionOptions m_options;46 FrameSelection::SetSelectionOptions m_options; 47 47 VisibleSelection m_selectionToSet; 48 48 }; -
trunk/Source/WebCore/editing/SpellingCorrectionCommand.cpp
r83344 r85864 95 95 return; 96 96 97 applyCommandToComposite(SetSelectionCommand::create(m_selectionToBeCorrected, SelectionController::SpellCorrectionTriggered | SelectionController::CloseTyping | SelectionController::ClearTypingStyle));97 applyCommandToComposite(SetSelectionCommand::create(m_selectionToBeCorrected, FrameSelection::SpellCorrectionTriggered | FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle)); 98 98 #if SUPPORT_AUTOCORRECTION_PANEL 99 99 applyCommandToComposite(SpellingCorrectionRecordUndoCommand::create(document(), m_corrected, m_correction)); -
trunk/Source/WebCore/editing/SpellingCorrectionController.cpp
r85687 r85864 271 271 client()->recordAutocorrectionResponse(EditorClient::AutocorrectionReverted, corrected, correction); 272 272 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); 274 274 RefPtr<Range> range = Range::create(m_frame->document(), m_frame->selection()->selection().start(), m_frame->selection()->selection().end()); 275 275 -
trunk/Source/WebCore/editing/TypingCommand.cpp
r85036 r85864 34 34 #include "Element.h" 35 35 #include "Frame.h" 36 #include "FrameSelection.h" 36 37 #include "HTMLNames.h" 37 38 #include "InsertLineBreakCommand.h" … … 39 40 #include "InsertTextCommand.h" 40 41 #include "RenderObject.h" 41 #include "SelectionController.h"42 42 #include "TextIterator.h" 43 43 #include "VisiblePosition.h" … … 162 162 } 163 163 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. 165 165 void TypingCommand::insertText(Document* document, const String& text, const VisibleSelection& selectionForInsertion, Options options, TextCompositionType compositionType) 166 166 { … … 486 486 m_smartDelete = false; 487 487 488 SelectionControllerselection;488 FrameSelection selection; 489 489 selection.setSelection(endingSelection()); 490 selection.modify( SelectionController::AlterationExtend, DirectionBackward, granularity);490 selection.modify(FrameSelection::AlterationExtend, DirectionBackward, granularity); 491 491 if (killRing && selection.isCaret() && granularity != CharacterGranularity) 492 selection.modify( SelectionController::AlterationExtend, DirectionBackward, CharacterGranularity);492 selection.modify(FrameSelection::AlterationExtend, DirectionBackward, CharacterGranularity); 493 493 494 494 if (endingSelection().visibleStart().previous(CannotCrossEditingBoundary).isNull()) { … … 516 516 return; 517 517 // 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); 519 519 // If the caret is just after a table, select the table and don't delete anything. 520 520 } else if (Node* table = isFirstPositionAfterTable(visibleStart)) { … … 583 583 // Do nothing in the case that the caret is at the start of a 584 584 // root editable element or at the start of a document. 585 SelectionControllerselection;585 FrameSelection selection; 586 586 selection.setSelection(endingSelection()); 587 selection.modify( SelectionController::AlterationExtend, DirectionForward, granularity);587 selection.modify(FrameSelection::AlterationExtend, DirectionForward, granularity); 588 588 if (killRing && selection.isCaret() && granularity != CharacterGranularity) 589 selection.modify( SelectionController::AlterationExtend, DirectionForward, CharacterGranularity);589 selection.modify(FrameSelection::AlterationExtend, DirectionForward, CharacterGranularity); 590 590 591 591 Position downstreamEnd = endingSelection().end().downstream(); … … 603 603 // deleting to end of paragraph when at end of paragraph needs to merge the next paragraph (if any) 604 604 if (granularity == ParagraphBoundary && selection.selection().isCaret() && isEndOfParagraph(selection.selection().visibleEnd())) 605 selection.modify( SelectionController::AlterationExtend, DirectionForward, CharacterGranularity);605 selection.modify(FrameSelection::AlterationExtend, DirectionForward, CharacterGranularity); 606 606 607 607 selectionToDelete = selection.selection(); -
trunk/Source/WebCore/editing/chromium/FrameSelectionChromium.cpp
r85863 r85864 30 30 31 31 #include "config.h" 32 #include " SelectionController.h"32 #include "FrameSelection.h" 33 33 34 34 #include "AXObjectCache.h" … … 38 38 namespace WebCore { 39 39 40 void SelectionController::notifyAccessibilityForSelectionChange()40 void FrameSelection::notifyAccessibilityForSelectionChange() 41 41 { 42 42 // FIXME: Support editable text in chromium. -
trunk/Source/WebCore/editing/gtk/FrameSelectionGtk.cpp
r85863 r85864 19 19 20 20 #include "config.h" 21 #include " SelectionController.h"21 #include "FrameSelection.h" 22 22 23 23 #include "AccessibilityObjectWrapperAtk.h" … … 76 76 77 77 78 void SelectionController::notifyAccessibilityForSelectionChange()78 void FrameSelection::notifyAccessibilityForSelectionChange() 79 79 { 80 80 if (!AXObjectCache::accessibilityEnabled()) -
trunk/Source/WebCore/editing/mac/EditorMac.mm
r85036 r85864 191 191 bool Editor::canCopyExcludingStandaloneImages() 192 192 { 193 SelectionController* selection = m_frame->selection();193 FrameSelection* selection = m_frame->selection(); 194 194 return selection->isRange() && !selection->isInPasswordField(); 195 195 } -
trunk/Source/WebCore/editing/mac/FrameSelectionMac.mm
r85863 r85864 25 25 26 26 #import "config.h" 27 #import " SelectionController.h"27 #import "FrameSelection.h" 28 28 29 29 #import "AXObjectCache.h" … … 47 47 48 48 49 void SelectionController::notifyAccessibilityForSelectionChange()49 void FrameSelection::notifyAccessibilityForSelectionChange() 50 50 { 51 51 Document* document = m_frame->document(); -
trunk/Source/WebCore/editing/qt/EditorQt.cpp
r85648 r85864 31 31 #include "ClipboardQt.h" 32 32 #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"39 33 40 34 namespace WebCore { -
trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp
r81484 r85864 35 35 #include "Frame.h" 36 36 #include "FrameLoader.h" 37 #include "FrameSelection.h" 37 38 #include "FrameTree.h" 38 39 #include "HTMLFrameOwnerElement.h" … … 45 46 #include "Node.h" 46 47 #include "Range.h" 47 #include "SelectionController.h"48 48 #include "SharedBuffer.h" 49 49 #include <wtf/text/CString.h> -
trunk/Source/WebCore/page/ContextMenuController.cpp
r85603 r85864 48 48 #include "FrameLoadRequest.h" 49 49 #include "FrameLoader.h" 50 #include "FrameSelection.h" 50 51 #include "HTMLFormElement.h" 51 52 #include "HitTestRequest.h" … … 61 62 #include "ReplaceSelectionCommand.h" 62 63 #include "ResourceRequest.h" 63 #include "SelectionController.h"64 64 #include "Settings.h" 65 65 #include "TextIterator.h" … … 804 804 } 805 805 } else { // Make an editing context menu 806 SelectionController* selection = frame->selection();806 FrameSelection* selection = frame->selection(); 807 807 bool inPasswordField = selection->isInPasswordField(); 808 808 bool spellCheckingEnabled = frame->editor()->isSpellCheckingEnabledFor(node); -
trunk/Source/WebCore/page/DOMSelection.cpp
r84265 r85864 33 33 #include "ExceptionCode.h" 34 34 #include "Frame.h" 35 #include "FrameSelection.h" 35 36 #include "Node.h" 36 37 #include "PlatformString.h" 37 38 #include "Range.h" 38 #include "SelectionController.h"39 39 #include "TextIterator.h" 40 40 #include "htmlediting.h" … … 180 180 return String(); 181 181 182 SelectionController* selection = m_frame->selection();182 FrameSelection* selection = m_frame->selection(); 183 183 184 184 // This is a WebKit DOM extension, incompatible with an IE extension … … 294 294 return; 295 295 296 SelectionController::EAlteration alter;296 FrameSelection::EAlteration alter; 297 297 if (equalIgnoringCase(alterString, "extend")) 298 alter = SelectionController::AlterationExtend;298 alter = FrameSelection::AlterationExtend; 299 299 else if (equalIgnoringCase(alterString, "move")) 300 alter = SelectionController::AlterationMove;300 alter = FrameSelection::AlterationMove; 301 301 else 302 302 return; … … 400 400 return; 401 401 402 SelectionController* selection = m_frame->selection();402 FrameSelection* selection = m_frame->selection(); 403 403 404 404 if (selection->isNone()) { … … 437 437 return; 438 438 439 SelectionController* selection = m_frame->selection();439 FrameSelection* selection = m_frame->selection(); 440 440 441 441 if (selection->isNone()) … … 443 443 444 444 if (isCollapsed()) 445 selection->modify( SelectionController::AlterationExtend, DirectionBackward, CharacterGranularity);445 selection->modify(FrameSelection::AlterationExtend, DirectionBackward, CharacterGranularity); 446 446 447 447 RefPtr<Range> selectedRange = selection->selection().toNormalizedRange(); … … 462 462 return false; 463 463 464 SelectionController* selection = m_frame->selection();464 FrameSelection* selection = m_frame->selection(); 465 465 466 466 if (!n || m_frame->document() != n->document() || selection->isNone()) -
trunk/Source/WebCore/page/DragController.cpp
r85484 r85864 44 44 #include "Frame.h" 45 45 #include "FrameLoader.h" 46 #include "FrameSelection.h" 46 47 #include "FrameView.h" 47 48 #include "HTMLAnchorElement.h" … … 62 63 #include "ResourceRequest.h" 63 64 #include "SecurityOrigin.h" 64 #include "SelectionController.h"65 65 #include "Settings.h" 66 66 #include "Text.h" … … 143 143 } 144 144 145 bool DragController::dragIsMove( SelectionController* selection, DragData* dragData)145 bool DragController::dragIsMove(FrameSelection* selection, DragData* dragData) 146 146 { 147 147 return m_documentUnderMouse == m_dragInitiator && selection->isContentEditable() && !isCopyKeyDown(dragData); -
trunk/Source/WebCore/page/DragController.h
r81330 r85864 40 40 class Element; 41 41 class Frame; 42 class FrameSelection; 42 43 class Image; 43 44 class IntRect; … … 46 47 class PlatformMouseEvent; 47 48 class Range; 48 class SelectionController;49 49 50 50 class DragController { … … 100 100 DragOperation dragOperation(DragData*); 101 101 void cancelDrag(); 102 bool dragIsMove( SelectionController*, DragData*);102 bool dragIsMove(FrameSelection*, DragData*); 103 103 bool isCopyKeyDown(DragData*); 104 104 -
trunk/Source/WebCore/page/EventHandler.cpp
r85826 r85864 44 44 #include "Frame.h" 45 45 #include "FrameLoader.h" 46 #include "FrameSelection.h" 46 47 #include "FrameTree.h" 47 48 #include "FrameView.h" … … 69 70 #include "ScrollAnimator.h" 70 71 #include "Scrollbar.h" 71 #include "SelectionController.h"72 72 #include "Settings.h" 73 73 #include "StyleCachedImage.h" … … 257 257 } 258 258 259 static void setSelectionIfNeeded( SelectionController* selection, const VisibleSelection& newSelection)259 static void setSelectionIfNeeded(FrameSelection* selection, const VisibleSelection& newSelection) 260 260 { 261 261 ASSERT(selection); … … 264 264 } 265 265 266 static void setNonDirectionalSelectionIfNeeded( SelectionController* selection, const VisibleSelection& newSelection, TextGranularity granularity)266 static void setNonDirectionalSelectionIfNeeded(FrameSelection* selection, const VisibleSelection& newSelection, TextGranularity granularity) 267 267 { 268 268 ASSERT(selection); … … 2224 2224 2225 2225 Node* focusedNode = doc->focusedNode(); 2226 SelectionController* selectionController= m_frame->selection();2227 Position start = selection Controller->selection().start();2228 2229 if (start.deprecatedNode() && (selection Controller->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()); 2232 2232 2233 2233 int x = rightAligned ? firstRect.maxX() : firstRect.x(); … … 2544 2544 2545 2545 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); 2547 2547 event->setDefaultHandled(); 2548 2548 } 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); 2550 2550 event->setDefaultHandled(); 2551 2551 } 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); 2553 2553 event->setDefaultHandled(); 2554 2554 } 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); 2556 2556 event->setDefaultHandled(); 2557 2557 } -
trunk/Source/WebCore/page/EventHandler.h
r85826 r85864 192 192 void focusDocumentView(); 193 193 194 void capsLockStateMayHaveChanged(); // Only called by SelectionController194 void capsLockStateMayHaveChanged(); // Only called by FrameSelection 195 195 196 196 void sendResizeEvent(); // Only called in FrameView -
trunk/Source/WebCore/page/FocusController.cpp
r83075 r85864 39 39 #include "ExceptionCode.h" 40 40 #include "Frame.h" 41 #include "FrameSelection.h" 41 42 #include "FrameTree.h" 42 43 #include "FrameView.h" … … 52 53 #include "RenderWidget.h" 53 54 #include "ScrollAnimator.h" 54 #include "SelectionController.h"55 55 #include "Settings.h" 56 56 #include "SpatialNavigation.h" … … 328 328 return; 329 329 330 SelectionController* s = oldFocusedFrame->selection();330 FrameSelection* s = oldFocusedFrame->selection(); 331 331 if (s->isNone()) 332 332 return; -
trunk/Source/WebCore/page/Frame.cpp
r85745 r85864 153 153 , m_script(this) 154 154 , m_editor(this) 155 , m_selection Controller(this)155 , m_selection(this) 156 156 , m_eventHandler(this) 157 157 , m_animationController(this) -
trunk/Source/WebCore/page/Frame.h
r85745 r85864 34 34 #include "EventHandler.h" 35 35 #include "FrameLoader.h" 36 #include "FrameSelection.h" 36 37 #include "FrameTree.h" 37 38 #include "NavigationScheduler.h" 38 #include "SelectionController.h"39 39 #include "ScriptController.h" 40 40 #include "UserScriptTypes.h" … … 110 110 FrameLoader* loader() const; 111 111 NavigationScheduler* navigationScheduler() const; 112 SelectionController* selection() const;112 FrameSelection* selection() const; 113 113 FrameTree* tree() const; 114 114 AnimationController* animation() const; … … 233 233 234 234 mutable Editor m_editor; 235 mutable SelectionController m_selectionController;235 mutable FrameSelection m_selection; 236 236 mutable EventHandler m_eventHandler; 237 237 mutable AnimationController m_animationController; … … 306 306 } 307 307 308 inline SelectionController* Frame::selection() const309 { 310 return &m_selection Controller;308 inline FrameSelection* Frame::selection() const 309 { 310 return &m_selection; 311 311 } 312 312 -
trunk/Source/WebCore/page/Page.cpp
r85745 r85864 43 43 #include "FrameLoader.h" 44 44 #include "FrameLoaderClient.h" 45 #include "FrameSelection.h" 45 46 #include "FrameTree.h" 46 47 #include "FrameView.h" … … 64 65 #include "RenderWidget.h" 65 66 #include "RuntimeEnabledFeatures.h" 66 #include "SelectionController.h"67 67 #include "Settings.h" 68 68 #include "SharedBuffer.h" … … 116 116 Page::Page(const PageClients& pageClients) 117 117 : m_chrome(adoptPtr(new Chrome(this, pageClients.chromeClient))) 118 , m_dragCaretController(adoptPtr(new SelectionController(0, true)))118 , m_dragCaretController(adoptPtr(new FrameSelection(0, true))) 119 119 #if ENABLE(DRAG_SUPPORT) 120 120 , m_dragController(adoptPtr(new DragController(this, pageClients.dragClient))) -
trunk/Source/WebCore/page/Page.h
r85745 r85864 60 60 class FocusController; 61 61 class Frame; 62 class FrameSelection; 62 63 class GeolocationClient; 63 64 class GeolocationController; … … 78 79 class VisibleSelection; 79 80 class ScrollableArea; 80 class SelectionController;81 81 class Settings; 82 82 class SharedGraphicsContext3D; … … 166 166 167 167 Chrome* chrome() const { return m_chrome.get(); } 168 SelectionController* dragCaretController() const { return m_dragCaretController.get(); }168 FrameSelection* dragCaretController() const { return m_dragCaretController.get(); } 169 169 #if ENABLE(DRAG_SUPPORT) 170 170 DragController* dragController() const { return m_dragController.get(); } … … 316 316 317 317 OwnPtr<Chrome> m_chrome; 318 OwnPtr< SelectionController> m_dragCaretController;318 OwnPtr<FrameSelection> m_dragCaretController; 319 319 320 320 #if ENABLE(ACCELERATED_2D_CANVAS) -
trunk/Source/WebCore/page/chromium/DragControllerChromium.cpp
r75743 r85864 29 29 30 30 #include "DragData.h" 31 #include " SelectionController.h"31 #include "FrameSelection.h" 32 32 #include <wtf/RefPtr.h> 33 33 -
trunk/Source/WebCore/page/chromium/EventHandlerChromium.cpp
r84921 r85864 33 33 #include "FloatPoint.h" 34 34 #include "FocusController.h" 35 #include "Frame.h" 36 #include "FrameSelection.h" 35 37 #include "FrameView.h" 36 #include "Frame.h"37 38 #include "HitTestRequest.h" 38 39 #include "HitTestResult.h" … … 43 44 #include "PlatformWheelEvent.h" 44 45 #include "RenderWidget.h" 45 #include "SelectionController.h"46 46 47 47 namespace WebCore { -
trunk/Source/WebCore/page/win/DragControllerWin.cpp
r75743 r85864 28 28 29 29 #include "DragData.h" 30 #include " windows.h"31 #include " SelectionController.h"30 #include "FrameSelection.h" 31 #include "windows.h" 32 32 #include <wtf/RefPtr.h> 33 33 -
trunk/Source/WebCore/page/win/EventHandlerWin.cpp
r80172 r85864 33 33 #include "FrameView.h" 34 34 #include "Frame.h" 35 #include "FrameSelection.h" 35 36 #include "HitTestRequest.h" 36 37 #include "HitTestResult.h" … … 40 41 #include "PlatformWheelEvent.h" 41 42 #include "Scrollbar.h" 42 #include "SelectionController.h"43 43 #include "WCDataObject.h" 44 44 #include "NotImplemented.h" -
trunk/Source/WebCore/rendering/HitTestResult.cpp
r85256 r85864 24 24 #include "DocumentMarkerController.h" 25 25 #include "Frame.h" 26 #include "FrameSelection.h" 26 27 #include "FrameTree.h" 27 28 #include "HTMLAnchorElement.h" … … 35 36 #include "RenderInline.h" 36 37 #include "Scrollbar.h" 37 #include "SelectionController.h"38 38 39 39 #if ENABLE(SVG) -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r85705 r85864 30 30 #include "FloatQuad.h" 31 31 #include "Frame.h" 32 #include "FrameSelection.h" 32 33 #include "FrameView.h" 33 34 #include "GraphicsContext.h" … … 49 50 #include "RenderTheme.h" 50 51 #include "RenderView.h" 51 #include "SelectionController.h"52 52 #include "Settings.h" 53 53 #include "TextRun.h" … … 169 169 // We can't wait for RenderBox::destroy to clear the selection, 170 170 // because by then we will have nuked the line boxes. 171 // FIXME: The SelectionControllershould be responsible for this when it171 // FIXME: The FrameSelection should be responsible for this when it 172 172 // is notified of DOM mutations. 173 173 if (isSelectionBorder()) … … 2418 2418 void RenderBlock::paintCaret(PaintInfo& paintInfo, int tx, int ty, CaretType type) 2419 2419 { 2420 SelectionController* selection = type == CursorCaret ? frame()->selection() : frame()->page()->dragCaretController();2421 2422 // Paint the caret if the SelectionControllersays so or if caret browsing is enabled2420 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 2423 2423 bool caretBrowsing = frame()->settings() && frame()->settings()->caretBrowsingEnabled(); 2424 2424 RenderObject* caretPainter = selection->caretRenderer(); 2425 2425 if (caretPainter == this && (selection->isContentEditable() || caretBrowsing)) { 2426 2426 // Convert the painting offset into the local coordinate system of this renderer, 2427 // to match the localCaretRect computed by the SelectionController2427 // to match the localCaretRect computed by the FrameSelection 2428 2428 offsetForContents(tx, ty); 2429 2429 -
trunk/Source/WebCore/rendering/RenderImage.cpp
r85619 r85864 29 29 30 30 #include "Frame.h" 31 #include "FrameSelection.h" 31 32 #include "GraphicsContext.h" 32 33 #include "HTMLAreaElement.h" … … 39 40 #include "RenderLayer.h" 40 41 #include "RenderView.h" 41 #include "SelectionController.h"42 42 #include "TextRun.h" 43 43 #include <wtf/UnusedParam.h> -
trunk/Source/WebCore/rendering/RenderInline.cpp
r85623 r85864 86 86 // We can't wait for RenderBoxModelObject::destroy to clear the selection, 87 87 // because by then we will have nuked the line boxes. 88 // FIXME: The SelectionControllershould be responsible for this when it88 // FIXME: The FrameSelection should be responsible for this when it 89 89 // is notified of DOM mutations. 90 90 if (isSelectionBorder()) -
trunk/Source/WebCore/rendering/RenderLayer.cpp
r85799 r85864 57 57 #include "FocusController.h" 58 58 #include "Frame.h" 59 #include "FrameSelection.h" 59 60 #include "FrameTree.h" 60 61 #include "FrameView.h" … … 81 82 #include "Scrollbar.h" 82 83 #include "ScrollbarTheme.h" 83 #include "SelectionController.h"84 84 #include "TextStream.h" 85 85 #include "TransformState.h" -
trunk/Source/WebCore/rendering/RenderListBox.cpp
r85143 r85864 38 38 #include "FocusController.h" 39 39 #include "Frame.h" 40 #include "FrameSelection.h" 40 41 #include "FrameView.h" 41 42 #include "GraphicsContext.h" … … 54 55 #include "ScrollbarTheme.h" 55 56 #include "SelectElement.h" 56 #include "SelectionController.h"57 57 #include "TextRun.h" 58 58 #include <math.h> -
trunk/Source/WebCore/rendering/RenderObjectChildList.cpp
r83787 r85864 110 110 // If oldChild is the start or end of the selection, then clear the selection to 111 111 // avoid problems of invalid pointers. 112 // FIXME: The SelectionControllershould be responsible for this when it112 // FIXME: The FrameSelection should be responsible for this when it 113 113 // is notified of DOM mutations. 114 114 if (!owner->documentBeingDestroyed() && oldChild->isSelectionBorder()) -
trunk/Source/WebCore/rendering/RenderTextControl.cpp
r85560 r85864 28 28 #include "EventNames.h" 29 29 #include "Frame.h" 30 #include "FrameSelection.h" 30 31 #include "HTMLBRElement.h" 31 32 #include "HTMLFormControlElement.h" … … 37 38 #include "RenderText.h" 38 39 #include "ScrollbarTheme.h" 39 #include "SelectionController.h"40 40 #include "Text.h" 41 41 #include "TextControlInnerElements.h" -
trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp
r85726 r85864 30 30 #include "EventNames.h" 31 31 #include "Frame.h" 32 #include "FrameSelection.h" 32 33 #include "FrameView.h" 33 34 #include "HTMLInputElement.h" … … 41 42 #include "RenderScrollbar.h" 42 43 #include "RenderTheme.h" 43 #include "SelectionController.h"44 44 #include "Settings.h" 45 45 #include "SimpleFontData.h" -
trunk/Source/WebCore/rendering/RenderTheme.cpp
r85653 r85864 29 29 #include "FontSelector.h" 30 30 #include "Frame.h" 31 #include "FrameSelection.h" 31 32 #include "GraphicsContext.h" 32 33 #include "HTMLInputElement.h" … … 37 38 #include "RenderStyle.h" 38 39 #include "RenderView.h" 39 #include "SelectionController.h"40 40 #include "Settings.h" 41 41 #include "TextControlInnerElements.h" -
trunk/Source/WebCore/rendering/RenderTreeAsText.cpp
r84589 r85864 30 30 #include "Document.h" 31 31 #include "Frame.h" 32 #include "FrameSelection.h" 32 33 #include "FrameView.h" 33 34 #include "HTMLElement.h" … … 46 47 #include "RenderView.h" 47 48 #include "RenderWidget.h" 48 #include "SelectionController.h"49 49 #include <wtf/HexNumber.h> 50 50 #include <wtf/UnusedParam.h> -
trunk/Source/WebCore/svg/SVGSVGElement.cpp
r85617 r85864 34 34 #include "FloatConversion.h" 35 35 #include "FloatRect.h" 36 #include "FrameSelection.h" 36 37 #include "FrameView.h" 37 38 #include "HTMLNames.h" … … 49 50 #include "SVGZoomEvent.h" 50 51 #include "ScriptEventListener.h" 51 #include "SelectionController.h"52 52 #include <wtf/StdLibExtras.h> 53 53 -
trunk/Source/WebCore/svg/SVGTextContentElement.cpp
r83710 r85864 27 27 #include "CSSValueKeywords.h" 28 28 #include "Frame.h" 29 #include "FrameSelection.h" 29 30 #include "RenderObject.h" 30 31 #include "RenderSVGResource.h" … … 32 33 #include "SVGNames.h" 33 34 #include "SVGTextQuery.h" 34 #include "SelectionController.h"35 35 #include "XMLNames.h" 36 36 … … 163 163 ASSERT(document()->frame()); 164 164 165 SelectionController* controller= document()->frame()->selection();166 if (! controller)165 FrameSelection* selection = document()->frame()->selection(); 166 if (!selection) 167 167 return; 168 168 … … 177 177 end = end.next(); 178 178 179 controller->setSelection(VisibleSelection(start, end));179 selection->setSelection(VisibleSelection(start, end)); 180 180 } 181 181 -
trunk/Source/WebKit/chromium/ChangeLog
r85844 r85864 1 2011-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 1 16 2011-05-03 Hans Wennborg <hans@chromium.org> 2 17 -
trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp
r85787 r85864 90 90 #include "FrameLoadRequest.h" 91 91 #include "FrameLoader.h" 92 #include "FrameSelection.h" 92 93 #include "FrameTree.h" 93 94 #include "FrameView.h" … … 124 125 #include "ScrollTypes.h" 125 126 #include "ScrollbarTheme.h" 126 #include "SelectionController.h"127 127 #include "Settings.h" 128 128 #include "SkiaUtils.h" … … 1346 1346 bool WebFrameImpl::selectWordAroundCaret() 1347 1347 { 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()) 1351 1351 return false; 1352 selectWordAroundPosition(frame(), controller->selection().visibleStart());1352 selectWordAroundPosition(frame(), selection->selection().visibleStart()); 1353 1353 return true; 1354 1354 } -
trunk/Source/WebKit/chromium/src/WebViewImpl.cpp
r85823 r85864 57 57 #include "FontDescription.h" 58 58 #include "FrameLoader.h" 59 #include "FrameSelection.h" 59 60 #include "FrameTree.h" 60 61 #include "FrameView.h" … … 89 90 #include "ResourceHandle.h" 90 91 #include "SecurityOrigin.h" 91 #include "SelectionController.h"92 92 #include "Settings.h" 93 93 #include "SpeechInputClientImpl.h" … … 1437 1437 return type; 1438 1438 1439 SelectionController* controller= focused->selection();1440 if (! controller)1439 FrameSelection* selection = focused->selection(); 1440 if (!selection) 1441 1441 return type; 1442 1442 1443 const Node* node = controller->start().deprecatedNode();1443 const Node* node = selection->start().deprecatedNode(); 1444 1444 if (!node) 1445 1445 return type; … … 1447 1447 // FIXME: Support more text input types when necessary, eg. Number, 1448 1448 // Date, Email, URL, etc. 1449 if ( controller->isInPasswordField())1449 if (selection->isInPasswordField()) 1450 1450 type = WebTextInputTypePassword; 1451 1451 else if (node->shouldUseInputMethod()) … … 1462 1462 return rect; 1463 1463 1464 SelectionController* controller= focused->selection();1465 if (! controller)1464 FrameSelection* selection = focused->selection(); 1465 if (!selection) 1466 1466 return rect; 1467 1467 … … 1470 1470 return rect; 1471 1471 1472 const Node* node = controller->base().containerNode();1472 const Node* node = selection->base().containerNode(); 1473 1473 if (!node || !node->renderer()) 1474 1474 return rect; 1475 1475 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(); 1481 1481 if (!node || !node->renderer() || !range) 1482 1482 return rect; … … 1523 1523 return false; 1524 1524 1525 SelectionController* controller= focused->selection();1526 if (! controller)1525 FrameSelection* selection = focused->selection(); 1526 if (!selection) 1527 1527 return false; 1528 1528 1529 RefPtr<Range> range = controller->selection().firstRange();1529 RefPtr<Range> range = selection->selection().firstRange(); 1530 1530 if (!range.get()) 1531 1531 return false; … … 1713 1713 || (oldFocusedNode->hasTagName(HTMLNames::inputTag) 1714 1714 && static_cast<HTMLInputElement*>(oldFocusedNode.get())->isTextField())) { 1715 // Clear the selection. 1716 SelectionController* selection = frame->selection(); 1717 selection->clear(); 1715 frame->selection()->clear(); 1718 1716 } 1719 1717 } -
trunk/Source/WebKit/efl/ChangeLog
r85823 r85864 1 2011-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 1 11 2011-05-04 Cris Neckar <cdn@chromium.org> 2 12 -
trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
r84574 r85864 347 347 switch (keyEvent->windowsVirtualKeyCode()) { 348 348 case VK_LEFT: 349 frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,349 frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, 350 350 DirectionLeft, 351 351 keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity, … … 353 353 return true; 354 354 case VK_RIGHT: 355 frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,355 frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, 356 356 DirectionRight, 357 357 keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity, … … 359 359 return true; 360 360 case VK_UP: 361 frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,361 frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, 362 362 DirectionBackward, 363 363 keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity, … … 365 365 return true; 366 366 case VK_DOWN: 367 frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,367 frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, 368 368 DirectionForward, 369 369 keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity, -
trunk/Source/WebKit/gtk/ChangeLog
r85832 r85864 1 2011-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 1 11 2011-05-04 Ryosuke Niwa <rniwa@webkit.org> 2 12 -
trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp
r85832 r85864 385 385 static IntPoint getLocationForKeyboardGeneratedContextMenu(Frame* frame) 386 386 { 387 SelectionController* selection = frame->selection();387 FrameSelection* selection = frame->selection(); 388 388 if (!selection->selection().isNonOrphanedCaretOrRange() 389 389 || (selection->selection().isCaret() && !selection->selection().isContentEditable())) { -
trunk/Source/WebKit/haiku/ChangeLog
r85823 r85864 1 2011-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 1 11 2011-05-04 Cris Neckar <cdn@chromium.org> 2 12 -
trunk/Source/WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp
r84574 r85864 268 268 break; 269 269 case VK_LEFT: 270 frame->selection()->modify(kevent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,270 frame->selection()->modify(kevent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, 271 271 DirectionLeft, 272 272 kevent->ctrlKey() ? WordGranularity : CharacterGranularity, … … 274 274 break; 275 275 case VK_RIGHT: 276 frame->selection()->modify(kevent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,276 frame->selection()->modify(kevent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, 277 277 DirectionRight, 278 278 kevent->ctrlKey() ? WordGranularity : CharacterGranularity, … … 280 280 break; 281 281 case VK_UP: 282 frame->selection()->modify(kevent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,282 frame->selection()->modify(kevent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, 283 283 DirectionBackward, 284 284 kevent->ctrlKey() ? ParagraphGranularity : LineGranularity, … … 286 286 break; 287 287 case VK_DOWN: 288 frame->selection()->modify(kevent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,288 frame->selection()->modify(kevent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, 289 289 DirectionForward, 290 290 kevent->ctrlKey() ? ParagraphGranularity : LineGranularity, -
trunk/Source/WebKit/mac/ChangeLog
r85823 r85864 1 2011-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 1 16 2011-05-04 Cris Neckar <cdn@chromium.org> 2 17 -
trunk/Source/WebKit/mac/WebView/WebFrame.mm
r85823 r85864 652 652 } 653 653 654 - (DOMRange *)_rangeByAlteringCurrentSelection:( SelectionController::EAlteration)alteration direction:(SelectionDirection)direction granularity:(TextGranularity)granularity654 - (DOMRange *)_rangeByAlteringCurrentSelection:(FrameSelection::EAlteration)alteration direction:(SelectionDirection)direction granularity:(TextGranularity)granularity 655 655 { 656 656 if (_private->coreFrame->selection()->isNone()) 657 657 return nil; 658 658 659 SelectionControllerselection;659 FrameSelection selection; 660 660 selection.setSelection(_private->coreFrame->selection()->selection()); 661 661 selection.modify(alteration, direction, granularity); -
trunk/Source/WebKit/mac/WebView/WebFrameInternal.h
r85036 r85864 33 33 #import <WebCore/EditAction.h> 34 34 #import <WebCore/FrameLoaderTypes.h> 35 #import <WebCore/FrameSelection.h> 35 36 #import <WebCore/Position.h> 36 #import <WebCore/SelectionController.h>37 37 #import <WebCore/Settings.h> 38 38 … … 137 137 - (void)_scrollDOMRangeToVisible:(DOMRange *)range; 138 138 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; 140 140 - (NSRange)_convertToNSRange:(WebCore::Range*)range; 141 141 - (DOMRange *)_convertNSRangeToDOMRange:(NSRange)range; -
trunk/Source/WebKit/mac/WebView/WebHTMLView.mm
r85428 r85864 94 94 #import <WebCore/Frame.h> 95 95 #import <WebCore/FrameLoader.h> 96 #import <WebCore/FrameSelection.h> 96 97 #import <WebCore/FrameView.h> 97 98 #import <WebCore/HTMLConverter.h> … … 108 109 #import <WebCore/RenderView.h> 109 110 #import <WebCore/RuntimeApplicationChecks.h> 110 #import <WebCore/SelectionController.h>111 111 #import <WebCore/SharedBuffer.h> 112 112 #import <WebCore/SimpleFontData.h> -
trunk/Source/WebKit/mac/WebView/WebTextCompletionController.mm
r80059 r85864 175 175 WebFrame *frame = [_htmlView _frame]; 176 176 DOMRange *selection = kit(core(frame)->selection()->toNormalizedRange().get()); 177 DOMRange *wholeWord = [frame _rangeByAlteringCurrentSelection: SelectionController::AlterationExtend177 DOMRange *wholeWord = [frame _rangeByAlteringCurrentSelection:FrameSelection::AlterationExtend 178 178 direction:DirectionBackward granularity:WordGranularity]; 179 179 DOMRange *prefix = [wholeWord cloneRange]; -
trunk/Source/WebKit/mac/WebView/WebView.mm
r85603 r85864 126 126 #import <WebCore/Frame.h> 127 127 #import <WebCore/FrameLoader.h> 128 #import <WebCore/FrameSelection.h> 128 129 #import <WebCore/FrameTree.h> 129 130 #import <WebCore/FrameView.h> … … 155 156 #import <WebCore/ScriptValue.h> 156 157 #import <WebCore/SecurityOrigin.h> 157 #import <WebCore/SelectionController.h>158 158 #import <WebCore/Settings.h> 159 159 #import <WebCore/TextResourceDecoder.h> -
trunk/Source/WebKit/qt/Api/qwebframe.cpp
r83892 r85864 35 35 #include "Frame.h" 36 36 #include "FrameLoaderClientQt.h" 37 #include "FrameSelection.h" 37 38 #include "FrameTree.h" 38 39 #include "FrameView.h" … … 75 76 #include "Scrollbar.h" 76 77 #include "Settings.h" 77 #include "SelectionController.h"78 78 #include "SubstituteData.h" 79 79 #include "SVGSMILElement.h" -
trunk/Source/WebKit/qt/ChangeLog
r85851 r85864 1 2011-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 1 10 2011-05-05 Alexis Menard <alexis.menard@openbossa.org> 2 11 -
trunk/Source/WebKit/win/ChangeLog
r85831 r85864 1 2011-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 1 10 2011-05-04 Ryosuke Niwa <rniwa@webkit.org> 2 11 -
trunk/Source/WebKit/win/WebView.cpp
r85831 r85864 88 88 #include <WebCore/FocusController.h> 89 89 #include <WebCore/FrameLoader.h> 90 #include <WebCore/FrameSelection.h> 90 91 #include <WebCore/FrameTree.h> 91 92 #include <WebCore/FrameView.h> … … 128 129 #include <WebCore/ScrollbarTheme.h> 129 130 #include <WebCore/SecurityOrigin.h> 130 #include <WebCore/SelectionController.h>131 131 #include <WebCore/Settings.h> 132 132 #include <WebCore/SimpleFontData.h> -
trunk/Source/WebKit/wince/ChangeLog
r85823 r85864 1 2011-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 1 11 2011-05-04 Cris Neckar <cdn@chromium.org> 2 12 -
trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp
r84585 r85864 357 357 switch (keyEvent->windowsVirtualKeyCode()) { 358 358 case VK_LEFT: 359 frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,359 frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, 360 360 DirectionLeft, 361 361 keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity, … … 363 363 return true; 364 364 case VK_RIGHT: 365 frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,365 frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, 366 366 DirectionRight, 367 367 keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity, … … 369 369 return true; 370 370 case VK_UP: 371 frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,371 frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, 372 372 DirectionBackward, 373 373 keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity, … … 375 375 return true; 376 376 case VK_DOWN: 377 frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,377 frame->selection()->modify(keyEvent->shiftKey() ? FrameSelection::AlterationExtend : FrameSelection::AlterationMove, 378 378 DirectionForward, 379 379 keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity, -
trunk/Source/WebKit/wx/ChangeLog
r85823 r85864 1 2011-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 1 13 2011-05-04 Cris Neckar <cdn@chromium.org> 2 14 -
trunk/Source/WebKit/wx/WebDOMSelection.cpp
r64229 r85864 30 30 31 31 #include "Element.h" 32 #include " SelectionController.h"32 #include "FrameSelection.h" 33 33 #include "WebDOMElement.h" 34 34 #include "WebDOMRange.h" -
trunk/Source/WebKit/wx/WebDOMSelection.h
r64229 r85864 41 41 namespace WebCore { 42 42 43 class SelectionController;43 class FrameSelection; 44 44 45 45 } … … 52 52 public: 53 53 wxWebKitSelection() {} 54 wxWebKitSelection(WebCore:: SelectionController* selection)54 wxWebKitSelection(WebCore::FrameSelection* selection) 55 55 : m_selection(selection) 56 56 { } … … 63 63 64 64 private: 65 WebCore:: SelectionController* m_selection;65 WebCore::FrameSelection* m_selection; 66 66 67 67 }; -
trunk/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp
r84574 r85864 32 32 #include "FocusController.h" 33 33 #include "Frame.h" 34 #include "FrameSelection.h" 34 35 #include "FrameView.h" 35 36 #include "HostWindow.h" … … 39 40 #include "PlatformKeyboardEvent.h" 40 41 #include "PlatformString.h" 41 #include "SelectionController.h"42 42 #include "WebFrame.h" 43 43 #include "WebFramePrivate.h" -
trunk/Source/WebKit/wx/WebView.cpp
r84743 r85864 39 39 #include "Frame.h" 40 40 #include "FrameLoader.h" 41 #include "FrameSelection.h" 41 42 #include "FrameView.h" 42 43 #include "GraphicsContext.h" … … 54 55 #include "ResourceHandleManager.h" 55 56 #include "Scrollbar.h" 56 #include "SelectionController.h"57 57 #include "Settings.h" 58 58 #include "SubstituteData.h"
Note: See TracChangeset
for help on using the changeset viewer.