-
commit-queue@webkit.org authored
Reviewed by Kenneth Russell. 1. Remove entry for editing/input/ime-composition-clearpreedit.html test. 2. Improve fast/events/ime-composition-events-001.html to cover more cases. And fix test expectations of chromium port. https://bugs.webkit.org/show_bug.cgi?id=51693 * fast/events/ime-composition-events-001-expected.txt: * fast/events/ime-composition-events-001.html: * platform/chromium-mac/fast/events/ime-composition-events-001-expected.txt: Removed. * platform/chromium-win/fast/events/ime-composition-events-001-expected.txt: Removed. * platform/chromium/fast/events/ime-composition-events-001-expected.txt: Added. * platform/chromium/test_expectations.txt: * platform/qt/fast/events/ime-composition-events-001-expected.txt: Added. 2011-01-04 Zhe Su <suzhe@chromium.org> Reviewed by Kenneth Russell. Fix insertText, setMarkedText and unmarkText methods of TextInputController to call corresponding methods of WebKit::WebView rather than WebKit::WebFrame. This change matches the behavior of chromium browser. insertText corresponds to WebView::confirmComposition(text) setMarkedText corresponds to WebView::setComposition(...) unmarkText corresponds to WebView::confirmComposition() https://bugs.webkit.org/show_bug.cgi?id=51693 * DumpRenderTree/chromium/TextInputController.cpp: (TextInputController::insertText): (TextInputController::setMarkedText): (TextInputController::unmarkText): 2011-01-04 Zhe Su <suzhe@chromium.org> Reviewed by Kenneth Russell. Changes: 1. Add WebKit::WebWidget::confirmComposition(const WebString& text) This new method corresponds to Editor::confirmComposition(text) and Editor::insertText(text). It'll be used by both DumpRenderTree's TextInputController and chromium browser. 2. Fix WebFrameImpl::insertText It should call Editor::confirmComposition(text) rather than Editor::insertText(text) if there is an ongoing composition. It matches the behavior of WebKit Mac port. 3. Fix WebFrameImpl::setMarkedText Editor::confirmComposition(text) shouldn't be called in this method, which incorrectly inserts the text. https://bugs.webkit.org/show_bug.cgi?id=51693 * public/WebWidget.h: * src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::insertText): (WebKit::WebFrameImpl::setMarkedText): * src/WebPopupMenuImpl.cpp: (WebKit::WebPopupMenuImpl::confirmComposition): * src/WebPopupMenuImpl.h: * src/WebViewImpl.cpp: (WebKit::WebViewImpl::confirmComposition): * src/WebViewImpl.h: * tests/PopupMenuTest.cpp: (WebKit::TestWebWidget::confirmComposition): 2011-01-04 Zhe Su <suzhe@chromium.org> Reviewed by Kenneth Russell. Fix test LayoutTests/fast/events/ime-composition-events-001.html. https://bugs.webkit.org/show_bug.cgi?id=51693 * Api/qwebpage.cpp: (QWebPagePrivate::inputMethodEvent): Calls editor->insertText() to insert the commit string when no composition text is available. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75000 268f45cc-cd09-0410-ab3c-d52691b4dbfc
5f354cec