Changeset 86124 in webkit


Ignore:
Timestamp:
May 9, 2011 7:11:21 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-05-09 Chang Shu <​cshu@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] DumpRenderTreeQt needs an implementation of unmarkText
​https://bugs.webkit.org/show_bug.cgi?id=60499

Unskipped passed test.

  • platform/qt/Skipped:

2011-05-09 Chang Shu <​cshu@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] DumpRenderTreeQt needs an implementation of unmarkText
​https://bugs.webkit.org/show_bug.cgi?id=60499

The implementation is similar to gtk.

  • WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::confirmComposition):
  • WebCoreSupport/DumpRenderTreeSupportQt.h:

2011-05-09 Chang Shu <​cshu@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] DumpRenderTreeQt needs an implementation of unmarkText
​https://bugs.webkit.org/show_bug.cgi?id=60499

The implementation is similar to gtk.

  • DumpRenderTree/qt/TextInputControllerQt.cpp: (TextInputController::unmarkText):
  • DumpRenderTree/qt/TextInputControllerQt.h:
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r86121 r86124  
     12011-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
    1122011-05-09  Kenji Imasaki  <imasaki@chromium.org>
    213

  • trunk/LayoutTests/platform/qt/Skipped

    r86086 r86124  
    337337editing/inserting/typing-tab-designmode.html
    338338editing/inserting/5994480-2.html
    339 editing/inserting/insert-composition-whitespace.html
    340339
    341340# http://bugreports.qt.nokia.com/browse/QTBUG-15566

  • trunk/Source/WebKit/qt/ChangeLog

    r86013 r86124  
     12011-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
    1142011-05-07  Joe Mason  <jmason@rim.com>
    215

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r85998 r86124  
    11181118}
    11191119
     1120void 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
    11201139// Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release
    11211140

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

    r85925 r86124  
    9595    static QVariantList selectedRange(QWebPage* page);
    9696    static QVariantList firstRectForCharacterRange(QWebPage* page, int location, int length);
     97    static void confirmComposition(QWebPage*, const char* text);
    9798
    9899    static bool pauseAnimation(QWebFrame*, const QString& name, double time, const QString& elementId);

  • trunk/Tools/ChangeLog

    r86119 r86124  
     12011-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
    1142011-05-09  James Robinson  <jamesr@chromium.org>
    215

  • trunk/Tools/DumpRenderTree/qt/TextInputControllerQt.cpp

    r82489 r86124  
    157157    return DumpRenderTreeSupportQt::firstRectForCharacterRange(qobject_cast<QWebPage*>(parent()), location, length);
    158158}
     159
     160void TextInputController::unmarkText()
     161{
     162    DumpRenderTreeSupportQt::confirmComposition(qobject_cast<QWebPage*>(parent()), 0);
     163}

  • trunk/Tools/DumpRenderTree/qt/TextInputControllerQt.h

    r58218 r86124  
    4545    void setMarkedText(const QString& string, int start, int end);
    4646//     bool hasMarkedText();
    47 //     void unmarkText();
     47     void unmarkText();
    4848//     QList<int> markedRange();
    4949    QVariantList selectedRange();
Note: See TracChangeset for help on using the changeset viewer.