Changeset 72475 in webkit
- Timestamp:
- Nov 20, 2010 9:33:26 AM (13 years ago)
- Location:
- trunk/WebKit/qt
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/Api/qwebpage.cpp
r72471 r72475 1081 1081 } 1082 1082 1083 if (node && ev->replacementLength() > 0) { 1084 int cursorPos = frame->selection()->extent().offsetInContainerNode(); 1085 int start = cursorPos + ev->replacementStart(); 1086 setSelectionRange(node, start, start + ev->replacementLength()); 1087 // Commit regardless of whether commitString is empty, to get rid of selection. 1083 if (!ev->commitString().isEmpty()) 1088 1084 editor->confirmComposition(ev->commitString()); 1089 } else if (!ev->commitString().isEmpty()) 1090 editor->confirmComposition(ev->commitString()); 1091 if (!hasSelection && !ev->preeditString().isEmpty()) 1085 else if (!hasSelection && !ev->preeditString().isEmpty()) 1092 1086 editor->setComposition(ev->preeditString(), underlines, 0, 0); 1093 1087 -
trunk/WebKit/qt/ChangeLog
r72471 r72475 1 2010-11-20 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r72471. 4 http://trac.webkit.org/changeset/72471 5 https://bugs.webkit.org/show_bug.cgi?id=49865 6 7 broke two IME tests on Qt (Requested by kling on #webkit). 8 9 * Api/qwebpage.cpp: 10 (QWebPagePrivate::inputMethodEvent): 11 * tests/qwebpage/tst_qwebpage.cpp: 12 (tst_QWebPage::inputMethods): 13 1 14 2010-11-19 Kristian Amlie <kristian.amlie@nokia.com> 2 15 -
trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
r72471 r72475 1569 1569 page->event(&evrel); 1570 1570 1571 {1572 QList<QInputMethodEvent::Attribute> attributes;1573 QInputMethodEvent event(QString(), attributes);1574 event.setCommitString("XXX", 0, 0);1575 page->event(&event);1576 event.setCommitString(QString(), -2, 2); // Erase two characters.1577 page->event(&event);1578 event.setCommitString(QString(), -1, 1); // Erase one character.1579 page->event(&event);1580 variant = page->inputMethodQuery(Qt::ImSurroundingText);1581 value = variant.value<QString>();1582 QCOMPARE(value, QString("QtWebKit"));1583 }1584 1585 1571 //Move to the start of the line 1586 1572 page->triggerAction(QWebPage::MoveToStartOfLine);
Note: See TracChangeset
for help on using the changeset viewer.