2010-09-08 Darin Adler <darin@apple.com>
Reviewed by Adam Barth.
Move functions from Frame to Editor as planned
https://bugs.webkit.org/show_bug.cgi?id=45218
* src/ContextMenuClientImpl.cpp:
(WebKit::selectMisspelledWord):
(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::find):
(WebKit::WebFrameImpl::stopFinding):
(WebKit::WebFrameImpl::scopeStringMatches):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::caretOrSelectionBounds):
Changed call sites to use editor().
2010-09-08 Darin Adler <darin@apple.com>
Reviewed by Adam Barth.
Move functions from Frame to Editor as planned
https://bugs.webkit.org/show_bug.cgi?id=45218
* Api/qwebpage.cpp:
(QWebPage::selectedText):
(QWebPage::setContentEditable):
* WebCoreSupport/DumpRenderTreeSupportQt.cpp:
(DumpRenderTreeSupportQt::firstRectForCharacterRange):
Changed call sites to use editor().
2010-09-08 Darin Adler <darin@apple.com>
Reviewed by Adam Barth.
Move functions from Frame to Editor as planned
https://bugs.webkit.org/show_bug.cgi?id=45218
* webkit/webkitwebview.cpp:
(webkit_web_view_set_highlight_text_matches):
(webkit_web_view_get_selected_text):
(webkit_web_view_set_editable):
Changed call sites to use editor().
2010-09-08 Darin Adler <darin@apple.com>
Reviewed by Adam Barth.
Move functions from Frame to Editor as planned
https://bugs.webkit.org/show_bug.cgi?id=45218
* WebCoreSupport/WebContextMenuClient.cpp:
(WebContextMenuClient::searchWithGoogle):
* WebFrame.cpp:
(WebFrame::selectedString):
* WebView.cpp:
(WebView::selectedText):
(WebView::prepareCandidateWindow):
(WebView::onIMERequestCharPosition):
Changed call sites to use editor().
2010-09-08 Darin Adler <darin@apple.com>
Reviewed by Adam Barth.
Move functions from Frame to Editor as planned
https://bugs.webkit.org/show_bug.cgi?id=45218
* WebFrame.cpp:
(wxWebFrame::FindString):
Changed call sites to use editor().
2010-09-08 Darin Adler <darin@apple.com>
Reviewed by Adam Barth.
Move functions from Frame to Editor as planned
https://bugs.webkit.org/show_bug.cgi?id=45218
* WebView/WebFrame.mm:
(-[WebFrame _selectedString]):
(-[WebFrame _firstRectForDOMRange:]):
(-[WebFrame _markDOMRange]):
(-[WebFrame _setTypingStyle:withUndoAction:]):
* WebView/WebHTMLRepresentation.mm:
(-[WebHTMLRepresentation finishedLoadingWithDataSource:]):
* WebView/WebHTMLView.mm:
(-[WebHTMLView _selectionStartFontAttributesAsRTF]):
(-[WebHTMLView toggleBaseWritingDirection:]):
(-[WebHTMLView searchFor:direction:caseSensitive:wrap:startInSelection:]):
(-[WebHTMLView countMatchesForText:caseSensitive:limit:markMatches:]):
(-[WebHTMLView setMarkedTextMatchesAreHighlighted:]):
(-[WebHTMLView markedTextMatchesAreHighlighted]):
* WebView/WebView.mm:
(-[WebView setEditable:]):
Changed call sites to use editor().
2010-09-08 Darin Adler <darin@apple.com>
Reviewed by Adam Barth.
Move functions from Frame to Editor as planned
https://bugs.webkit.org/show_bug.cgi?id=45218
* ewk/ewk_frame.cpp:
(ewk_frame_editable_set):
(ewk_frame_selection_get):
(ewk_frame_text_search):
(ewk_frame_text_matches_mark):
(ewk_frame_text_matches_highlight_set):
(ewk_frame_text_matches_highlight_get):
* ewk/ewk_view.cpp:
(ewk_view_selection_get):
Changed call sites to use editor().
2010-09-08 Darin Adler <darin@apple.com>
Reviewed by Adam Barth.
Move functions from Frame to Editor as planned
https://bugs.webkit.org/show_bug.cgi?id=45218
Just executing the plan that has long been described in Frame.h
to move a bunch of functions to Editor.
* WebCore.exp.in: Updated.
* editing/Editor.cpp:
(WebCore::Editor::fontForSelection):
(WebCore::Editor::textDirectionForSelection):
(WebCore::Editor::applyStyle):
(WebCore::Editor::selectionStartHasStyle):
(WebCore::Editor::selectionHasStyle):
(WebCore::Editor::selectionStartCSSPropertyValue):
(WebCore::Editor::Editor):
(WebCore::Editor::cut):
(WebCore::Editor::copy):
(WebCore::Editor::ignoreSpelling):
(WebCore::Editor::learnSpelling):
(WebCore::Editor::isSelectionMisspelled):
(WebCore::Editor::guessesForMisspelledSelection):
(WebCore::Editor::selectedText):
(WebCore::Editor::firstRectForRange):
(WebCore::Editor::shouldChangeSelection):
(WebCore::Editor::computeAndSetTypingStyle):
(WebCore::Editor::selectionComputedStyle):
(WebCore::Editor::textFieldDidBeginEditing):
(WebCore::Editor::textFieldDidEndEditing):
(WebCore::Editor::textDidChangeInTextField):
(WebCore::Editor::doTextFieldCommandFromEvent):
(WebCore::Editor::textWillBeDeletedInTextField):
(WebCore::Editor::textDidChangeInTextArea):
(WebCore::Editor::applyEditingStyleToBodyElement):
(WebCore::Editor::applyEditingStyleToElement):
(WebCore::Editor::styleForSelectionStart):
(WebCore::Editor::findString):
(WebCore::Editor::countMatchesForText):
(WebCore::Editor::setMarkedTextMatchesAreHighlighted):
(WebCore::Editor::respondToChangedSelection):
* editing/Editor.h:
* editing/mac/EditorMac.mm:
(WebCore::Editor::fontAttributesForSelectionStart):
(WebCore::Editor::baseWritingDirectionForSelectionStart):
Moved functions here.
* page/Frame.cpp:
(WebCore::Frame::Frame):
(WebCore::Frame::shouldChangeSelection):
* page/Frame.h:
* page/mac/FrameMac.mm:
Moved functions out of here.
* dom/InputElement.cpp:
(WebCore::InputElement::dispatchBlurEvent):
(WebCore::InputElement::aboutToUnload):
* editing/DeleteSelectionCommand.cpp:
(WebCore::DeleteSelectionCommand::doApply):
* editing/EditorCommand.cpp:
(WebCore::executeToggleStyleInList):
(WebCore::executeDeleteToMark):
(WebCore::executeFindString):
(WebCore::executeSelectToMark):
(WebCore::executeSetMark):
(WebCore::executeSwapWithMark):
(WebCore::enabledVisibleSelectionAndMark):
* editing/SelectionController.cpp:
(WebCore::SelectionController::setSelection):
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::defaultEventHandler):
* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::contextMenuItemSelected):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::find):
* page/DragController.cpp:
(WebCore::DragController::startDrag):
* page/EventHandler.cpp:
(WebCore::EventHandler::sendContextMenuEventForKey):
* page/Page.cpp:
(WebCore::Page::findString):
(WebCore::Page::markAllMatchesForText):
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintTextMatchMarker):
* rendering/RenderTextControlMultiLine.cpp:
(WebCore::RenderTextControlMultiLine::subtreeHasChanged):
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::subtreeHasChanged):
Changed call sites to use editor().
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67122 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/editing/DeleteSelectionCommand.cpp b/WebCore/editing/DeleteSelectionCommand.cpp
index e57895c..70f0e88 100644
--- a/WebCore/editing/DeleteSelectionCommand.cpp
+++ b/WebCore/editing/DeleteSelectionCommand.cpp
@@ -746,7 +746,7 @@
if (ancestorNode && ancestorNode->hasTagName(inputTag)
&& static_cast<HTMLInputElement*>(ancestorNode)->isTextField()
&& ancestorNode->focused())
- document()->frame()->textWillBeDeletedInTextField(static_cast<Element*>(ancestorNode));
+ document()->frame()->editor()->textWillBeDeletedInTextField(static_cast<Element*>(ancestorNode));
}
// save this to later make the selection with
