Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp

    r561 r769  
    3131#include <QtGui/qgraphicssceneevent.h>
    3232#include <QtGui/qstyleoption.h>
     33#include <QtGui/qinputcontext.h>
    3334#if defined(Q_WS_X11)
    3435#include <QX11Info>
    … …  
    6465    void _q_doLoadFinished(bool success);
    6566
     67    void _q_updateMicroFocus();
     68    void _q_pageDestroyed();
     69
    6670    QGraphicsWebView* q;
    6771    QWebPage* page;
    … …  
    7983
    8084    emit q->loadFinished(success);
     85}
     86
     87void QGraphicsWebViewPrivate::_q_updateMicroFocus()
     88{
     89#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN))
     90    // Ideally, this should be handled by a common call to an updateMicroFocus function
     91    // in QGraphicsItem. See http://bugreports.qt.nokia.com/browse/QTBUG-7578.
     92    QList<QGraphicsView*> views = q->scene()->views();
     93    for (int c = 0; c < views.size(); ++c) {
     94        QInputContext* ic = views.at(c)->inputContext();
     95        if (ic)
     96            ic->update();
     97    }
     98#endif
     99}
     100
     101void QGraphicsWebViewPrivate::_q_pageDestroyed()
     102{
     103    page = 0;
     104    q->setPage(0);
    81105}
    82106
    … …  
    436460    connect(d->page, SIGNAL(linkClicked(QUrl)),
    437461            this, SIGNAL(linkClicked(QUrl)));
     462    connect(d->page, SIGNAL(microFocusChanged()),
     463            this, SLOT(_q_updateMicroFocus()));
     464    connect(d->page, SIGNAL(destroyed()),
     465            this, SLOT(_q_pageDestroyed()));
    438466}
    439467

  • trunk/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.h

    r561 r769  
    135135private:
    136136    Q_PRIVATE_SLOT(d, void _q_doLoadFinished(bool success))
     137    Q_PRIVATE_SLOT(d, void _q_updateMicroFocus())
     138    Q_PRIVATE_SLOT(d, void _q_pageDestroyed())
    137139
    138140    QGraphicsWebViewPrivate* const d;

  • trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h

    r561 r769  
    2121#define QWEBELEMENT_H
    2222
    23 #include <QString>
    24 #include <QStringList>
    25 #include <QRect>
    26 #include <QVariant>
    27 #include <QExplicitlySharedDataPointer>
     23#include <QtCore/qstring.h>
     24#include <QtCore/qstringlist.h>
     25#include <QtCore/qrect.h>
     26#include <QtCore/qvariant.h>
     27#include <QtCore/qshareddata.h>
    2828
    2929#include "qwebkitglobal.h"

  • trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp

    r651 r769  
    325325}
    326326
    327 static bool webframe_scrollOverflow(WebCore::Frame* frame, int dx, int dy)
    328 {
    329     if (!frame || !frame->document() || !frame->eventHandler())
     327bool QWEBKIT_EXPORT qtwebkit_webframe_scrollOverflow(QWebFrame* qFrame, int dx, int dy, const QPoint& pos)
     328{
     329    WebCore::Frame* frame = QWebFramePrivate::core(qFrame);
     330    if (!frame || !frame->document() || !frame->view() || !frame->eventHandler())
    330331        return false;
    331332
    332     Node* node = frame->document()->focusedNode();
    333     if (!node)
    334         node = frame->document()->elementFromPoint(frame->eventHandler()->currentMousePosition().x(),
    335                                                    frame->eventHandler()->currentMousePosition().y());
     333    QPoint contentsPos = frame->view()->windowToContents(pos);
     334    Node* node = frame->document()->elementFromPoint(contentsPos.x(), contentsPos.y());
    336335    if (!node)
    337336        return false;
    … …  
    351350    bool scrolledVertical = false;
    352351
    353     if (dx > 0)
    354         scrolledHorizontal = renderLayer->scroll(ScrollRight, ScrollByPixel, dx);
    355     else if (dx < 0)
    356         scrolledHorizontal = renderLayer->scroll(ScrollLeft, ScrollByPixel, qAbs(dx));
    357 
    358     if (dy > 0)
    359         scrolledVertical = renderLayer->scroll(ScrollDown, ScrollByPixel, dy);
    360     else if (dy < 0)
    361         scrolledVertical = renderLayer->scroll(ScrollUp, ScrollByPixel, qAbs(dy));
    362 
    363     return (scrolledHorizontal || scrolledVertical);
    364 }
     352    do {
     353        if (dx > 0)
     354            scrolledHorizontal = renderLayer->scroll(ScrollRight, ScrollByPixel, dx);
     355        else if (dx < 0)
     356            scrolledHorizontal = renderLayer->scroll(ScrollLeft, ScrollByPixel, qAbs(dx));
     357
     358        if (dy > 0)
     359            scrolledVertical = renderLayer->scroll(ScrollDown, ScrollByPixel, dy);
     360        else if (dy < 0)
     361            scrolledVertical = renderLayer->scroll(ScrollUp, ScrollByPixel, qAbs(dy));
     362
     363        if (scrolledHorizontal || scrolledVertical)
     364            return true;
     365
     366        renderLayer = renderLayer->parent();
     367    } while (renderLayer);
     368
     369    return false;
     370}
     371
     372
     373
     374
    365375
    366376/*!
    … …  
    10481058
    10491059/*!
    1050   \since 4.7
    10511060  \internal
    10521061  Scrolls nested frames starting at this frame, \a dx pixels to the right
    10531062  and \a dy pixels downward. Both \a dx and \a dy may be negative. First attempts
    1054   to scroll elements with CSS overflow followed by this frame. If this
     1063  to scroll elements with CSS overflow at position pos, followed by this frame. If this
    10551064  frame doesn't scroll, attempts to scroll the parent
    1056 
    1057   \sa QWebFrame::scroll
    1058 */
    1059 bool QWEBKIT_EXPORT qtwebkit_webframe_scrollRecursively(QWebFrame* qFrame, int dx, int dy)
    1060 {
    1061     Frame* frame = QWebFramePrivate::core(qFrame);
    1062     bool scrolledHorizontal = false;
    1063     bool scrolledVertical = false;
    1064     bool scrolledOverflow = webframe_scrollOverflow(frame, dx, dy);
    1065 
    1066     if (!scrolledOverflow) {
    1067         if (!frame || !frame->view())
    1068             return false;
    1069 
    1070         do {
    1071             IntSize scrollOffset = frame->view()->scrollOffset();
    1072             IntPoint maxScrollOffset = frame->view()->maximumScrollPosition();
    1073 
    1074             if (dx > 0) // scroll right
    1075                 scrolledHorizontal = scrollOffset.width() < maxScrollOffset.x();
    1076             else if (dx < 0) // scroll left
    1077                 scrolledHorizontal = scrollOffset.width() > 0;
    1078 
    1079             if (dy > 0) // scroll down
    1080                 scrolledVertical = scrollOffset.height() < maxScrollOffset.y();
    1081             else if (dy < 0) //scroll up
    1082                 scrolledVertical = scrollOffset.height() > 0;
    1083 
    1084             if (scrolledHorizontal || scrolledVertical) {
    1085                 frame->view()->scrollBy(IntSize(dx, dy));
    1086                 return true;
    1087             }
    1088             frame = frame->tree()->parent();
    1089         } while (frame && frame->view());
    1090     }
    1091     return (scrolledHorizontal || scrolledVertical || scrolledOverflow);
     1065*/
     1066void QWEBKIT_EXPORT qtwebkit_webframe_scrollRecursively(QWebFrame* qFrame, int dx, int dy, const QPoint& pos)
     1067{
     1068    if (!qFrame)
     1069        return;
     1070
     1071    if (qtwebkit_webframe_scrollOverflow(qFrame, dx, dy, pos))
     1072        return;
     1073
     1074    bool scrollHorizontal = false;
     1075    bool scrollVertical = false;
     1076
     1077    do {
     1078        if (dx > 0)  // scroll right
     1079            scrollHorizontal = qFrame->scrollBarValue(Qt::Horizontal) < qFrame->scrollBarMaximum(Qt::Horizontal);
     1080        else if (dx < 0)  // scroll left
     1081            scrollHorizontal = qFrame->scrollBarValue(Qt::Horizontal) > qFrame->scrollBarMinimum(Qt::Horizontal);
     1082
     1083        if (dy > 0)  // scroll down
     1084            scrollVertical = qFrame->scrollBarValue(Qt::Vertical) < qFrame->scrollBarMaximum(Qt::Vertical);
     1085        else if (dy < 0) //scroll up
     1086            scrollVertical = qFrame->scrollBarValue(Qt::Vertical) > qFrame->scrollBarMinimum(Qt::Vertical);
     1087
     1088        if (scrollHorizontal || scrollVertical) {
     1089            qFrame->scroll(dx, dy);
     1090            return;
     1091        }
     1092
     1093        qFrame = qFrame->parentFrame();
     1094    } while (qFrame);
    10921095}
    10931096

  • trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebkitversion.h

    r561 r769  
    1818*/
    1919
    20 #include <qstring.h>
     20#include <QtCore/qstring.h>
    2121
    2222#ifndef qwebkitversion_h

  • trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp

    r651 r769  
    12491249        case QInputMethodEvent::Selection: {
    12501250            if (renderTextControl) {
    1251                 renderTextControl->setSelectionStart(a.start);
    1252                 renderTextControl->setSelectionEnd(a.start + a.length);
     1251                renderTextControl->setSelectionStart(qMin(a.start, (a.start + a.length)));
     1252                renderTextControl->setSelectionEnd(qMax(a.start, (a.start + a.length)));
    12531253            }
    12541254            break;
    … …  
    30723072
    30733073    "Mozilla/5.0 (%Platform%; %Security%; %Subplatform%; %Locale%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko) %AppVersion Safari/%WebKitVersion%"
     3074   
     3075    On mobile platforms such as Symbian S60 and Maemo, "Mobile Safari" is used instead of "Safari".
    30743076
    30753077    In this string the following values are replaced at run-time:
    … …  
    30983100    "X11"
    30993101#elif defined Q_OS_SYMBIAN
    3100     "SymbianOS"
     3102    "Symbian"
    31013103#else
    31023104    "Unknown"
    … …  
    31653167    "DEC Ultrix"
    31663168#elif defined Q_WS_S60
    3167     "Series60"
     3169    ""
    31683170#elif defined Q_OS_UNIX
    31693171    "UNIX BSD/SYSV system"
    … …  
    31823184    switch (symbianVersion) {
    31833185    case QSysInfo::SV_9_2:
    3184         osVer = "/9.2";
     3186        osVer = "OS/9.2";
    31853187        break;
    31863188    case QSysInfo::SV_9_3:
    3187         osVer = "/9.3";
     3189        osVer = "OS/9.3";
    31883190        break;
    31893191    case QSysInfo::SV_9_4:
    3190         osVer = "/9.4";
     3192        osVer = "OS/9.4";
     3193        break;
     3194    case QSysInfo::SV_SF_2:
     3195        osVer = "/2";
     3196        break;
     3197    case QSysInfo::SV_SF_3:
     3198        osVer = "/3";
     3199        break;
     3200    case QSysInfo::SV_SF_4:
     3201        osVer = "/4";
    31913202        break;
    31923203    default:
    3193         osVer = "Unknown";
     3204        osVer = "";
    31943205    }
    31953206#endif
    … …  
    32603271    // SubPlatform Version
    32613272    QString subPlatformVer;
    3262 #ifdef Q_OS_SYMBIAN
     3273#ifdef Q_WS_S60
    32633274    QSysInfo::S60Version s60Version = QSysInfo::s60Version();
    32643275    switch (s60Version) {
    32653276    case QSysInfo::SV_S60_3_1:
    3266         subPlatformVer = "/3.1";
     3277        subPlatformVer = "Series60/3.1";
    32673278        break;
    32683279    case QSysInfo::SV_S60_3_2:
    3269         subPlatformVer = "/3.2";
     3280        subPlatformVer = "Series60/3.2";
    32703281        break;
    32713282    case QSysInfo::SV_S60_5_0:
    3272         subPlatformVer = "/5.0";
     3283        subPlatformVer = "Series60/5.0";
    32733284        break;
    32743285    default:
    3275         subPlatformVer = " Unknown";
     3286        subPlatformVer = "";
    32763287    }
    32773288#endif
    … …  
    32833294        locale = view()->locale();
    32843295    QString name = locale.name();
    3285     name[2] = QLatin1Char('-');
     3296    name.replace(QLatin1Char('_'), QLatin1Char('-'));
    32863297    ua.append(name);
    32873298    ua.append(QLatin1String(") "));
    … …  
    33063317    }
    33073318
     3319#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
     3320    ua.append(QString(QLatin1String(" Mobile Safari/%1"))
     3321                      .arg(qWebKitVersion()));
     3322#else
    33083323    ua.append(QString(QLatin1String(" Safari/%1"))
    33093324                      .arg(qWebKitVersion()));
     3325#endif
    33103326
    33113327    return ua;

  • trunk/src/3rdparty/webkit/WebKit/qt/ChangeLog

    r651 r769  
     12010-05-19  Denis Dzyubenko <denis.dzyubenko@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        When creating the UA, do not sassmue the language code is a
     6        two-letter iso639-1 code.
     7
     8        * Api/qwebpage.cpp:
     9        (QWebPage::userAgentForUrl):
     10
     112010-05-12  Joe Ligman  <joseph.ligman@nokia.com>
     12
     13        Reviewed by Laszlo Gombos.
     14
     15        [Qt] Nested overflow div does not scroll
     16        https://bugs.webkit.org/show_bug.cgi?id=38641
     17
     18        Modify qtwebkit_webframe_scrollOverflow, if the current node's render layer
     19        does not scroll it will try and scroll the parent's render layer. Also export
     20        qtwebkit_webframe_scrollOverflow so we can use it independently of
     21        qtwebkit_webframe_scrollRecursively
     22
     23        * Api/qwebframe.cpp:
     24        (qtwebkit_webframe_scrollOverflow):
     25        (qtwebkit_webframe_scrollRecursively):
     26
     272010-04-26  Thiago Macieira  <thiago.macieira@nokia.com>
     28
     29        Reviewed by Simon Hausmann.
     30
     31        [Qt] Fix the include header <qstring.h> -> <QtCore/qstring.h>
     32
     33        The module/header.h style inclusion removes the need to have -I$QTDIR/include/depending-module
     34        in the include search path for the application.
     35
     36        * Api/qwebkitversion.h:
     37
     382010-04-08  Joe Ligman  <joseph.ligman@nokia.com>
     39
     40        Reviewed by Simon Hausmann.
     41
     42        [Qt] qtwebkit_webframe_scrollRecursively scrolls when body.style.overflow="hidden"
     43        https://bugs.webkit.org/show_bug.cgi?id=36674
     44
     45        The scrolling check was based on the frameview's scrolloffset, and
     46        maximumScrollPosition, which does not acknowledge the overflow properties.
     47
     48        I am now basing the scrolling off the scrollbar position. The scrollbars are
     49        affected by the overflow properties indicating when not to scroll. The scrollbar
     50        positions also continue to work for CSS ::-webkit-scrollbar styles.
     51
     52        * Api/qwebframe.cpp:
     53        (qtwebkit_webframe_scrollRecursively):
     54
     552010-03-24  Viatcheslav Ostapenko  <ostapenko.viatcheslav@nokia.com>
     56
     57        Reviewed by Laszlo Gombos.
     58
     59        Auto-uppercase and predictive text need to be disabled for S60 (as for maemo)
     60        https://bugs.webkit.org/show_bug.cgi?id=33176
     61
     62        * WebCoreSupport/EditorClientQt.cpp:
     63
     642010-03-22  Jakub Wieczorek  <jwieczorek@webkit.org>
     65
     66        Reviewed by Simon Hausmann.
     67
     68        [Qt] Don't construct a QLineEdit every time when painting a text field
     69        https://bugs.webkit.org/show_bug.cgi?id=36373
     70
     71        Add a simple benchmark covering this area.
     72
     73        * tests/benchmarks/painting/tst_painting.cpp:
     74        (tst_Painting::textAreas):
     75
     762010-03-22  Yi Shen  <shenyi2006@gmail.com>
     77
     78        Reviewed by Simon Hausmann.
     79
     80        https://bugs.webkit.org/show_bug.cgi?id=35933 
     81        [Qt] [Symbian] Can not backward select (highlight) text using virtual keyboard
     82        Make sure the selection start index is smaller than the selection end index.
     83
     84        * Api/qwebpage.cpp:
     85        (QWebPagePrivate::inputMethodEvent):
     86        * tests/qwebpage/tst_qwebpage.cpp:
     87        (tst_QWebPage::inputMethods):
     88
     892010-03-25  Yael Aharon  <yael.aharon@nokia.com>
     90
     91        Reviewed by Kenneth Rohde Christiansen.
     92
     93        [Qt] QtLauncher crashes on Mac OS and Linux when exiting with QGraphicsView mode enabled
     94        https://bugs.webkit.org/show_bug.cgi?id=35251
     95
     96        Followed the way QWebView registers for the signal QWebPage::destroyed(), to prevent
     97        QGraphicsWebView from referencing QWebPage after it was deleted.       
     98
     99        * Api/qgraphicswebview.cpp:
     100        (QGraphicsWebViewPrivate::_q_pageDestroyed):
     101        (QGraphicsWebView::setPage):
     102        * Api/qgraphicswebview.h:
     103
     1042010-03-23  David Leong  <david.leong@nokia.com>
     105
     106        Reviewed by Laszlo Gombos.
     107
     108        Build fix for Symbian Def file.
     109
     110        * symbian/eabi/QtWebKitu.def:
     111
     1122010-03-18  Joe Ligman  <joseph.ligman@nokia.com>
     113
     114        Reviewed by Simon Hausmann.
     115
     116        [Qt] New API scrollRecursively has several problems.
     117        https://bugs.webkit.org/show_bug.cgi?id=35873
     118
     119        Remove scrollRecursively from the Qt 4.7 API
     120        Update the internal API to accept a hit test position
     121        for nested scrolling
     122
     123        * Api/qwebframe.cpp:
     124        (webframe_scrollOverflow):
     125        (qtwebkit_webframe_scrollRecursively):
     126        * Api/qwebframe.h:
     127        * Api/qwebframe_p.h:
     128        * tests/qwebframe/tst_qwebframe.cpp:
     129
     1302009-12-18  Joe Ligman  <joseph.ligman@nokia.com>
     131
     132        Reviewed by Kenneth Rohde Christiansen.
     133
     134        [Qt] Add new API to QWebFrame to scrollRecursively starting with any css overflow
     135        then checking current frame and then ancestors
     136        https://bugs.webkit.org/show_bug.cgi?id=32668
     137
     138        * Api/qwebframe.cpp:
     139        (QWebFramePrivate::scrollOverflow):
     140        (QWebFrame::scrollRecursively):
     141        * Api/qwebframe.h:
     142        * Api/qwebframe_p.h:
     143        * tests/qwebframe/qwebframe.qrc:
     144        * tests/qwebframe/testiframe.html: Added.
     145        * tests/qwebframe/testiframe2.html: Added.
     146        * tests/qwebframe/tst_qwebframe.cpp:
     147
     1482010-03-21  Kristian Amlie  <kristian.amlie@nokia.com>
     149
     150        Reviewed by Simon Hausmann.
     151
     152        Fixed updating the VKB display when inputting into QGraphicsWebView.
     153        https://bugs.webkit.org/show_bug.cgi?id=36292
     154
     155        * Api/qgraphicswebview.cpp:
     156        (QGraphicsWebViewPrivate::_q_updateMicroFocus):
     157        (QGraphicsWebView::setPage):
     158        * Api/qgraphicswebview.h:
     159
     1602010-03-04  Simon Hausmann  <simon.hausmann@nokia.com>
     161
     162        Reviewed by Kenneth Rohde Christiansen.
     163
     164        [Qt] qwebelement.h does not include QtCore headers correctly
     165        https://bugs.webkit.org/show_bug.cgi?id=35748
     166
     167        The header files of QtCore must be included as QtCore/foo.h.
     168
     169        See also http://bugreports.qt.nokia.com/browse/QTBUG-8661
     170
     171        * Api/qwebelement.h:
     172
    11732010-01-28  Kenneth Rohde Christiansen  <kenneth@webkit.org>
    2174

  • trunk/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/EditorClientQt.cpp

    r757 r769  
    616616        }
    617617        webPageClient->setInputMethodHint(Qt::ImhHiddenText, isPasswordField);
    618 #ifdef Q_WS_MAEMO_5
    619         // Maemo 5 MicroB Browser disables auto-uppercase and predictive text, thus, so do we.
     618#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
     619        // disables auto-uppercase and predictive text for mobile devices
    620620        webPageClient->setInputMethodHint(Qt::ImhNoAutoUppercase, true);
    621621        webPageClient->setInputMethodHint(Qt::ImhNoPredictiveText, true);
    622 #endif // Q_WS_MAEMO_5
     622#endif // Q_WS_MAEMO_5 || Q_OS_SYMBIAN
    623623#endif // QT_VERSION check
    624624        webPageClient->setInputMethodEnabled(active);

  • trunk/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def

    r561 r769  
    624624        ?qt_resumeActiveDOMObjects@@YAXPAVQWebFrame@@@Z @ 623 NONAME ; void qt_resumeActiveDOMObjects(class QWebFrame *)
    625625        ?qt_suspendActiveDOMObjects@@YAXPAVQWebFrame@@@Z @ 624 NONAME ; void qt_suspendActiveDOMObjects(class QWebFrame *)
    626         ?qtwebkit_webframe_scrollRecursively@@YA_NPAVQWebFrame@@HH@Z @ 625 NONAME ; bool qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int)
     626        ?qtwebkit_webframe_scrollRecursively@@YA_NPAVQWebFrame@@HH@Z @ 625 NONAME ABSENT ; bool qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int)
     627        ?closeEvent@QWebInspector@@MAEXPAVQCloseEvent@@@Z @ 626 NONAME ABSENT ; void QWebInspector::closeEvent(class QCloseEvent *)
     628        ?inspectorUrl@QWebSettings@@QBE?AVQUrl@@XZ @ 627 NONAME ABSENT ; class QUrl QWebSettings::inspectorUrl(void) const
     629        ?isTiledBackingStoreFrozen@QGraphicsWebView@@QBE_NXZ @ 628 NONAME ABSENT ; bool QGraphicsWebView::isTiledBackingStoreFrozen(void) const
     630        ?pageChanged@QWebFrame@@IAEXXZ @ 629 NONAME ABSENT ; void QWebFrame::pageChanged(void)
     631        ?qt_drt_enableCaretBrowsing@@YAXPAVQWebPage@@_N@Z @ 630 NONAME ABSENT ; void qt_drt_enableCaretBrowsing(class QWebPage *, bool)
     632        ?qt_drt_evaluateScriptInIsolatedWorld@@YAXPAVQWebFrame@@HABVQString@@@Z @ 631 NONAME ABSENT ; void qt_drt_evaluateScriptInIsolatedWorld(class QWebFrame *, int, class QString const &)
     633        ?qt_drt_hasDocumentElement@@YA_NPAVQWebFrame@@@Z @ 632 NONAME ABSENT ; bool qt_drt_hasDocumentElement(class QWebFrame *)
     634        ?qt_drt_numberOfPages@@YAHPAVQWebFrame@@MM@Z @ 633 NONAME ABSENT ; int qt_drt_numberOfPages(class QWebFrame *, float, float)
     635        ?qt_drt_pageNumberForElementById@@YAHPAVQWebFrame@@ABVQString@@MM@Z @ 634 NONAME ABSENT ; int qt_drt_pageNumberForElementById(class QWebFrame *, class QString const &, float, float)
     636        ?qt_drt_pauseSVGAnimation@@YA_NPAVQWebFrame@@ABVQString@@N1@Z @ 635 NONAME ABSENT ; bool qt_drt_pauseSVGAnimation(class QWebFrame *, class QString const &, double, class QString const &)
     637        ?qt_drt_setDomainRelaxationForbiddenForURLScheme@@YAX_NABVQString@@@Z @ 636 NONAME ABSENT ; void qt_drt_setDomainRelaxationForbiddenForURLScheme(bool, class QString const &)
     638        ?qt_drt_setFrameFlatteningEnabled@@YAXPAVQWebPage@@_N@Z @ 637 NONAME ABSENT ; void qt_drt_setFrameFlatteningEnabled(class QWebPage *, bool)
     639        ?qt_drt_setMediaType@@YAXPAVQWebFrame@@ABVQString@@@Z @ 638 NONAME ABSENT ; void qt_drt_setMediaType(class QWebFrame *, class QString const &)
     640        ?qt_drt_setTimelineProfilingEnabled@@YAXPAVQWebPage@@_N@Z @ 639 NONAME ABSENT ; void qt_drt_setTimelineProfilingEnabled(class QWebPage *, bool)
     641        ?qt_drt_webinspector_close@@YAXPAVQWebPage@@@Z @ 640 NONAME ABSENT ; void qt_drt_webinspector_close(class QWebPage *)
     642        ?qt_drt_webinspector_executeScript@@YAXPAVQWebPage@@JABVQString@@@Z @ 641 NONAME ABSENT ; void qt_drt_webinspector_executeScript(class QWebPage *, long, class QString const &)
     643        ?qt_drt_webinspector_show@@YAXPAVQWebPage@@@Z @ 642 NONAME ABSENT ; void qt_drt_webinspector_show(class QWebPage *)
     644        ?qt_drt_workerThreadCount@@YAHXZ @ 643 NONAME ABSENT ; int qt_drt_workerThreadCount(void)
     645        ?qt_wrt_setViewMode@@YAXPAVQWebPage@@ABVQString@@@Z @ 644 NONAME ABSENT ; void qt_wrt_setViewMode(class QWebPage *, class QString const &)
     646        ?qtwebkit_webframe_scrollRecursively@@YAXPAVQWebFrame@@HHABVQPoint@@@Z @ 645 NONAME ; void qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int, class QPoint const &)
     647        ?resizesToContents@QGraphicsWebView@@QBE_NXZ @ 646 NONAME ABSENT ; bool QGraphicsWebView::resizesToContents(void) const
     648        ?scrollToAnchor@QWebFrame@@QAEXABVQString@@@Z @ 647 NONAME ABSENT ; void QWebFrame::scrollToAnchor(class QString const &)
     649        ?setInspectorUrl@QWebSettings@@QAEXABVQUrl@@@Z @ 648 NONAME ABSENT ; void QWebSettings::setInspectorUrl(class QUrl const &)
     650        ?setResizesToContents@QGraphicsWebView@@QAEX_N@Z @ 649 NONAME ABSENT ; void QGraphicsWebView::setResizesToContents(bool)
     651        ?setTiledBackingStoreFrozen@QGraphicsWebView@@QAEX_N@Z @ 650 NONAME ABSENT ; void QGraphicsWebView::setTiledBackingStoreFrozen(bool)
     652        ?qtwebkit_webframe_scrollOverflow@@YA_NPAVQWebFrame@@HHABVQPoint@@@Z @ 651 NONAME ABSENT ; bool qtwebkit_webframe_scrollOverflow(QWebFrame *, int, int, const QPoint&)
    627653

  • trunk/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def

    r561 r769  
    694694        _Z25qt_resumeActiveDOMObjectsP9QWebFrame @ 693 NONAME
    695695        _Z26qt_suspendActiveDOMObjectsP9QWebFrame @ 694 NONAME
    696         _Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameii @ 695 NONAME
    697 
     696        _Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameii @ 695 NONAME ABSENT
     697        _Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameiiRK6QPoint @ 696 NONAME
     698        _ZN9QWebFrame17scrollRecursivelyEii @ 697 NONAME ABSENT
     699        _ZN16QGraphicsWebView20setResizesToContentsEb @ 698 NONAME ABSENT
     700        _ZNK16QGraphicsWebView17resizesToContentsEv @ 699 NONAME ABSENT
     701        _Z20qt_drt_numberOfPagesP9QWebFrameff @ 700 NONAME ABSENT
     702        _Z24qt_drt_pauseSVGAnimationP9QWebFrameRK7QStringdS3_ @ 701 NONAME ABSENT
     703        _Z24qt_drt_webinspector_showP8QWebPage @ 702 NONAME ABSENT
     704        _Z24qt_drt_workerThreadCountv @ 703 NONAME ABSENT
     705        _Z25qt_drt_hasDocumentElementP9QWebFrame @ 704 NONAME ABSENT
     706        _Z25qt_drt_webinspector_closeP8QWebPage @ 705 NONAME ABSENT
     707        _Z31qt_drt_pageNumberForElementByIdP9QWebFrameRK7QStringff @ 706 NONAME ABSENT
     708        _Z33qt_drt_webinspector_executeScriptP8QWebPagelRK7QString @ 707 NONAME ABSENT
     709        _Z34qt_drt_setTimelineProfilingEnabledP8QWebPageb @ 708 NONAME ABSENT
     710        _Z32qt_drt_setFrameFlatteningEnabledP8QWebPageb @ 709 NONAME ABSENT
     711        _Z36qt_drt_evaluateScriptInIsolatedWorldP9QWebFrameiRK7QString @ 710 NONAME ABSENT
     712        _Z47qt_drt_setDomainRelaxationForbiddenForURLSchemebRK7QString @ 711 NONAME ABSENT
     713        _ZN9QWebFrame11pageChangedEv @ 712 NONAME ABSENT
     714        _ZN9QWebFrame14scrollToAnchorERK7QString @ 713 NONAME ABSENT
     715        _ZN12QWebSettings15setInspectorUrlERK4QUrl @ 714 NONAME ABSENT
     716        _ZN13QWebInspector10closeEventEP11QCloseEvent @ 715 NONAME ABSENT
     717        _ZN16QGraphicsWebView26setTiledBackingStoreFrozenEb @ 716 NONAME ABSENT
     718        _ZNK16QGraphicsWebView25isTiledBackingStoreFrozenEv @ 717 NONAME ABSENT
     719        _Z18qt_wrt_setViewModeP8QWebPageRK7QString @ 718 NONAME ABSENT
     720        _Z19qt_drt_setMediaTypeP9QWebFrameRK7QString @ 719 NONAME ABSENT
     721        _Z26qt_drt_enableCaretBrowsingP8QWebPageb @ 720 NONAME ABSENT
     722        _ZNK12QWebSettings12inspectorUrlEv @ 721 NONAME ABSENT
     723        _ZN23DumpRenderTreeSupportQt19webPageSetGroupNameEP8QWebPageRK7QString @ 722 NONAME ABSENT
     724        _ZN23DumpRenderTreeSupportQt16webPageGroupNameEP8QWebPage @ 723 NONAME ABSENT
     725        _ZN23DumpRenderTreeSupportQt23garbageCollectorCollectEv @ 724 NONAME ABSENT
     726        _Z32qtwebkit_webframe_scrollOverflowP9QWebFrameiiRK6QPoint @ 725 NONAME
     727        _ZN23DumpRenderTreeSupportQt12setMediaTypeEP9QWebFrameRK7QString @ 726 NONAME ABSENT
     728        _ZN23DumpRenderTreeSupportQt13numberOfPagesEP9QWebFrameff @ 727 NONAME ABSENT
     729        _ZN23DumpRenderTreeSupportQt13selectedRangeEP8QWebPage @ 728 NONAME ABSENT
     730        _ZN23DumpRenderTreeSupportQt14clearFrameNameEP9QWebFrame @ 729 NONAME ABSENT
     731        _ZN23DumpRenderTreeSupportQt14pauseAnimationEP9QWebFrameRK7QStringdS4_ @ 730 NONAME ABSENT
     732        _ZN23DumpRenderTreeSupportQt15dumpFrameLoaderEb @ 731 NONAME ABSENT
     733        _ZN23DumpRenderTreeSupportQt16dumpNotificationEb @ 732 NONAME ABSENT
     734        _ZN23DumpRenderTreeSupportQt16isCommandEnabledEP8QWebPageRK7QString @ 733 NONAME ABSENT
     735        _ZN23DumpRenderTreeSupportQt16webInspectorShowEP8QWebPage @ 734 NONAME ABSENT
     736        _ZN23DumpRenderTreeSupportQt17pauseSVGAnimationEP9QWebFrameRK7QStringdS4_ @ 735 NONAME ABSENT
     737        _ZN23DumpRenderTreeSupportQt17webInspectorCloseEP8QWebPage @ 736 NONAME ABSENT
     738        _ZN23DumpRenderTreeSupportQt17workerThreadCountEv @ 737 NONAME ABSENT
     739        _ZN23DumpRenderTreeSupportQt18hasDocumentElementEP9QWebFrame @ 738 NONAME ABSENT
     740        _ZN23DumpRenderTreeSupportQt20dumpEditingCallbacksEb @ 739 NONAME ABSENT
     741        _ZN23DumpRenderTreeSupportQt21markerTextForListItemERK11QWebElement @ 740 NONAME ABSENT
     742        _ZN23DumpRenderTreeSupportQt22javaScriptObjectsCountEv @ 741 NONAME ABSENT
     743        _ZN23DumpRenderTreeSupportQt23setCaretBrowsingEnabledEP8QWebPageb @ 742 NONAME ABSENT
     744        _ZN23DumpRenderTreeSupportQt24executeCoreCommandByNameEP8QWebPageRK7QStringS4_ @ 743 NONAME ABSENT
     745        _ZN23DumpRenderTreeSupportQt21dumpSetAcceptsEditingEb @744 NONAME ABSENT
     746        _ZN23DumpRenderTreeSupportQt22resumeActiveDOMObjectsEP9QWebFrame @745 NONAME ABSENT
     747        _ZN23DumpRenderTreeSupportQt23suspendActiveDOMObjectsEP9QWebFrame @746 NONAME ABSENT
     748        _ZN23DumpRenderTreeSupportQt24numberOfActiveAnimationsEP9QWebFrame @747 NONAME ABSENT
     749        _ZN23DumpRenderTreeSupportQt24pageNumberForElementByIdEP9QWebFrameRK7QStringff @748 NONAME ABSENT
     750        _ZN23DumpRenderTreeSupportQt25dumpResourceLoadCallbacksEb @749 NONAME ABSENT
     751        _ZN23DumpRenderTreeSupportQt25pauseTransitionOfPropertyEP9QWebFrameRK7QStringdS4_ @750 NONAME ABSENT
     752        _ZN23DumpRenderTreeSupportQt25setFrameFlatteningEnabledEP8QWebPageb @751 NONAME ABSENT
     753        _ZN23DumpRenderTreeSupportQt25webInspectorExecuteScriptEP8QWebPagelRK7QString @752 NONAME ABSENT
     754        _ZN23DumpRenderTreeSupportQt25whiteListAccessFromOriginERK7QStringS2_S2_b @753 NONAME ABSENT
     755        _ZN23DumpRenderTreeSupportQt26counterValueForElementByIdEP9QWebFrameRK7QString @754 NONAME ABSENT
     756        _ZN23DumpRenderTreeSupportQt26firstRectForCharacterRangeEP8QWebPageii @755 NONAME ABSENT
     757        _ZN23DumpRenderTreeSupportQt26overwritePluginDirectoriesEv @756 NONAME ABSENT
     758        _ZN23DumpRenderTreeSupportQt27resetOriginAccessWhiteListsEv @757 NONAME ABSENT
     759        _ZN23DumpRenderTreeSupportQt27setSmartInsertDeleteEnabledEP8QWebPageb @758 NONAME ABSENT
     760        _ZN23DumpRenderTreeSupportQt27setTimelineProfilingEnabledEP8QWebPageb @759 NONAME ABSENT
     761        _ZN23DumpRenderTreeSupportQt28setDumpRenderTreeModeEnabledEb @760 NONAME ABSENT
     762        _ZN23DumpRenderTreeSupportQt29dumpResourceLoadCallbacksPathERK7QString @761 NONAME ABSENT
     763        _ZN23DumpRenderTreeSupportQt29evaluateScriptInIsolatedWorldEP9QWebFrameiRK7QString @762 NONAME ABSENT
     764        _ZN23DumpRenderTreeSupportQt29setJavaScriptProfilingEnabledEP9QWebFrameb @763 NONAME ABSENT
     765        _ZN23DumpRenderTreeSupportQt29setWillSendRequestReturnsNullEb @764 NONAME ABSENT
     766        _ZN23DumpRenderTreeSupportQt30setWillSendRequestClearHeadersERK11QStringList @765 NONAME ABSENT
     767        _ZN23DumpRenderTreeSupportQt33computedStyleIncludingVisitedInfoERK11QWebElement @766 NONAME ABSENT
     768        _ZN23DumpRenderTreeSupportQt34setSelectTrailingWhitespaceEnabledEP8QWebPageb @767 NONAME ABSENT
     769        _ZN23DumpRenderTreeSupportQt39elementDoesAutoCompleteForElementWithIdEP9QWebFrameRK7QString @768 NONAME ABSENT
     770        _ZN23DumpRenderTreeSupportQt39setWillSendRequestReturnsNullOnRedirectEb @769 NONAME ABSENT
     771        _ZN23DumpRenderTreeSupportQt40garbageCollectorCollectOnAlternateThreadEb @770 NONAME ABSENT
     772        _ZN23DumpRenderTreeSupportQt40setDomainRelaxationForbiddenForURLSchemeEbRK7QString @771 NONAME ABSENT

  • trunk/src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp

    r561 r769  
    2020#include <QtTest/QtTest>
    2121
     22#include <qwebelement.h>
    2223#include <qwebframe.h>
    2324#include <qwebview.h>
    … …  
    6061    void paint_data();
    6162    void paint();
     63    void textAreas();
    6264
    6365private:
    … …  
    106108}
    107109
     110void tst_Painting::textAreas()
     111{
     112    m_view->load(QUrl("data:text/html;<html><body></body></html>"));
     113    ::waitForSignal(m_view, SIGNAL(loadFinished(bool)));
     114
     115    QWebElement bodyElement = m_page->mainFrame()->findFirstElement("body");
     116
     117    int count = 100;
     118    while (count--) {
     119        QString markup("<textarea cols='1' rows='1'></textarea>");
     120        bodyElement.appendInside(markup);
     121    }
     122
     123    /* force a layout */
     124    QWebFrame* mainFrame = m_page->mainFrame();
     125    mainFrame->toPlainText();
     126
     127    QPixmap pixmap(mainFrame->contentsSize());
     128    QBENCHMARK {
     129        QPainter painter(&pixmap);
     130        mainFrame->render(&painter, QRect(QPoint(0, 0), mainFrame->contentsSize()));
     131        painter.end();
     132    }
     133}
     134
    108135QTEST_MAIN(tst_Painting)
    109136#include "tst_painting.moc"

  • trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp

    r561 r769  
    607607    void evaluateWillCauseRepaint();
    608608    void qObjectWrapperWithSameIdentity();
    609     void scrollRecursively();
    610609
    611610private:
    … …  
    28262825}
    28272826
    2828 bool QWEBKIT_EXPORT qtwebkit_webframe_scrollRecursively(QWebFrame* qFrame, int dx, int dy);
    2829 
    2830 void tst_QWebFrame::scrollRecursively()
    2831 {
    2832     // The test content is
    2833     // a nested frame set
    2834     // The main frame scrolls
    2835     // and has two children
    2836     // an iframe and a div overflow
    2837     // both scroll
    2838     QWebView webView;
    2839     QWebPage* webPage = webView.page();
    2840     QSignalSpy loadSpy(webPage, SIGNAL(loadFinished(bool)));
    2841     QUrl url = QUrl("qrc:///testiframe.html");
    2842     webPage->mainFrame()->load(url);
    2843     QTRY_COMPARE(loadSpy.count(), 1);
    2844 
    2845     QList<QWebFrame*> children =  webPage->mainFrame()->childFrames();
    2846     QVERIFY(children.count() == 1);
    2847 
    2848     // 1st test
    2849     // call scrollRecursively over mainframe
    2850     // verify scrolled
    2851     // verify scroll postion changed
    2852     QPoint scrollPosition(webPage->mainFrame()->scrollPosition());
    2853     QVERIFY(qtwebkit_webframe_scrollRecursively(webPage->mainFrame(), 10, 10));
    2854     QVERIFY(scrollPosition != webPage->mainFrame()->scrollPosition());
    2855 
    2856     // 2nd test
    2857     // call scrollRecursively over child iframe
    2858     // verify scrolled
    2859     // verify child scroll position changed
    2860     // verify parent's scroll position did not change
    2861     scrollPosition = webPage->mainFrame()->scrollPosition();
    2862     QPoint childScrollPosition = children.at(0)->scrollPosition();
    2863     QVERIFY(qtwebkit_webframe_scrollRecursively(children.at(0), 10, 10));
    2864     QVERIFY(scrollPosition == webPage->mainFrame()->scrollPosition());
    2865     QVERIFY(childScrollPosition != children.at(0)->scrollPosition());
    2866 
    2867     // 3rd test
    2868     // call scrollRecursively over div overflow
    2869     // verify scrolled == true
    2870     // verify parent and child frame's scroll postion did not change
    2871     QWebElement div = webPage->mainFrame()->documentElement().findFirst("#content1");
    2872     QMouseEvent evpres(QEvent::MouseMove, div.geometry().center(), Qt::NoButton, Qt::NoButton, Qt::NoModifier);
    2873     webPage->event(&evpres);
    2874     scrollPosition = webPage->mainFrame()->scrollPosition();
    2875     childScrollPosition = children.at(0)->scrollPosition();
    2876     QVERIFY(qtwebkit_webframe_scrollRecursively(webPage->mainFrame(), 5, 5));
    2877     QVERIFY(childScrollPosition == children.at(0)->scrollPosition());
    2878     QVERIFY(scrollPosition == webPage->mainFrame()->scrollPosition());
    2879 
    2880     // 4th test
    2881     // call scrollRecursively twice over childs iframe
    2882     // verify scrolled == true first time
    2883     // verify parent's scroll == true second time
    2884     // verify parent and childs scroll position changed
    2885     childScrollPosition = children.at(0)->scrollPosition();
    2886     QVERIFY(qtwebkit_webframe_scrollRecursively(children.at(0), -10, -10));
    2887     QVERIFY(childScrollPosition != children.at(0)->scrollPosition());
    2888     scrollPosition = webPage->mainFrame()->scrollPosition();
    2889     QVERIFY(qtwebkit_webframe_scrollRecursively(children.at(0), -10, -10));
    2890     QVERIFY(scrollPosition != webPage->mainFrame()->scrollPosition());
    2891 
    2892 }
    2893 
    28942827QTEST_MAIN(tst_QWebFrame)
    28952828#include "tst_qwebframe.moc"

  • trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

    r651 r769  
    14521452    QString selectionValue = variant.value<QString>();
    14531453    QCOMPARE(selectionValue, QString("eb"));
     1454
     1455    //Set selection with negative length
     1456    inputAttributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 6, -5, QVariant());
     1457    QInputMethodEvent eventSelection2("",inputAttributes);
     1458    page->event(&eventSelection2);
     1459
     1460    //ImAnchorPosition
     1461    variant = page->inputMethodQuery(Qt::ImAnchorPosition);
     1462    anchorPosition =  variant.toInt();
     1463    QCOMPARE(anchorPosition, 1);
     1464
     1465    //ImCursorPosition
     1466    variant = page->inputMethodQuery(Qt::ImCursorPosition);
     1467    cursorPosition =  variant.toInt();
     1468    QCOMPARE(cursorPosition, 6);
     1469
     1470    //ImCurrentSelection
     1471    variant = page->inputMethodQuery(Qt::ImCurrentSelection);
     1472    selectionValue = variant.value<QString>();
     1473    QCOMPARE(selectionValue, QString("tWebK"));
    14541474#endif
    14551475
Note: See TracChangeset for help on using the changeset viewer.