Changeset 86124 in webkit
- Timestamp:
- May 9, 2011 7:11:21 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r86121 r86124 1 2011-05-09 Chang Shu <cshu@webkit.org> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] DumpRenderTreeQt needs an implementation of unmarkText 6 https://bugs.webkit.org/show_bug.cgi?id=60499 7 8 Unskipped passed test. 9 10 * platform/qt/Skipped: 11 1 12 2011-05-09 Kenji Imasaki <imasaki@chromium.org> 2 13 -
trunk/LayoutTests/platform/qt/Skipped
r86086 r86124 337 337 editing/inserting/typing-tab-designmode.html 338 338 editing/inserting/5994480-2.html 339 editing/inserting/insert-composition-whitespace.html340 339 341 340 # http://bugreports.qt.nokia.com/browse/QTBUG-15566 -
trunk/Source/WebKit/qt/ChangeLog
r86013 r86124 1 2011-05-09 Chang Shu <cshu@webkit.org> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] DumpRenderTreeQt needs an implementation of unmarkText 6 https://bugs.webkit.org/show_bug.cgi?id=60499 7 8 The implementation is similar to gtk. 9 10 * WebCoreSupport/DumpRenderTreeSupportQt.cpp: 11 (DumpRenderTreeSupportQt::confirmComposition): 12 * WebCoreSupport/DumpRenderTreeSupportQt.h: 13 1 14 2011-05-07 Joe Mason <jmason@rim.com> 2 15 -
trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
r85998 r86124 1118 1118 } 1119 1119 1120 void DumpRenderTreeSupportQt::confirmComposition(QWebPage* page, const char* text) 1121 { 1122 Frame* frame = page->handle()->page->focusController()->focusedOrMainFrame(); 1123 if (!frame) 1124 return; 1125 1126 Editor* editor = frame->editor(); 1127 if (!editor || (!editor->hasComposition() && !text)) 1128 return; 1129 1130 if (editor->hasComposition()) { 1131 if (text) 1132 editor->confirmComposition(String::fromUTF8(text)); 1133 else 1134 editor->confirmComposition(); 1135 } else 1136 editor->insertText(String::fromUTF8(text), 0); 1137 } 1138 1120 1139 // Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release 1121 1140 -
trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
r85925 r86124 95 95 static QVariantList selectedRange(QWebPage* page); 96 96 static QVariantList firstRectForCharacterRange(QWebPage* page, int location, int length); 97 static void confirmComposition(QWebPage*, const char* text); 97 98 98 99 static bool pauseAnimation(QWebFrame*, const QString& name, double time, const QString& elementId); -
trunk/Tools/ChangeLog
r86119 r86124 1 2011-05-09 Chang Shu <cshu@webkit.org> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] DumpRenderTreeQt needs an implementation of unmarkText 6 https://bugs.webkit.org/show_bug.cgi?id=60499 7 8 The implementation is similar to gtk. 9 10 * DumpRenderTree/qt/TextInputControllerQt.cpp: 11 (TextInputController::unmarkText): 12 * DumpRenderTree/qt/TextInputControllerQt.h: 13 1 14 2011-05-09 James Robinson <jamesr@chromium.org> 2 15 -
trunk/Tools/DumpRenderTree/qt/TextInputControllerQt.cpp
r82489 r86124 157 157 return DumpRenderTreeSupportQt::firstRectForCharacterRange(qobject_cast<QWebPage*>(parent()), location, length); 158 158 } 159 160 void TextInputController::unmarkText() 161 { 162 DumpRenderTreeSupportQt::confirmComposition(qobject_cast<QWebPage*>(parent()), 0); 163 } -
trunk/Tools/DumpRenderTree/qt/TextInputControllerQt.h
r58218 r86124 45 45 void setMarkedText(const QString& string, int start, int end); 46 46 // bool hasMarkedText(); 47 //void unmarkText();47 void unmarkText(); 48 48 // QList<int> markedRange(); 49 49 QVariantList selectedRange();
Note: See TracChangeset
for help on using the changeset viewer.