Commit 60d3e9f9 authored by darin@apple.com's avatar darin@apple.com

WebCore:

2008-06-15  Darin Adler  <darin@apple.com>

        - give Frame object functions shorter names: scriptProxy() -> script(),
          selectionController() -> selection(), animationController() -> animation()

        * WebCore.base.exp:
        * bindings/js/JSCustomSQLStatementCallback.cpp:
        (WebCore::JSCustomSQLStatementCallback::handleEvent):
        * bindings/js/JSCustomSQLStatementErrorCallback.cpp:
        (WebCore::JSCustomSQLStatementErrorCallback::handleEvent):
        * bindings/js/JSCustomSQLTransactionCallback.cpp:
        (WebCore::JSCustomSQLTransactionCallback::handleEvent):
        * bindings/js/JSCustomSQLTransactionErrorCallback.cpp:
        (WebCore::JSCustomSQLTransactionErrorCallback::handleEvent):
        * bindings/js/JSCustomVoidCallback.cpp:
        (WebCore::JSCustomVoidCallback::handleEvent):
        * bindings/js/JSCustomXPathNSResolver.cpp:
        (WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):
        * bindings/js/JSDOMWindowBase.cpp:
        (WebCore::JSDOMWindowBase::~JSDOMWindowBase):
        (WebCore::allowPopUp):
        (WebCore::createWindow):
        (WebCore::windowProtoFuncOpen):
        (WebCore::toJS):
        (WebCore::toJSDOMWindow):
        * bindings/js/JSDOMWindowCustom.cpp:
        (WebCore::JSDOMWindow::setLocation):
        * bindings/js/JSDOMWindowShell.cpp:
        (WebCore::toJS):
        (WebCore::toJSDOMWindowShell):
        * bindings/js/JSDocumentCustom.cpp:
        (WebCore::JSDocument::setLocation):
        * bindings/js/JSLocationCustom.cpp:
        (WebCore::navigateIfAllowed):
        (WebCore::JSLocation::reload):
        * bindings/js/JSNodeFilterCondition.cpp:
        (WebCore::JSNodeFilterCondition::acceptNode):
        * bindings/js/ScheduledAction.cpp:
        (WebCore::ScheduledAction::execute):
        * bindings/js/kjs_events.cpp:
        (WebCore::JSAbstractEventListener::handleEvent):
        (WebCore::JSLazyEventListener::parseCode):
        * bindings/js/kjs_html.cpp:
        (WebCore::runtimeObjectImplementsCall):
        * bindings/objc/DOMInternal.mm:
        (-[WebScriptObject _initializeScriptDOMNodeImp]):
        * bridge/jni/jni_jsobject.mm:
        (createRootObject):
        * css/CSSStyleSelector.cpp:
        (WebCore::CSSStyleSelector::SelectorChecker::checkOneSelector):
        * dom/Document.cpp:
        (WebCore::Document::nodeWillBeRemoved):
        (WebCore::Document::createHTMLEventListener):
        * dom/Element.cpp:
        (WebCore::Element::updateFocusAppearance):
        * dom/EventTarget.cpp:
        (WebCore::EventTarget::dispatchGenericEvent):
        * dom/XMLTokenizer.cpp:
        (WebCore::XMLTokenizer::startElementNs):
        * editing/DeleteButtonController.cpp:
        (WebCore::DeleteButtonController::respondToChangedSelection):
        (WebCore::DeleteButtonController::enable):
        (WebCore::DeleteButtonController::deleteTarget):
        * editing/EditCommand.cpp:
        (WebCore::EditCommand::EditCommand):
        * editing/Editor.cpp:
        (WebCore::Editor::selectionForCommand):
        (WebCore::Editor::canEdit):
        (WebCore::Editor::canEditRichly):
        (WebCore::Editor::canDHTMLCut):
        (WebCore::Editor::canDHTMLCopy):
        (WebCore::Editor::canCopy):
        (WebCore::Editor::canDelete):
        (WebCore::Editor::deleteWithDirection):
        (WebCore::Editor::deleteSelectionWithSmartDelete):
        (WebCore::Editor::replaceSelectionWithFragment):
        (WebCore::Editor::selectedRange):
        (WebCore::Editor::tryDHTMLCopy):
        (WebCore::Editor::tryDHTMLCut):
        (WebCore::Editor::fontForSelection):
        (WebCore::Editor::selectionUnorderedListState):
        (WebCore::Editor::selectionOrderedListState):
        (WebCore::Editor::increaseSelectionListLevel):
        (WebCore::Editor::increaseSelectionListLevelOrdered):
        (WebCore::Editor::increaseSelectionListLevelUnordered):
        (WebCore::Editor::decreaseSelectionListLevel):
        (WebCore::Editor::dispatchCPPEvent):
        (WebCore::Editor::applyStyle):
        (WebCore::Editor::applyParagraphStyle):
        (WebCore::Editor::applyStyleToSelection):
        (WebCore::Editor::applyParagraphStyleToSelection):
        (WebCore::Editor::selectionHasStyle):
        (WebCore::Editor::appliedEditing):
        (WebCore::Editor::unappliedEditing):
        (WebCore::Editor::reappliedEditing):
        (WebCore::Editor::insertLineBreak):
        (WebCore::Editor::insertParagraphSeparator):
        (WebCore::Editor::paste):
        (WebCore::Editor::selectComposition):
        (WebCore::Editor::confirmComposition):
        (WebCore::Editor::setComposition):
        (WebCore::Editor::advanceToNextMisspelling):
        (WebCore::Editor::isSelectionUngrammatical):
        (WebCore::Editor::guessesForUngrammaticalSelection):
        (WebCore::Editor::getCompositionSelection):
        (WebCore::Editor::transpose):
        * editing/EditorCommand.cpp:
        (WebCore::expandSelectionToGranularity):
        (WebCore::executeDeleteToMark):
        (WebCore::executeMoveBackward):
        (WebCore::executeMoveBackwardAndModifySelection):
        (WebCore::executeMoveDown):
        (WebCore::executeMoveDownAndModifySelection):
        (WebCore::executeMoveForward):
        (WebCore::executeMoveForwardAndModifySelection):
        (WebCore::executeMoveLeft):
        (WebCore::executeMoveLeftAndModifySelection):
        (WebCore::executeMovePageDown):
        (WebCore::executeMovePageDownAndModifySelection):
        (WebCore::executeMovePageUp):
        (WebCore::executeMovePageUpAndModifySelection):
        (WebCore::executeMoveRight):
        (WebCore::executeMoveRightAndModifySelection):
        (WebCore::executeMoveToBeginningOfDocument):
        (WebCore::executeMoveToBeginningOfDocumentAndModifySelection):
        (WebCore::executeMoveToBeginningOfLine):
        (WebCore::executeMoveToBeginningOfLineAndModifySelection):
        (WebCore::executeMoveToBeginningOfParagraph):
        (WebCore::executeMoveToBeginningOfParagraphAndModifySelection):
        (WebCore::executeMoveToBeginningOfSentence):
        (WebCore::executeMoveToBeginningOfSentenceAndModifySelection):
        (WebCore::executeMoveToEndOfDocument):
        (WebCore::executeMoveToEndOfDocumentAndModifySelection):
        (WebCore::executeMoveToEndOfSentence):
        (WebCore::executeMoveToEndOfSentenceAndModifySelection):
        (WebCore::executeMoveToEndOfLine):
        (WebCore::executeMoveToEndOfLineAndModifySelection):
        (WebCore::executeMoveToEndOfParagraph):
        (WebCore::executeMoveToEndOfParagraphAndModifySelection):
        (WebCore::executeMoveParagraphBackwardAndModifySelection):
        (WebCore::executeMoveParagraphForwardAndModifySelection):
        (WebCore::executeMoveUp):
        (WebCore::executeMoveUpAndModifySelection):
        (WebCore::executeMoveWordBackward):
        (WebCore::executeMoveWordBackwardAndModifySelection):
        (WebCore::executeMoveWordForward):
        (WebCore::executeMoveWordForwardAndModifySelection):
        (WebCore::executeMoveWordLeft):
        (WebCore::executeMoveWordLeftAndModifySelection):
        (WebCore::executeMoveWordRight):
        (WebCore::executeMoveWordRightAndModifySelection):
        (WebCore::executeSelectAll):
        (WebCore::executeSelectToMark):
        (WebCore::executeSetMark):
        (WebCore::executeSwapWithMark):
        (WebCore::executeUnselect):
        (WebCore::enabledAnySelection):
        (WebCore::enabledAnySelectionAndMark):
        (WebCore::enabledInRichlyEditableText):
        (WebCore::enabledRangeInEditableText):
        (WebCore::enabledRangeInRichlyEditableText):
        * editing/ModifySelectionListLevel.cpp:
        (WebCore::IncreaseSelectionListLevelCommand::canIncreaseSelectionListLevel):
        (WebCore::DecreaseSelectionListLevelCommand::canDecreaseSelectionListLevel):
        * editing/RemoveFormatCommand.cpp:
        (WebCore::RemoveFormatCommand::doApply):
        * editing/SelectionController.cpp:
        (WebCore::SelectionController::setSelection):
        (WebCore::SelectionController::selectFrameElementInParentIfFullySelected):
        * editing/TypingCommand.cpp:
        (WebCore::TypingCommand::deleteSelection):
        (WebCore::TypingCommand::insertText):
        (WebCore::TypingCommand::deleteKeyPressed):
        (WebCore::TypingCommand::forwardDeleteKeyPressed):
        * history/CachedPage.cpp:
        (WebCore::CachedPage::CachedPage):
        (WebCore::CachedPage::restore):
        * html/HTMLAnchorElement.cpp:
        (WebCore::HTMLAnchorElement::defaultEventHandler):
        (WebCore::HTMLAnchorElement::setActive):
        * html/HTMLInputElement.cpp:
        (WebCore::HTMLInputElement::defaultEventHandler):
        * html/HTMLPlugInElement.cpp:
        (WebCore::HTMLPlugInElement::createNPObject):
        * html/HTMLScriptElement.cpp:
        (WebCore::HTMLScriptElement::evaluateScript):
        * html/HTMLTokenizer.cpp:
        (WebCore::HTMLTokenizer::parseTag):
        (WebCore::HTMLTokenizer::processToken):
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::executeScript):
        (WebCore::FrameLoader::clear):
        (WebCore::FrameLoader::userGestureHint):
        (WebCore::FrameLoader::open):
        (WebCore::FrameLoader::dispatchWindowObjectAvailable):
        (WebCore::FrameLoader::switchOutLowBandwidthDisplayIfReady):
        * loader/archive/cf/LegacyWebArchive.cpp:
        (WebCore::LegacyWebArchive::createFromSelection):
        * page/AccessibilityRenderObject.cpp:
        (WebCore::AccessibilityRenderObject::selection):
        (WebCore::AccessibilityRenderObject::setSelectedTextRange):
        (WebCore::AccessibilityRenderObject::isFocused):
        (WebCore::AccessibilityRenderObject::doAXTextMarkerRangeForLine):
        (WebCore::AccessibilityRenderObject::doSetAXSelectedTextMarkerRange):
        (WebCore::AccessibilityRenderObject::doAXRangeForLine):
        (WebCore::AccessibilityRenderObject::handleActiveDescendantChanged):
        * page/ContextMenuController.cpp:
        (WebCore::ContextMenuController::contextMenuItemSelected):
        * page/DOMSelection.cpp:
        (WebCore::DOMSelection::anchorNode):
        (WebCore::DOMSelection::baseNode):
        (WebCore::DOMSelection::anchorOffset):
        (WebCore::DOMSelection::baseOffset):
        (WebCore::DOMSelection::focusNode):
        (WebCore::DOMSelection::extentNode):
        (WebCore::DOMSelection::focusOffset):
        (WebCore::DOMSelection::extentOffset):
        (WebCore::DOMSelection::isCollapsed):
        (WebCore::DOMSelection::type):
        (WebCore::DOMSelection::rangeCount):
        (WebCore::DOMSelection::collapse):
        (WebCore::DOMSelection::collapseToEnd):
        (WebCore::DOMSelection::collapseToStart):
        (WebCore::DOMSelection::empty):
        (WebCore::DOMSelection::setBaseAndExtent):
        (WebCore::DOMSelection::setPosition):
        (WebCore::DOMSelection::modify):
        (WebCore::DOMSelection::extend):
        (WebCore::DOMSelection::getRangeAt):
        (WebCore::DOMSelection::removeAllRanges):
        (WebCore::DOMSelection::addRange):
        (WebCore::DOMSelection::deleteFromDocument):
        (WebCore::DOMSelection::containsNode):
        (WebCore::DOMSelection::toString):
        * page/DragController.cpp:
        (WebCore::DragController::dragIsMove):
        (WebCore::DragController::tryDocumentDrag):
        (WebCore::setSelectionToDragCaret):
        (WebCore::DragController::concludeDrag):
        (WebCore::prepareClipboardForImageDrag):
        (WebCore::DragController::startDrag):
        * page/EventHandler.cpp:
        (WebCore::EventHandler::selectClosestWordFromMouseEvent):
        (WebCore::EventHandler::selectClosestWordOrLinkFromMouseEvent):
        (WebCore::EventHandler::handleMousePressEventDoubleClick):
        (WebCore::EventHandler::handleMousePressEventTripleClick):
        (WebCore::EventHandler::handleMousePressEventSingleClick):
        (WebCore::EventHandler::handleMousePressEvent):
        (WebCore::EventHandler::updateSelectionForMouseDrag):
        (WebCore::EventHandler::handleMouseReleaseEvent):
        (WebCore::nodeIsNotBeingEdited):
        (WebCore::EventHandler::selectCursor):
        (WebCore::EventHandler::dispatchMouseEvent):
        (WebCore::EventHandler::sendContextMenuEvent):
        (WebCore::EventHandler::handleKeyboardSelectionMovement):
        (WebCore::EventHandler::handleDrag):
        * page/FocusController.cpp:
        (WebCore::FocusController::setFocusedFrame):
        (WebCore::clearSelectionIfNeeded):
        (WebCore::FocusController::setActive):
        * page/Frame.cpp:
        (WebCore::Frame::~Frame):
        (WebCore::Frame::script):
        (WebCore::Frame::setDocument):
        (WebCore::Frame::selectedText):
        (WebCore::Frame::selection):
        (WebCore::Frame::animation):
        (WebCore::Frame::notifyRendererOfSelectionChange):
        (WebCore::Frame::invalidateSelection):
        (WebCore::Frame::clearCaretRectIfNeeded):
        (WebCore::Frame::setFocusedNodeIfNeeded):
        (WebCore::Frame::selectionLayoutChanged):
        (WebCore::Frame::caretBlinkTimerFired):
        (WebCore::Frame::paintCaret):
        (WebCore::Frame::shouldChangeSelection):
        (WebCore::Frame::updateSecureKeyboardEntryIfActive):
        (WebCore::Frame::computeAndSetTypingStyle):
        (WebCore::Frame::selectionComputedStyle):
        (WebCore::Frame::bindingRootObject):
        (WebCore::Frame::windowScriptNPObject):
        (WebCore::Frame::clearScriptController):
        (WebCore::Frame::selectionTextRects):
        (WebCore::Frame::currentForm):
        (WebCore::Frame::revealSelection):
        (WebCore::Frame::revealCaret):
        (WebCore::Frame::clearTimers):
        (WebCore::Frame::styleForSelectionStart):
        (WebCore::Frame::setSelectionFromNone):
        (WebCore::Frame::findString):
        (WebCore::Frame::pageDestroyed):
        (WebCore::Frame::respondToChangedSelection):
        (WebCore::FramePrivate::FramePrivate):
        * page/Frame.h:
        * page/FramePrivate.h:
        * page/InspectorController.cpp:
        (WebCore::canPassNodeToJavaScript):
        (WebCore::InspectorController::windowScriptObjectAvailable):
        * page/JavaScriptDebugServer.cpp:
        (WebCore::JavaScriptDebugServer::setJavaScriptPaused):
        * page/Page.cpp:
        (WebCore::Page::findString):
        (WebCore::Page::selection):
        (WebCore::Page::setDebugger):
        * page/mac/FrameMac.mm:
        (WebCore::Frame::baseWritingDirectionForSelectionStart):
        (WebCore::Frame::dragImageForSelection):
        (WebCore::Frame::createScriptInstanceForWidget):
        (WebCore::Frame::windowScriptObject):
        * page/win/FrameWin.cpp:
        (WebCore::Frame::dragImageForSelection):
        * platform/ContextMenu.cpp:
        (WebCore::selectionContainsPossibleWord):
        (WebCore::ContextMenu::populate):
        (WebCore::ContextMenu::checkOrEnableIfNeeded):
        * plugins/PluginView.cpp:
        (WebCore::PluginView::performRequest):
        (WebCore::PluginView::bindingInstance):
        * rendering/HitTestResult.cpp:
        (WebCore::HitTestResult::isSelected):
        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::paintCaret):
        * rendering/RenderListBox.cpp:
        (WebCore::RenderListBox::paintItemForeground):
        (WebCore::RenderListBox::paintItemBackground):
        * rendering/RenderObject.cpp:
        (WebCore::RenderObject::selectionBackgroundColor):
        (WebCore::RenderObject::selectionForegroundColor):
        (WebCore::RenderObject::setAnimatableStyle):
        (WebCore::RenderObject::destroy):
        (WebCore::RenderObject::animation):
        * rendering/RenderObject.h:
        * rendering/RenderTextControl.cpp:
        (WebCore::RenderTextControl::selectionStart):
        (WebCore::RenderTextControl::selectionEnd):
        (WebCore::RenderTextControl::setSelectionRange):
        (WebCore::RenderTextControl::selectionChanged):
        (WebCore::RenderTextControl::capsLockStateMayHaveChanged):
        * rendering/RenderTheme.cpp:
        (WebCore::RenderTheme::isFocused):
        * rendering/RenderTreeAsText.cpp:
        (WebCore::writeSelection):
        * rendering/RenderWidget.cpp:
        (WebCore::RenderWidget::destroy):
        * svg/SVGDocumentExtensions.cpp:
        (WebCore::SVGDocumentExtensions::createSVGEventListener):
        * svg/SVGSVGElement.cpp:
        (WebCore::SVGSVGElement::deselectAll):
        * svg/SVGTextContentElement.cpp:
        (WebCore::SVGTextContentElement::selectSubString):

WebKit/gtk:

2008-06-15  Darin Adler  <darin@apple.com>

        - give Frame object functions shorter names: scriptProxy() -> script(),
          selectionController() -> selection(), animationController() -> animation()

        * WebCoreSupport/EditorClientGtk.cpp:
        (WebKit::EditorClient::handleKeyboardEvent):
        * WebCoreSupport/FrameLoaderClientGtk.cpp:
        (WebKit::FrameLoaderClient::windowObjectCleared):
        * webkit/webkitwebframe.cpp:
        * webkit/webkitwebview.cpp:

WebKit/mac:

2008-06-15  Darin Adler  <darin@apple.com>

        - give Frame object functions shorter names: scriptProxy() -> script(),
          selectionController() -> selection(), animationController() -> animation()

        * Plugins/WebPluginController.mm:
        (-[WebPluginController webPlugInContainerSelectionColor]):
        * WebView/WebFrame.mm:
        (-[WebFrame _attachScriptDebugger]):
        (-[WebFrame _hasSelection]):
        (-[WebFrame _stringByEvaluatingJavaScriptFromString:forceUserGesture:]):
        (-[WebFrame _rangeByAlteringCurrentSelection:SelectionController::direction:SelectionController::granularity:]):
        (-[WebFrame _convertToNSRange:]):
        (-[WebFrame _convertToDOMRange:]):
        (-[WebFrame _replaceSelectionWithFragment:selectReplacement:smartReplace:matchStyle:]):
        (-[WebFrame _replaceSelectionWithText:selectReplacement:smartReplace:]):
        (-[WebFrame _insertParagraphSeparatorInQuotedContent]):
        (-[WebFrame _selectedNSRange]):
        (-[WebFrame _selectNSRange:]):
        (-[WebFrame globalContext]):
        * WebView/WebHTMLView.mm:
        (-[WebHTMLView _selectedRange]):
        (-[WebHTMLView _hasSelection]):
        (-[WebHTMLView _hasSelectionOrInsertionPoint]):
        (-[WebHTMLView _hasInsertionPoint]):
        (-[WebHTMLView _isEditable]):
        (-[WebHTMLView _updateFocusedAndActiveState]):
        (-[WebHTMLView readSelectionFromPasteboard:]):
        (-[WebHTMLView validateUserInterfaceItemWithoutDelegate:]):
        (-[WebHTMLView maintainsInactiveSelection]):
        (-[WebHTMLView paste:]):
        (isTextInput):
        (-[WebHTMLView inputContext]):
        (-[WebTextCompleteController doCompletion]):
        (-[WebHTMLView selectAll]):
        (-[WebHTMLView deselectAll]):
        (-[WebHTMLView selectedAttributedString]):
        * WebView/WebView.mm:
        (-[WebView aeDescByEvaluatingJavaScriptFromString:]):
        (-[WebView setSelectedDOMRange:affinity:]):
        (-[WebView selectedDOMRange]):
        (-[WebView selectionAffinity]):

WebKit/qt:

2008-06-15  Darin Adler  <darin@apple.com>

        - give Frame object functions shorter names: scriptProxy() -> script(),
          selectionController() -> selection(), animationController() -> animation()

        * Api/qwebframe.cpp:
        (QWebFrame::evaluateJavaScript):
        * Api/qwebpage.cpp:
        (QWebPagePrivate::focusInEvent):
        (QWebPagePrivate::focusOutEvent):
        (QWebPage::inputMethodQuery):
        * WebCoreSupport/EditorClientQt.cpp:
        (WebCore::EditorClientQt::handleKeyboardEvent):

WebKit/win:

2008-06-15  Darin Adler  <darin@apple.com>

        - give Frame object functions shorter names: scriptProxy() -> script(),
          selectionController() -> selection(), animationController() -> animation()

        * WebFrame.cpp:
        (WebFrame::globalContext):
        (WebFrame::windowObjectCleared):
        * WebView.cpp:
        (WebView::handleContextMenuEvent):
        (WebViewWndProc):
        (WebView::updateFocusedAndActiveState):
        (WebView::hasSelectedRange):
        (WebView::replaceSelectionWithText):
        (WebView::clearSelection):
        (WebView::prepareCandidateWindow):
        (WebView::onIMERequestCharPosition):
        (WebView::onIMERequestReconvertString):

WebKit/wx:

2008-06-15  Darin Adler  <darin@apple.com>

        - give Frame object functions shorter names: scriptProxy() -> script(),
          selectionController() -> selection(), animationController() -> animation()

        * WebKitSupport/EditorClientWx.cpp:
        (WebCore::EditorClientWx::handleKeyboardEvent):
        * WebView.cpp:
        (wxWebView::RunScript):
        (wxWebView::OnSetFocus):
        (wxWebView::OnKillFocus):

WebKitTools:

2008-06-15  Darin Adler  <darin@apple.com>

        * Scripts/do-webcore-rename: Updated for the latest round of renaming.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34589 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a917395f
This diff is collapsed.
......@@ -361,6 +361,7 @@ __ZN7WebCore16MIMETypeRegistry32isSupportedImageResourceMIMETypeERKNS_6StringE
__ZN7WebCore16NavigationActionC1ERKNS_4KURLENS_13FrameLoadTypeEb
__ZN7WebCore16NavigationActionC1ERKNS_4KURLENS_14NavigationTypeE
__ZN7WebCore16NavigationActionC1Ev
__ZN7WebCore16ScriptController10initScriptEv
__ZN7WebCore16colorFromNSColorEP7NSColor
__ZN7WebCore16createFullMarkupEPKNS_4NodeE
__ZN7WebCore16createFullMarkupEPKNS_5RangeE
......@@ -449,7 +450,6 @@ __ZN7WebCore5Cache13getStatisticsEv
__ZN7WebCore5Cache13setCapacitiesEjjj
__ZN7WebCore5Frame10findStringERKNS_6StringEbbbb
__ZN7WebCore5Frame11forceLayoutEb
__ZN7WebCore5Frame11scriptProxyEv
__ZN7WebCore5Frame11shouldCloseEv
__ZN7WebCore5Frame13reapplyStylesEv
__ZN7WebCore5Frame13setZoomFactorEfb
......@@ -469,6 +469,7 @@ __ZN7WebCore5Frame29forceLayoutWithPageWidthRangeEffb
__ZN7WebCore5Frame34setMarkedTextMatchesAreHighlightedEb
__ZN7WebCore5Frame4initEv
__ZN7WebCore5Frame5paintEPNS_15GraphicsContextERKNS_7IntRectE
__ZN7WebCore5Frame6scriptEv
__ZN7WebCore5Frame7setViewEPNS_9FrameViewE
__ZN7WebCore5FrameC1EPNS_4PageEPNS_21HTMLFrameOwnerElementEPNS_17FrameLoaderClientE
__ZN7WebCore5FrameD1Ev
......@@ -552,7 +553,6 @@ __ZN7WebCore8Document4bodyEv
__ZN7WebCore8DragDataC1EP11objc_objectRKNS_8IntPointES5_NS_13DragOperationEPNS_16PasteboardHelperE
__ZN7WebCore8FormDataD1Ev
__ZN7WebCore8IntPointC1ERK8_NSPoint
__ZN7WebCore16ScriptController10initScriptEv
__ZN7WebCore8Settings14setJavaEnabledEb
__ZN7WebCore8Settings16setUsesPageCacheEb
__ZN7WebCore8Settings17setPluginsEnabledEb
......@@ -775,7 +775,6 @@ __ZNK7WebCore5Frame16inViewSourceModeEv
__ZNK7WebCore5Frame17firstRectForRangeEPNS_5RangeE
__ZNK7WebCore5Frame18documentTypeStringEv
__ZNK7WebCore5Frame18selectionTextRectsERN3WTF6VectorINS_9FloatRectELm0EEEb
__ZNK7WebCore5Frame19selectionControllerEv
__ZNK7WebCore5Frame19setInViewSourceModeEb
__ZNK7WebCore5Frame20selectionGranularityEv
__ZNK7WebCore5Frame25backslashAsCurrencySymbolEv
......@@ -792,6 +791,7 @@ __ZNK7WebCore5Frame6editorEv
__ZNK7WebCore5Frame6loaderEv
__ZNK7WebCore5Frame8documentEv
__ZNK7WebCore5Frame8settingsEv
__ZNK7WebCore5Frame9selectionEv
__ZNK7WebCore5Range11startOffsetERi
__ZNK7WebCore5Range12endContainerERi
__ZNK7WebCore5Range12pastLastNodeEv
......
......@@ -52,10 +52,10 @@ void JSCustomSQLStatementCallback::handleEvent(SQLTransaction* transaction, SQLR
ASSERT(m_callback);
ASSERT(m_frame);
if (!m_frame->scriptProxy()->isEnabled())
if (!m_frame->script()->isEnabled())
return;
JSGlobalObject* globalObject = m_frame->scriptProxy()->globalObject();
JSGlobalObject* globalObject = m_frame->script()->globalObject();
ExecState* exec = globalObject->globalExec();
KJS::JSLock lock;
......
......@@ -52,10 +52,10 @@ bool JSCustomSQLStatementErrorCallback::handleEvent(SQLTransaction* transaction,
ASSERT(m_callback);
ASSERT(m_frame);
if (!m_frame->scriptProxy()->isEnabled())
if (!m_frame->script()->isEnabled())
return true;
JSGlobalObject* globalObject = m_frame->scriptProxy()->globalObject();
JSGlobalObject* globalObject = m_frame->script()->globalObject();
ExecState* exec = globalObject->globalExec();
KJS::JSLock lock;
......
......@@ -106,10 +106,10 @@ void JSCustomSQLTransactionCallback::handleEvent(SQLTransaction* transaction, bo
ASSERT(m_data->callback());
ASSERT(m_data->frame());
if (!m_data->frame()->scriptProxy()->isEnabled())
if (!m_data->frame()->script()->isEnabled())
return;
JSGlobalObject* globalObject = m_data->frame()->scriptProxy()->globalObject();
JSGlobalObject* globalObject = m_data->frame()->script()->globalObject();
ExecState* exec = globalObject->globalExec();
KJS::JSLock lock;
......
......@@ -51,10 +51,10 @@ bool JSCustomSQLTransactionErrorCallback::handleEvent(SQLError* error)
ASSERT(m_callback);
ASSERT(m_frame);
if (!m_frame->scriptProxy()->isEnabled())
if (!m_frame->script()->isEnabled())
return true;
JSGlobalObject* globalObject = m_frame->scriptProxy()->globalObject();
JSGlobalObject* globalObject = m_frame->script()->globalObject();
ExecState* exec = globalObject->globalExec();
KJS::JSLock lock;
......
......@@ -52,10 +52,10 @@ void JSCustomVoidCallback::handleEvent()
ASSERT(m_callback);
ASSERT(m_frame);
if (!m_frame->scriptProxy()->isEnabled())
if (!m_frame->script()->isEnabled())
return;
JSGlobalObject* globalObject = m_frame->scriptProxy()->globalObject();
JSGlobalObject* globalObject = m_frame->script()->globalObject();
ExecState* exec = globalObject->globalExec();
KJS::JSLock lock;
......
......@@ -72,12 +72,12 @@ String JSCustomXPathNSResolver::lookupNamespaceURI(const String& prefix)
if (!m_frame)
return String();
if (!m_frame->scriptProxy()->isEnabled())
if (!m_frame->script()->isEnabled())
return String();
JSLock lock;
JSGlobalObject* globalObject = m_frame->scriptProxy()->globalObject();
JSGlobalObject* globalObject = m_frame->script()->globalObject();
ExecState* exec = globalObject->globalExec();
JSValue* lookupNamespaceURIFuncValue = m_customResolver->get(exec, "lookupNamespaceURI");
......
......@@ -203,7 +203,7 @@ void JSDOMWindowBase::updateDocument()
JSDOMWindowBase::~JSDOMWindowBase()
{
if (m_impl->frame())
m_impl->frame()->scriptProxy()->clearFormerWindow(asJSDOMWindow(this));
m_impl->frame()->script()->clearFormerWindow(asJSDOMWindow(this));
clearAllTimeouts();
......@@ -233,7 +233,7 @@ static bool allowPopUp(ExecState* exec)
Frame* frame = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->frame();
ASSERT(frame);
if (frame->scriptProxy()->processingUserGesture())
if (frame->script()->processingUserGesture())
return true;
Settings* settings = frame->settings();
return settings && settings->JavaScriptCanOpenWindowsAutomatically();
......@@ -306,7 +306,7 @@ static Frame* createWindow(ExecState* exec, Frame* openerFrame, const String& ur
if (!protocolIs(url, "javascript") || newWindow->allowsAccessFrom(exec)) {
KURL completedURL = url.isEmpty() ? KURL("") : activeFrame->document()->completeURL(url);
bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
bool userGesture = activeFrame->script()->processingUserGesture();
if (created)
newFrame->loader()->changeLocation(completedURL, activeFrame->loader()->outgoingReferrer(), false, userGesture);
......@@ -999,7 +999,7 @@ JSValue* windowProtoFuncOpen(ExecState* exec, JSObject* thisObj, const ArgList&
const JSDOMWindow* targetedWindow = toJSDOMWindow(frame);
if (!completedURL.isEmpty() && (!protocolIs(completedURL, "javascript") || (targetedWindow && targetedWindow->allowsAccessFrom(exec)))) {
bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
bool userGesture = activeFrame->script()->processingUserGesture();
frame->loader()->scheduleLocationChange(completedURL, activeFrame->loader()->outgoingReferrer(), false, userGesture);
}
return toJS(exec, frame->domWindow());
......@@ -1320,14 +1320,14 @@ JSValue* toJS(ExecState*, DOMWindow* domWindow)
Frame* frame = domWindow->frame();
if (!frame)
return jsNull();
return frame->scriptProxy()->windowShell();
return frame->script()->windowShell();
}
JSDOMWindow* toJSDOMWindow(Frame* frame)
{
if (!frame)
return 0;
return frame->scriptProxy()->windowShell()->window();
return frame->script()->windowShell()->window();
}
} // namespace WebCore
......@@ -108,7 +108,7 @@ void JSDOMWindow::setLocation(ExecState* exec, JSValue* value)
return;
String dstUrl = activeFrame->loader()->completeURL(value->toString(exec)).string();
if (!protocolIs(dstUrl, "javascript") || allowsAccessFrom(exec)) {
bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
bool userGesture = activeFrame->script()->processingUserGesture();
// We want a new history item if this JS was called via a user gesture
impl()->frame()->loader()->scheduleLocationChange(dstUrl, activeFrame->loader()->outgoingReferrer(), false, userGesture);
}
......
......@@ -152,14 +152,14 @@ JSValue* toJS(ExecState*, Frame* frame)
{
if (!frame)
return jsNull();
return frame->scriptProxy()->windowShell();
return frame->script()->windowShell();
}
JSDOMWindowShell* toJSDOMWindowShell(Frame* frame)
{
if (!frame)
return 0;
return frame->scriptProxy()->windowShell();
return frame->script()->windowShell();
}
} // namespace WebCore
......@@ -68,7 +68,7 @@ void JSDocument::setLocation(ExecState* exec, JSValue* value)
if (activeFrame)
str = activeFrame->document()->completeURL(str).string();
bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
bool userGesture = activeFrame->script()->processingUserGesture();
frame->loader()->scheduleLocationChange(str, activeFrame->loader()->outgoingReferrer(), false, userGesture);
}
......
......@@ -116,7 +116,7 @@ static void navigateIfAllowed(ExecState* exec, Frame* frame, const KURL& url, bo
{
Frame* activeFrame = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->frame();
if (!url.protocolIs("javascript") || allowsAccessFromFrame(exec, frame)) {
bool userGesture = activeFrame->scriptProxy()->processingUserGesture();
bool userGesture = activeFrame->script()->processingUserGesture();
frame->loader()->scheduleLocationChange(url.string(), activeFrame->loader()->outgoingReferrer(), lockHistory, userGesture);
}
}
......@@ -250,7 +250,7 @@ JSValue* JSLocation::reload(ExecState* exec, const ArgList& args)
return jsUndefined();
if (!frame->loader()->url().protocolIs("javascript") || (window && window->allowsAccessFrom(exec))) {
bool userGesture = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->frame()->scriptProxy()->processingUserGesture();
bool userGesture = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->frame()->script()->processingUserGesture();
frame->loader()->scheduleRefresh(userGesture);
}
return jsUndefined();
......
......@@ -61,7 +61,7 @@ short JSNodeFilterCondition::acceptNode(Node* filterNode, JSValue*& exception) c
if (!m_filter->implementsCall())
return NodeFilter::FILTER_REJECT;
ExecState* exec = frame->scriptProxy()->globalObject()->globalExec();
ExecState* exec = frame->script()->globalObject()->globalExec();
ArgList args;
args.append(toJS(exec, filterNode));
if (exec->hadException()) {
......
......@@ -51,13 +51,13 @@ void ScheduledAction::execute(JSDOMWindowShell* windowShell)
if (!frame)
return;
if (!frame->scriptProxy()->isEnabled())
if (!frame->script()->isEnabled())
return;
ScriptController* scriptProxy = frame->scriptProxy();
ScriptController* script = frame->script();
scriptProxy->setProcessingTimerCallback(true);
script->setProcessingTimerCallback(true);
if (JSValue* func = m_func.get()) {
JSLock lock;
......@@ -92,7 +92,7 @@ void ScheduledAction::execute(JSDOMWindowShell* windowShell)
if (Document* doc = frame->document())
doc->updateRendering();
scriptProxy->setProcessingTimerCallback(false);
script->setProcessingTimerCallback(false);
}
} // namespace WebCore
......@@ -54,8 +54,8 @@ void JSAbstractEventListener::handleEvent(Event* event, bool isWindowEvent)
Frame* frame = window->impl()->frame();
if (!frame)
return;
ScriptController* scriptProxy = frame->scriptProxy();
if (!scriptProxy->isEnabled() || scriptProxy->isPaused())
ScriptController* script = frame->script();
if (!script->isEnabled() || script->isPaused())
return;
JSLock lock;
......@@ -270,7 +270,7 @@ void JSLazyEventListener::parseCode() const
m_parsed = true;
Frame* frame = window()->impl()->frame();
if (frame && frame->scriptProxy()->isEnabled()) {
if (frame && frame->script()->isEnabled()) {
ExecState* exec = window()->globalExec();
JSLock lock;
......
......@@ -102,7 +102,7 @@ bool runtimeObjectImplementsCall(HTMLElement* thisImp)
Frame* frame = thisImp->document()->frame();
if (!frame)
return false;
ExecState* exec = frame->scriptProxy()->globalObject()->globalExec();
ExecState* exec = frame->script()->globalObject()->globalExec();
JSObject* runtimeObject = getRuntimeObject(exec, thisImp);
if (!runtimeObject)
return false;
......
......@@ -114,7 +114,7 @@ void removeDOMWrapper(DOMObjectInternal* impl)
if (!frame)
return;
KJS::ExecState *exec = frame->scriptProxy()->globalObject()->globalExec();
KJS::ExecState *exec = frame->script()->globalObject()->globalExec();
// Get (or create) a cached JS object for the DOM node.
KJS::JSObject *scriptImp = static_cast<KJS::JSObject*>(WebCore::toJS(exec, nodeImpl));
......
......@@ -449,7 +449,7 @@ static PassRefPtr<RootObject> createRootObject(void* nativeHandle)
}
if (!frame)
return 0;
return frame->createRootObject(nativeHandle, frame->scriptProxy()->globalObject());
return frame->createRootObject(nativeHandle, frame->script()->globalObject());
}
// We're either creating a 'Root' object (via a call to JavaJSObject.getWindow()), or
......
......@@ -1942,7 +1942,7 @@ bool CSSStyleSelector::SelectorChecker::checkOneSelector(CSSSelector* sel, Eleme
break;
}
case CSSSelector::PseudoFocus:
if (e && e->focused() && e->document()->frame()->selectionController()->isFocusedAndActive())
if (e && e->focused() && e->document()->frame()->selection()->isFocusedAndActive())
return true;
break;
case CSSSelector::PseudoHover: {
......
......@@ -2512,7 +2512,7 @@ void Document::nodeWillBeRemoved(Node* n)
}
if (Frame* frame = this->frame()) {
frame->selectionController()->nodeWillBeRemoved(n);
frame->selection()->nodeWillBeRemoved(n);
frame->dragCaretController()->nodeWillBeRemoved(n);
}
}
......@@ -2722,8 +2722,8 @@ void Document::addPendingFrameBeforeUnloadEventCount()
PassRefPtr<EventListener> Document::createHTMLEventListener(const String& functionName, const String& code, Node *node)
{
if (Frame* frm = frame())
if (frm->scriptProxy()->isEnabled())
return frm->scriptProxy()->createHTMLEventHandler(functionName, code, node);
if (frm->script()->isEnabled())
return frm->script()->createHTMLEventHandler(functionName, code, node);
return 0;
}
......
......@@ -1133,7 +1133,7 @@ void Element::updateFocusAppearance(bool restorePreviousSelection)
Selection newSelection = hasTagName(htmlTag) || hasTagName(bodyTag) ? Selection(Position(this, 0), DOWNSTREAM) : Selection::selectionFromContentsOfNode(this);
if (frame->shouldChangeSelection(newSelection)) {
frame->selectionController()->setSelection(newSelection);
frame->selection()->setSelection(newSelection);
frame->revealSelection();
}
} else if (renderer() && !renderer()->isWidget())
......
......@@ -275,8 +275,8 @@ bool EventTarget::dispatchGenericEvent(EventTargetNode* referenceNode, PassRefPt
// have a reference to it in a variable. So there is no need for
// the interpreter to keep the event in it's cache
Frame* frame = referenceNode->document()->frame();
if (tempEvent && frame && frame->scriptProxy()->isEnabled())
frame->scriptProxy()->finishedWithEvent(evt.get());
if (tempEvent && frame && frame->script()->isEnabled())
frame->script()->finishedWithEvent(evt.get());
return !evt->defaultPrevented(); // ### what if defaultPrevented was called before dispatchEvent?
}
......
......@@ -846,8 +846,8 @@ void XMLTokenizer::startElementNs(const xmlChar* xmlLocalName, const xmlChar* xm
return;
}
ScriptController* jsProxy = m_doc->frame() ? m_doc->frame()->scriptProxy() : 0;
if (jsProxy && m_doc->frame()->scriptProxy()->isEnabled())
ScriptController* jsProxy = m_doc->frame() ? m_doc->frame()->script() : 0;
if (jsProxy && m_doc->frame()->script()->isEnabled())
jsProxy->setEventHandlerLineno(lineNumber());
handleElementAttributes(newElement.get(), libxmlAttributes, nb_attributes, ec);
......
......@@ -129,7 +129,7 @@ void DeleteButtonController::respondToChangedSelection(const Selection& oldSelec
return;
HTMLElement* oldElement = enclosingDeletableElement(oldSelection);
HTMLElement* newElement = enclosingDeletableElement(m_frame->selectionController()->selection());
HTMLElement* newElement = enclosingDeletableElement(m_frame->selection()->selection());
if (oldElement == newElement)
return;
......@@ -279,7 +279,7 @@ void DeleteButtonController::enable()
if (m_disableStack > 0)
m_disableStack--;
if (enabled())
show(enclosingDeletableElement(m_frame->selectionController()->selection()));
show(enclosingDeletableElement(m_frame->selection()->selection()));
}
void DeleteButtonController::disable()
......@@ -302,7 +302,7 @@ void DeleteButtonController::deleteTarget()
// a caret where the target had been.
Position pos = positionBeforeNode(element.get());
applyCommand(RemoveNodeCommand::create(element.release()));
m_frame->selectionController()->setSelection(VisiblePosition(pos));
m_frame->selection()->setSelection(VisiblePosition(pos));
}
} // namespace WebCore
......@@ -50,7 +50,7 @@ EditCommand::EditCommand(Document* document)
ASSERT(m_document);
ASSERT(m_document->frame());
DeleteButtonController* deleteButton = m_document->frame()->editor()->deleteButtonController();
setStartingSelection(avoidIntersectionWithNode(m_document->frame()->selectionController()->selection(), deleteButton ? deleteButton->containerElement() : 0));
setStartingSelection(avoidIntersectionWithNode(m_document->frame()->selection()->selection(), deleteButton ? deleteButton->containerElement() : 0));
setEndingSelection(m_startingSelection);
}
......
This diff is collapsed.
This diff is collapsed.
......@@ -204,7 +204,7 @@ bool IncreaseSelectionListLevelCommand::canIncreaseSelectionListLevel(Document*
{
Node* startListChild;
Node* endListChild;
return canIncreaseListLevel(document->frame()->selectionController()->selection(), startListChild, endListChild);
return canIncreaseListLevel(document->frame()->selection()->selection(), startListChild, endListChild);
}
PassRefPtr<Node> IncreaseSelectionListLevelCommand::increaseSelectionListLevelWithType(Document* document, Type listType)
......@@ -280,7 +280,7 @@ bool DecreaseSelectionListLevelCommand::canDecreaseSelectionListLevel(Document*
{
Node* startListChild;
Node* endListChild;
return canDecreaseListLevel(document->frame()->selectionController()->selection(), startListChild, endListChild);
return canDecreaseListLevel(document->frame()->selection()->selection(), startListChild, endListChild);
}
void DecreaseSelectionListLevelCommand::decreaseSelectionListLevel(Document* document)
......
......@@ -49,11 +49,11 @@ void RemoveFormatCommand::doApply()
Frame* frame = document()->frame();
// Make a plain text string from the selection to remove formatting like tables and lists.
String string = plainText(frame->selectionController()->selection().toRange().get());
String string = plainText(frame->selection()->selection().toRange().get());
// Get the default style for this editable root, it's the style that we'll give the
// content that we're operating on.
Node* root = frame->selectionController()->rootEditableElement();
Node* root = frame->selection()->rootEditableElement();
RefPtr<CSSComputedStyleDeclaration> computedStyle = new CSSComputedStyleDeclaration(root);
RefPtr<CSSMutableStyleDeclaration> defaultStyle = computedStyle->copyInheritableProperties();
......
......@@ -113,7 +113,7 @@ void SelectionController::setSelection(const Selection& s, bool closeTyping, boo
}
if (s.base().node() && s.base().node()->document() != m_frame->document()) {
s.base().node()->document()->frame()->selectionController()->setSelection(s, closeTyping, clearTypingStyle, userTriggered);
s.base().node()->document()->frame()->selection()->setSelection(s, closeTyping, clearTypingStyle, userTriggered);
return;
}
......@@ -1002,7 +1002,7 @@ void SelectionController::selectFrameElementInParentIfFullySelected()
Selection newSelection(beforeOwnerElement, afterOwnerElement);
if (parent->shouldChangeSelection(newSelection)) {
page->focusController()->setFocusedFrame(parent);
parent->selectionController()->setSelection(newSelection);
parent->selection()->setSelection(newSelection);
}
}
......
......@@ -63,7 +63,7 @@ void TypingCommand::deleteSelection(Document* document, bool smartDelete)
Frame* frame = document->frame();
ASSERT(frame);
if (!frame->selectionController()->isRange())
if (!frame->selection()->isRange())
return;
EditCommand* lastEditCommand = frame->editor()->lastEditCommand();
......@@ -121,7 +121,7 @@ void TypingCommand::insertText(Document* document, const String& text, bool sele
Frame* frame = document->frame();
ASSERT(frame);
insertText(document, text, frame->selectionController()->selection(), selectInsertedText, insertedTextIsComposition);
insertText(document, text, frame->selection()->selection(), selectInsertedText, insertedTextIsComposition);
}
void TypingCommand::insertText(Document* document, const String& text, const Selection& selectionForInsertion, bool selectInsertedText, bool insertedTextIsComposition)
......@@ -131,7 +131,7 @@ void TypingCommand::insertText(Document* document, const String& text, const Sel
RefPtr<Frame> frame = document->frame();
ASSERT(frame);
Selection currentSelection = frame->selectionController()->selection();
Selection currentSelection = frame->selection()->selection();
bool changeSelection = currentSelection != selectionForInsertion;
String newText = text;
......@@ -161,7 +161,7 @@ void TypingCommand::insertText(Document* document, const String& text, const Sel
lastTypingCommand->insertText(newText, selectInsertedText);
if (changeSelection) {
lastTypingCommand->setEndingSelection(currentSelection);
frame->selectionController()->setSelection(currentSelection);
frame->selection()->setSelection(currentSelection);
}
return;
}
......@@ -174,7 +174,7 @@ void TypingCommand::insertText(Document* document, const String& text, const Sel
applyCommand(cmd);
if (changeSelection) {
cmd->setEndingSelection(currentSelection);
frame->selectionController()->setSelection(currentSelection);
frame->selection()->setSelection(currentSelection);
}
}
......@@ -380,9 +380,9 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity)
case Selection::CARET: {
m_smartDelete = false;
SelectionController selectionController;
selectionController.setSelection(endingSelection());
selectionController.modify(SelectionController::EXTEND, SelectionController::BACKWARD, granularity);
SelectionController selection;
selection.setSelection(endingSelection());
selection.modify(SelectionController::EXTEND, SelectionController::BACKWARD, granularity);
// When the caret is at the start of the editable area in an empty list item, break out of the list item.
if (endingSelection().visibleStart().previous(true).isNull()) {
......@@ -399,7 +399,7 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity)
if (isLastPositionBeforeTable(visibleStart))
return;
// Extend the selection backward into the last cell, then deletion will handle the move.
selectionController.modify(SelectionController::EXTEND, SelectionController::BACKWARD, granularity);
selection.modify(SelectionController::EXTEND, SelectionController::BACKWARD, granularity);
// If the caret is just after a table, select the table and don't delete anything.
} else if (Node* table = isFirstPositionAfterTable(visibleStart)) {
setEndingSelection(Selection(Position(table, 0), endingSelection().start(), DOWNSTREAM));
......@@ -407,7 +407,7 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity)
return;
}
selectionToDelete = selectionController.selection();
selectionToDelete = selection.selection();
if (!startingSelection().isRange() || selectionToDelete.base() != startingSelection().start())
selectionAfterUndo = selectionToDelete;
else
......@@ -450,9 +450,9 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity)
// Handle delete at beginning-of-block case.
// Do nothing in the case that the caret is at the start of a
// root editable element or at the start of a document.
SelectionController selectionController;
selectionController.setSelection(endingSelection());
selectionController.modify(SelectionController::EXTEND, SelectionController::FORWARD, granularity);
SelectionController selection;
selection.setSelection(endingSelection());
selection.modify(SelectionController::EXTEND, SelectionController::FORWARD, granularity);
Position downstreamEnd = endingSelection().end().downstream();
VisiblePosition visibleEnd = endingSelection().visibleEnd();
if (visibleEnd == endOfParagraph(visibleEnd))
......@@ -465,10 +465,10 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity)
}
// deleting to end of paragraph when at end of paragraph needs to merge the next paragraph (if any)
if (granularity == ParagraphBoundary && selectionController.selection().isCaret() && isEndOfParagraph(selectionController.selection().visibleEnd()))
selectionController.modify(SelectionController::EXTEND, SelectionController::FORWARD, CharacterGranularity);
if (granularity == ParagraphBoundary && selection.selection().isCaret() && isEndOfParagraph(selection.selection().visibleEnd()))
selection.modify(SelectionController::EXTEND, SelectionController::FORWARD, CharacterGranularity);
selectionToDelete = selectionController.selection();
selectionToDelete = selection.selection();