Changeset 846 for trunk/src/3rdparty/webkit/WebKit

trunk

Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845
/branches/vendor/nokia/qt/current merged: 844
/branches/vendor/nokia/qt/4.6.3 removed

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

-              r561
+              r846
+-06-18  Alexis Menard  <alexis.menard@nokia.com>
+        Reviewed by Simon Hausmann.
+        [qt] Better check for the declarative plugin inclusion.
+        * WebKit.pro:
+-03-22  Kevin Decker  <kdecker@apple.com>
+        Reviewed by Simon Fraser.
+        https://bugs.webkit.org/show_bug.cgi?id=36328
+        * WebKit.xcodeproj/project.pbxproj: Remove WebNullPluginView and nullplugin.tiff from the project.
+-03-22  Darin Adler  <darin@apple.com>
+        * StringsNotToBeLocalized.txt: Updated for recent changes.
+-03-22  Kevin Decker  <kdecker@apple.com>
+        Reviewed by John Sullivan.
+        https://bugs.webkit.org/show_bug.cgi?id=36328
+        * English.lproj/Localizable.strings: Added "Missing Plug-in" string.
+-03-18  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add EFL port files to efl/ewk.
+        http://webkit.org/b/35931
+        * efl/ewk/ewk_settings.cpp: Added.
+        * efl/ewk/ewk_settings.h: Added.
+-03-17  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add default theme files to efl/DefaultTheme.
+        http://webkit.org/b/36240
+        * efl/DefaultTheme/widget/radio/img_radio_on.png: Added.
+        * efl/DefaultTheme/radio/img_radio_off_hover.png: Added.
+        * efl/DefaultTheme/radio/img_radio_on_hover.png: Added.
+        * efl/DefaultTheme/radio/img_radio_off.png: Added.
+        * efl/DefaultTheme/radio/img_radio_off_focus.png: Added.
+        * efl/DefaultTheme/radio/img_radio_on_focus.png: Added.
+        * efl/DefaultTheme/combo/combo_normal.png: Added.
+        * efl/DefaultTheme/combo/combo_focus_button.png: Added.
+        * efl/DefaultTheme/combo/combo_hover_button.png: Added.
+        * efl/DefaultTheme/combo/combo_hover.png: Added.
+        * efl/DefaultTheme/combo/combo_focus.png: Added.
+        * efl/DefaultTheme/combo/combo_press_button.png: Added.
+        * efl/DefaultTheme/combo/combo_normal_button.png: Added.
+        * efl/DefaultTheme/combo/combo_press.png: Added.
+        * efl/DefaultTheme/combo/icon.png: Added.
+        * efl/DefaultTheme/file/file_normal.png: Added.
+        * efl/DefaultTheme/file/file_press.png: Added.
+        * efl/DefaultTheme/file/file_hover.png: Added.
+        * efl/DefaultTheme/file/file_focus.png: Added.
+        * efl/DefaultTheme/search/cancel/cancel_normal_button.png: Added.
+        * efl/DefaultTheme/search/cancel/cancel_normal_button2.png: Added.
+        * efl/DefaultTheme/search/decoration/decoration_normal_button.png: Added.
+        * efl/DefaultTheme/search/field/field_focused.png: Added.
+        * efl/DefaultTheme/search/field/field_normal.png: Added.
+        * efl/DefaultTheme/search/field/field_hovered.png: Added.
+        * efl/DefaultTheme/entry/img_normal.png: Added.
+        * efl/DefaultTheme/entry/img_hovered.png: Added.
+        * efl/DefaultTheme/entry/img_focused.png: Added.
+        * efl/DefaultTheme/check/img_check_off_hover.png: Added.
+        * efl/DefaultTheme/check/img_check_on.png: Added.
+        * efl/DefaultTheme/check/img_check_off_focus.png: Added.
+        * efl/DefaultTheme/check/img_check_on_focus.png: Added.
+        * efl/DefaultTheme/check/img_check_off.png: Added.
+        * efl/DefaultTheme/check/img_check_on_hover.png: Added.
+        * efl/DefaultTheme/scrollbar/scrollbar_knob_h.png: Added.
+        * efl/DefaultTheme/scrollbar/scrollbar_knob_v.png: Added.
+        * efl/DefaultTheme/scrollbar/scrollbar_hilight.png: Added.
+        * efl/DefaultTheme/scrollbar/scrollbar_v.png: Added.
+        * efl/DefaultTheme/scrollbar/scrollbar_h.png: Added.
+        * efl/DefaultTheme/button/img_button_normal.png: Added.
+        * efl/DefaultTheme/button/img_button_focus.png: Added.
+        * efl/DefaultTheme/button/img_button_hover.png: Added.
+        * efl/DefaultTheme/button/img_button_press.png: Added.
+-03-17  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add EFL example browser to efl/EWebLauncher.
+        http://webkit.org/b/36176
+        * efl/EWebLauncher/main.c: Added.
+-03-16  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add EFL port files to efl/WebCoreSupport.
+        http://webkit.org/b/35916
+        * efl/WebCoreSupport/ContextMenuClientEfl.cpp: Added.
+        * efl/WebCoreSupport/ContextMenuClientEfl.h: Added.
+-03-16  Yury Semikhatsky  <yurys@chromium.org>
+        Reviewed by Pavel Feldman.
+        Introduce InspectorFrontendClient that provides InspectorFrontend with an interface to the embedder. InspectorClient now serves as a delegate for InspectorController and does not contain methods for managing inspector frontend window. That allows to create remote InspectorFrontendHost.
+        Introduce InspectorFrontendClient that would provide InspectorFrontend with an interface to the embedder
+        https://bugs.webkit.org/show_bug.cgi?id=35036
+        * efl/WebCoreSupport/InspectorClientEfl.cpp:
+        (WebCore::InspectorClientEfl::openInspectorFrontend):
+        * efl/WebCoreSupport/InspectorClientEfl.h:
+-03-13  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add EFL port files to efl/ewk.
+        http://webkit.org/b/35925
+        * efl/ewk/ewk_history.cpp: Added.
+        * efl/ewk/ewk_history.h: Added.
+-03-13  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add EFL port files to efl/ewk.
+        http://webkit.org/b/35928
+        * efl/ewk/ewk_main.cpp: Added.
+        * efl/ewk/ewk_main.h: Added.
+-03-13  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add EFL port files to efl/ewk.
+        http://webkit.org/b/35924
+        * efl/ewk/ewk_frame.cpp: Added.
+        * efl/ewk/ewk_frame.h: Added.
+-03-13  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add EFL port files to efl/ewk.
+        http://webkit.org/b/35936
+        * efl/ewk/ewk_view_single.c: Added.
+-03-13  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add EFL port files to efl/ewk.
+        http://webkit.org/b/35929
+        * efl/ewk/ewk_util.cpp: Added.
+        * efl/ewk/ewk_util.h: Added.
+-03-13  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add EFL port files to efl/ewk.
+        http://webkit.org/b/35934
+        * efl/ewk/EWebKit.h: Added.
+        * efl/ewk/ewk_eapi.h: Added.
+        * efl/ewk/ewk_logging.h: Added.
+        * efl/ewk/ewk_private.h: Added.
+-03-11  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Gustavo Noronha Silva.
+        Add EFL port files to efl/WebCoreSupport.
+        http://webkit.org/b/35917
+        * efl/WebCoreSupport/InspectorClientEfl.h: Added.
+        * efl/WebCoreSupport/InspectorClientEfl.cpp: Added.
+-03-11  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Gustavo Noronha Silva.
+        Add EFL port files to efl/WebCoreSupport.
+        http://webkit.org/b/35914
+        * efl/WebCoreSupport/DragClientEfl.h: Added.
+        * efl/WebCoreSupport/DragClientEfl.cpp: Added.
+-03-11  Simon Fraser  <simon.fraser@apple.com>
+        Reviewed by Mark Rowe.
+        Sort the project file.
+        * WebKit.xcodeproj/project.pbxproj:
+-03-10  Leandro Pereira  <leandro@profusion.mobi>
+        Reviewed by Holger Freyther.
+        Add EFL port files to efl/WebCoreSupport.
+        http://webkit.org/b/35913
+        * efl/WebCoreSupport/ChromeClientEfl.cpp: Added.
+        * efl/WebCoreSupport/ChromeClientEfl.h: Added.
+-03-09  John Sullivan  <sullivan@apple.com>
+        Fixed localized string key collision. update-webkit-localized-strings now
+        runs without errors.
+        Reviewed by Adam Roben.
+        * English.lproj/Localizable.strings:
+        Regenerated.
+-03-09  John Sullivan  <sullivan@apple.com>
+        * StringsNotToBeLocalized.txt:
+        Brought this file up to date. update-webkit-localizable-strings still lists
+        one key collision, but that's a separate issue.
+-03-04  Mark Rowe  <mrowe@apple.com>
+        Reviewed by Sam Weinig.
+        Add a script to verify that WebKit framework headers are internally consistent.
+        * WebKit.xcodeproj/project.pbxproj: Run the script during the build and fail with
+        an error should the consistency check fail.
+-02-25  Alexey Proskuryakov  <ap@apple.com>
+        Reviewed by Geoffrey Garen.
+        https://bugs.webkit.org/show_bug.cgi?id=35394
+        <rdar://problem/7685262> Make passing objects between Java and plug-ins work
+        * WebKit.xcodeproj/project.pbxproj: Added new files.
+-02-04  Mark Rowe  <mrowe@apple.com>
+        Reviewed by Timothy Hatcher.
+        Build fix.  Remove a symbol corresponding to an inline function from the linker export
+        file to prevent a weak external failure.
+        * WebKit.xcodeproj/project.pbxproj: Accommodate rename of script.
+-02-04  John Sullivan  <sullivan@apple.com>
+        https://bugs.webkit.org/show_bug.cgi?id=34611
+        WebLocalizedString() could use an assertion that it is being called on the main thread
+        Reviewed by Tim Hatcher.
+        * WebKit.xcodeproj/project.pbxproj:
+        Updated for renamed file (WebLocalizableStrings.m -> WebLocalizableStrings.mm)
+-01-29  Mark Rowe  <mrowe@apple.com>
+        Sort Xcode projects.
+        * WebKit.xcodeproj/project.pbxproj:
+-01-19  Dan Bernstein  <mitz@apple.com>
+        Redo DumpRenderTree build fix without making WebTypesInternal.h a private header
+        * WebKit.xcodeproj/project.pbxproj:
+-01-19  Simon Fraser  <simon.fraser@apple.com>
+        Build fix, no review.
+        Fix build of DumpRenderTree by making the header WebTypesInternal.h Private
+        in WebKit.
+        * WebKit.xcodeproj/project.pbxproj:
+-01-19  Jon Honeycutt  <jhoneycutt@apple.com>
+        MSAA: The child <option> elements of a non-multiple <select> are not
+        exposed
+        https://bugs.webkit.org/show_bug.cgi?id=33773
+        <rdar://problem/7550556>
+        Reviewed by Alice Liu.
+        * English.lproj/Localizable.strings:
+        Add new localized strings.
+-01-13  Kevin Decker  <kdecker@apple.com>
+        Reviewed by Mark Rowe.
+        https://bugs.webkit.org/show_bug.cgi?id=33610
+        <rdar://problem/7288546> Silverlight full screen performance problem seen on Snow Leopard.
+         * WebKit.xcodeproj/project.pbxproj: Link the project against OpenGL.
+-12-25  Darin Adler  <darin@apple.com>
+        * StringsNotToBeLocalized.txt: Updated for recent changes.
+-12-18  Dan Bernstein  <mitz@apple.com>
+        Updated localizable strings after r52368
+        * English.lproj/Localizable.strings:
+-12-18  Sam Weinig  <sam@webkit.org>
+        Reviewed by Dan Bernstein.
+        Add Mac WebKit side of the client based geolocation provider.
+        * WebKit.xcodeproj/project.pbxproj:
+-12-16  Mark Rowe  <mrowe@apple.com>
+        Build fix.  Disable debug variants of WebKit frameworks.
+        * WebKit.xcodeproj/project.pbxproj:
+-12-16  John Sullivan  <sullivan@apple.com>
+        Brought this file up to date, sans review.
+        * StringsNotToBeLocalized.txt:
+-11-30  Mark Rowe  <mrowe@apple.com>
+        Use the correct path to Info.plist to avoid creating an empty file at the top of the WebKit directory.
+        * WebKit.xcodeproj/project.pbxproj:
+-11-24  Dmitry Titov  <dimich@chromium.org>
+        Reviewed by Eric Seidel.
+        Add ENABLE_SHARED_SCRIPT feature define and flag for build-webkit
+        https://bugs.webkit.org/show_bug.cgi?id=31444
+        * chromium/features.gypi:
+-11-24  Mark Rowe  <mrowe@apple.com>
+        Fix production builds where the source tree may be read-only.
+        * WebKit.xcodeproj/project.pbxproj:
+-11-20  Dave Hyatt  <hyatt@apple.com>
+        Reviewed by Oliver Hunt and Jon Honeycutt.
+        Add support for WebSerializedJSValue to WebKit.  This object wraps the SerializedScriptValue functionality in WebCore
+        and exposes the ability to do JS value serialization/deserialization to WebKit clients.
+        * WebKit.xcodeproj/project.pbxproj:
+-11-20  Chris Fleizach  <cfleizach@apple.com>
+        Reviewed by Beth Dakin.
+        WAI-ARIA: add support for 'math' role
+        https://bugs.webkit.org/show_bug.cgi?id=31706
+        * English.lproj/Localizable.strings:
+        * StringsNotToBeLocalized.txt:
+-11-19  Eric Carlson  <eric.carlson@apple.com>
+        Reviewed by Dan Bernstein.
+        <rdar://problem/7035231>
+        Support closed caption in <video> element
+        * English.lproj/Localizable.strings:
+            Add strings for toggle captions button.
+-11-18  Michelangelo De Simone  <micdesim@gmail.com>
+        Reviewed by Darin Adler.
+        Fix for <https://bugs.webkit.org/show_bug.cgi?id=27959>.
+        Support for validationMessage attribute, as per HTML5 specs.
+        * English.lproj/Localizable.strings: new localizable strings
+-11-18  Sam Weinig  <sam@webkit.org>
+        Reviewed by Anders Carlsson.
+        Make the Mac Geolocation API async.
+        * WebKit.xcodeproj/project.pbxproj: Remove WebGeolocation.
+-11-13  Adam Roben  <aroben@apple.com>
+        Add WebFrameLoadDelegatePrivat.h to WebKit.xcodeproj
+        Fixes <http://webkit.org/b/31124> Tell the WebFrameLoadDelegate when
+        window objects in isolated worlds are cleared
+        Reviewed by Dave Hyatt.
+        * WebKit.xcodeproj/project.pbxproj: Added
+        WebFrameLoadDelegatePrivate.h, which already existed.
+-11-12  Adam Roben  <aroben@apple.com>
+        Replace worldIDs with world objects
+        Part of <http://webkit.org/b/31414> Implement new SPI for dealing with
+        user scripts/stylesheets and isolated worlds
+        Reviewed by Sam Weinig.
+        * WebKit.xcodeproj/project.pbxproj: Added WebScriptWorld to the project.
+-11-12  Chris Fleizach  <cfleizach@apple.com>
+        Reviewed by Darin Adler.
+        ARIA: add alert type roles
+        https://bugs.webkit.org/show_bug.cgi?id=31392
+        * English.lproj/Localizable.strings:
+        * StringsNotToBeLocalized.txt:
+-11-02  Eric Carlson  <eric.carlson@apple.com>
+        Reviewed by John Sullivan and Mark Rowe.
+        <rdar://problem/7356733> Voiceover does not read correct media controller time values
+        Fix localized strings for media controller time values.
+        * English.lproj/Localizable.strings:
+-11-02  Chris Fleizach  <cfleizach@apple.com>
+        Reviewed by Beth Dakin.
+        Support ARIA "tab" roles
+        https://bugs.webkit.org/show_bug.cgi?id=30842
+        Add a localizable string for tab panel.
+        * English.lproj/Localizable.strings:
+        * StringsNotToBeLocalized.txt:
 -10-27  Dan Bernstein  <mitz@apple.com>

trunk/src/3rdparty/webkit/WebKit/mac/Configurations/Version.xcconfig

-              r561
+              r846
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 MAJOR_VERSION = 532;
 MINOR_VERSION = 4;
+MAJOR_VERSION = 533;
+MINOR_VERSION = 3;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 …
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(MAC_OS_X_VERSION_MAJOR));
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 SYSTEM_VERSION_PREFIX_ = 4; // Some Tiger versions of Xcode don't set MAC_OS_X_VERSION_MAJOR.
 SYSTEM_VERSION_PREFIX_1040 = 4;

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

-              r769
+              r846
 #include "qwebframe.h"
+#include "qwebframe_p.h"
 #include "qwebpage.h"
 #include "qwebpage_p.h"
 #include "QWebPageClient.h"
+#include <QtGui/QGraphicsScene>
+#include <QtGui/QGraphicsView>
+#include "FrameView.h"
+#include "GraphicsContext.h"
+#include "IntRect.h"
+#include "TiledBackingStore.h"
+#include <QtCore/qmetaobject.h>
+#include <QtCore/qsharedpointer.h>
+#include <QtCore/qtimer.h>
 #include <QtGui/qapplication.h>
+#include <QtGui/qgraphicsscene.h>
 #include <QtGui/qgraphicssceneevent.h>
+#include <QtGui/qgraphicsview.h>
+#include <QtGui/qpixmapcache.h>
+#include <QtGui/qscrollbar.h>
 #include <QtGui/qstyleoption.h>
 #include <QtGui/qinputcontext.h>
 …
 #include <QX11Info>
 #endif
+#include <Settings.h>
+// the overlay is here for one reason only: to have the scroll-bars and other
+// extra UI elements appear on top of any QGraphicsItems created by CSS compositing layers
+class QGraphicsWebViewOverlay : public QGraphicsItem {
+    public:
+    QGraphicsWebViewOverlay(QGraphicsWebView* view)
+            :QGraphicsItem(view)
+            , q(view)
+    {
+        setPos(0, 0);
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+        setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true);
+#endif
+        setCacheMode(QGraphicsItem::DeviceCoordinateCache);
+    }
+    QRectF boundingRect() const
+    {
+        return q->boundingRect();
+    }
+    void paint(QPainter* painter, const QStyleOptionGraphicsItem* options, QWidget*)
+    {
+        q->page()->mainFrame()->render(painter, static_cast<QWebFrame::RenderLayer>(QWebFrame::AllLayers&(~QWebFrame::ContentsLayer)), options->exposedRect.toRect());
+    }
+    friend class QGraphicsWebView;
+    QGraphicsWebView* q;
+};
 class QGraphicsWebViewPrivate : public QWebPageClient {
 …
         : q(parent)
         , page(0)
+    {}
+        , resizesToContents(false)
+#if USE(ACCELERATED_COMPOSITING)
+        , shouldSync(false)
+#endif
+    {
+#if USE(ACCELERATED_COMPOSITING)
+        // the overlay and stays alive for the lifetime of
+        // this QGraphicsWebView as the scrollbars are needed when there's no compositing
+        q->setFlag(QGraphicsItem::ItemUsesExtendedStyleOption);
+        syncMetaMethod = q->metaObject()->method(q->metaObject()->indexOfMethod("syncLayers()"));
+#endif
+    }
     virtual ~QGraphicsWebViewPrivate();
     virtual void scroll(int dx, int dy, const QRect&);
     virtual void update(const QRect& dirtyRect);
 …
     virtual int screenNumber() const;
     virtual QWidget* ownerWidget() const;
+    virtual QRect geometryRelativeToOwnerWidget() const;
     virtual QObject* pluginParent() const;
+    virtual QStyle* style() const;
+    virtual bool viewResizesToContentsEnabled() const { return resizesToContents; }
+#if USE(ACCELERATED_COMPOSITING)
+    virtual void setRootGraphicsLayer(QGraphicsItem* layer);
+    virtual void markForSync(bool scheduleSync);
+    void updateCompositingScrollPosition();
+    // QGraphicsWebView can render composited layers
+    virtual bool allowsAcceleratedCompositing() const { return true; }
+#endif
+    void updateResizesToContentsForPage();
+    virtual QRectF graphicsItemVisibleRect() const;
+#if ENABLE(TILED_BACKING_STORE)
+    void updateTiledBackingStoreScale();
+#endif
+    void createOrDeleteOverlay();
+    void syncLayers();
+    void unsetPageIfExists();
     void _q_doLoadFinished(bool success);
+    void _q_contentsSizeChanged(const QSize&);
+    void _q_scaleChanged();
     void _q_updateMicroFocus();
 …
     QGraphicsWebView* q;
     QWebPage* page;
+    bool resizesToContents;
+    // the overlay gets instantiated when the root layer is attached, and get deleted when it's detached
+    QSharedPointer<QGraphicsWebViewOverlay> overlay;
+    // we need to put the root graphics layer behind the overlay (which contains the scrollbar)
+    enum { RootGraphicsLayerZValue, OverlayZValue };
+#if USE(ACCELERATED_COMPOSITING)
+    QWeakPointer<QGraphicsObject> rootGraphicsLayer;
+    // we need to sync the layers if we get a special call from the WebCore
+    // compositor telling us to do so. We'll get that call from ChromeClientQt
+    bool shouldSync;
+    // we have to flush quite often, so we use a meta-method instead of QTimer::singleShot for putting the event in the queue
+    QMetaMethod syncMetaMethod;
+#endif
 };
 QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate()
+{
+#if USE(ACCELERATED_COMPOSITING)
+    if (!rootGraphicsLayer)
+        return;
+    // we don't need to delete the root graphics layer. The lifecycle is managed in GraphicsLayerQt.cpp.
+    rootGraphicsLayer.data()->setParentItem(0);
+    q->scene()->removeItem(rootGraphicsLayer.data());
+#endif
+}
+void QGraphicsWebViewPrivate::createOrDeleteOverlay()
+{
+    bool useOverlay = false;
+    if (!resizesToContents) {
+#if USE(ACCELERATED_COMPOSITING)
+        useOverlay = useOverlay || rootGraphicsLayer;
+#endif
+#if ENABLE(TILED_BACKING_STORE)
+        useOverlay = useOverlay || QWebFramePrivate::core(q->page()->mainFrame())->tiledBackingStore();
+#endif
+    }
+    if (useOverlay == !!overlay)
+        return;
+    if (useOverlay) {
+        overlay = QSharedPointer<QGraphicsWebViewOverlay>(new QGraphicsWebViewOverlay(q));
+        overlay->setZValue(OverlayZValue);
+    } else
+        overlay.clear();
+}
+#if USE(ACCELERATED_COMPOSITING)
+void QGraphicsWebViewPrivate::setRootGraphicsLayer(QGraphicsItem* layer)
+{
+    if (rootGraphicsLayer) {
+        rootGraphicsLayer.data()->setParentItem(0);
+        q->scene()->removeItem(rootGraphicsLayer.data());
+        QWebFramePrivate::core(q->page()->mainFrame())->view()->syncCompositingStateRecursive();
+    }
+    rootGraphicsLayer = layer ? layer->toGraphicsObject() : 0;
+    if (layer) {
+        layer->setFlag(QGraphicsItem::ItemClipsChildrenToShape, true);
+        layer->setParentItem(q);
+        layer->setZValue(RootGraphicsLayerZValue);
+        updateCompositingScrollPosition();
+    }
+    createOrDeleteOverlay();
+}
+void QGraphicsWebViewPrivate::markForSync(bool scheduleSync)
+{
+    shouldSync = true;
+    if (scheduleSync)
+        syncMetaMethod.invoke(q, Qt::QueuedConnection);
+}
+void QGraphicsWebViewPrivate::updateCompositingScrollPosition()
+{
+    if (rootGraphicsLayer && q->page() && q->page()->mainFrame()) {
+        const QPoint scrollPosition = q->page()->mainFrame()->scrollPosition();
+        rootGraphicsLayer.data()->setPos(-scrollPosition);
+    }
+}
+#endif
+void QGraphicsWebViewPrivate::syncLayers()
+{
+#if USE(ACCELERATED_COMPOSITING)
+    if (shouldSync) {
+        QWebFramePrivate::core(q->page()->mainFrame())->view()->syncCompositingStateRecursive();
+        shouldSync = false;
+    }
+#endif
+}
 …
+{
     q->scroll(qreal(dx), qreal(dy), QRectF(rectToScroll));
+#if USE(ACCELERATED_COMPOSITING)
+    updateCompositingScrollPosition();
+#endif
+}
 …
+{
     q->update(QRectF(dirtyRect));
+    createOrDeleteOverlay();
+    if (overlay)
+        overlay->update(QRectF(dirtyRect));
+#if USE(ACCELERATED_COMPOSITING)
+    updateCompositingScrollPosition();
+    syncLayers();
+#endif
+}
 …
+{
 #if defined(Q_WS_X11)
+    const QList<QGraphicsView*> views = q->scene()->views();
+    if (!views.isEmpty())
+        return views.at(0)->x11Info().screen();
+    if (QGraphicsScene* scene = q->scene()) {
+        const QList<QGraphicsView*> views = scene->views();
+        if (!views.isEmpty())
+            return views.at(0)->x11Info().screen();
+    }
 #endif
 …
 QWidget* QGraphicsWebViewPrivate::ownerWidget() const
+{
+    const QList<QGraphicsView*> views = q->scene()->views();
+    return views.value(0);
+    if (QGraphicsScene* scene = q->scene()) {
+        const QList<QGraphicsView*> views = scene->views();
+        return views.value(0);
+    }
+    return 0;
+}
+QRect QGraphicsWebViewPrivate::geometryRelativeToOwnerWidget() const
+{
+    if (!q->scene())
+        return QRect();
+    QList<QGraphicsView*> views = q->scene()->views();
+    if (views.isEmpty())
+        return QRect();
+    QGraphicsView* view = views.at(0);
+    return view->mapFromScene(q->boundingRect()).boundingRect();
+}
 …
     return q;
+}
+QStyle* QGraphicsWebViewPrivate::style() const
+{
+    return q->style();
+}
+void QGraphicsWebViewPrivate::updateResizesToContentsForPage()
+{
+    ASSERT(page);
+    if (resizesToContents) {
+        // resizes to contents mode requires preferred contents size to be set
+        if (!page->preferredContentsSize().isValid())
+            page->setPreferredContentsSize(QSize(960, 800));
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+        QObject::connect(page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)),
+            q, SLOT(_q_contentsSizeChanged(const QSize&)), Qt::UniqueConnection);
+#else
+        QObject::connect(page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)),
+            q, SLOT(_q_contentsSizeChanged(const QSize&)));
+#endif
+    } else {
+        QObject::disconnect(page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)),
+                         q, SLOT(_q_contentsSizeChanged(const QSize&)));
+    }
+}
+void QGraphicsWebViewPrivate::_q_contentsSizeChanged(const QSize& size)
+{
+    if (!resizesToContents)
+        return;
+    q->setGeometry(QRectF(q->geometry().topLeft(), size));
+}
+void QGraphicsWebViewPrivate::_q_scaleChanged()
+{
+#if ENABLE(TILED_BACKING_STORE)
+    updateTiledBackingStoreScale();
+#endif
+}
+QRectF QGraphicsWebViewPrivate::graphicsItemVisibleRect() const
+{
+    if (!q->scene())
+        return QRectF();
+    QList<QGraphicsView*> views = q->scene()->views();
+    if (views.size() > 1) {
+#ifndef QT_NO_DEBUG_STREAM
+        qDebug() << "QGraphicsWebView is in more than one graphics views, unable to compute the visible rect";
+#endif
+        return QRectF();
+    }
+    if (views.size() < 1)
+        return QRectF();
+    int xPosition = views[0]->horizontalScrollBar()->value();
+    int yPosition = views[0]->verticalScrollBar()->value();
+    return q->mapRectFromScene(QRectF(QPoint(xPosition, yPosition), views[0]->viewport()->size()));
+}
+#if ENABLE(TILED_BACKING_STORE)
+void QGraphicsWebViewPrivate::updateTiledBackingStoreScale()
+{
+    if (!page)
+        return;
+    WebCore::TiledBackingStore* backingStore = QWebFramePrivate::core(page->mainFrame())->tiledBackingStore();
+    if (!backingStore)
+        return;
+    backingStore->setContentsScale(q->scale());
+}
+#endif
 /*!
 …
     setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true);
 #endif
+    setAcceptDrops(true);
     setAcceptHoverEvents(true);
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    setAcceptTouchEvents(true);
+#endif
     setFocusPolicy(Qt::StrongFocus);
+    setFlag(QGraphicsItem::ItemClipsChildrenToShape, true);
+#if ENABLE(TILED_BACKING_STORE)
+    QObject::connect(this, SIGNAL(scaleChanged()), this, SLOT(_q_scaleChanged()));
+#endif
+}
 …
 void QGraphicsWebView::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget*)
+{
+    page()->mainFrame()->render(painter, option->exposedRect.toRect());
+#if ENABLE(TILED_BACKING_STORE)
+    if (WebCore::TiledBackingStore* backingStore = QWebFramePrivate::core(page()->mainFrame())->tiledBackingStore()) {
+        // FIXME: We should set the backing store viewport earlier than in paint
+        backingStore->adjustVisibleRect();
+        // QWebFrame::render is a public API, bypass it for tiled rendering so behavior does not need to change.
+        WebCore::GraphicsContext context(painter);
+        page()->mainFrame()->d->renderFromTiledBackingStore(&context, option->exposedRect.toAlignedRect());
+        return;
+    }
+#endif
+#if USE(ACCELERATED_COMPOSITING)
+    page()->mainFrame()->render(painter, d->overlay ? QWebFrame::ContentsLayer : QWebFrame::AllLayers, option->exposedRect.toAlignedRect());
+#else
+    page()->mainFrame()->render(painter, QWebFrame::AllLayers, option->exposedRect.toRect());
+#endif
+}
 …
+{
     // Re-implemented in order to allows fixing event-related bugs in patch releases.
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    if (d->page && (event->type() == QEvent::TouchBegin
+                || event->type() == QEvent::TouchEnd
+                || event->type() == QEvent::TouchUpdate)) {
+        d->page->event(event);
+        if (event->isAccepted())
+            return true;
+    }
+#endif
     return QGraphicsWidget::sceneEvent(event);
+}
 …
+        {
 #ifndef QT_NO_CURSOR
-#if QT_VERSION >= 0x040400
             if (event->type() == QEvent::CursorChange) {
                 // An unsetCursor will set the cursor to Qt::ArrowCursor.
 …
+            }
 #endif
-#endif
+        }
+    }
     return QGraphicsWidget::event(event);
+}
+void QGraphicsWebViewPrivate::unsetPageIfExists()
+{
+    if (!page)
+        return;
+    // if the page client is the special client constructed for
+    // delegating the responsibilities to a QWidget, we need
+    // to destroy it.
+    if (page->d->client && page->d->client->isQWidgetClient())
+        delete page->d->client;
+    page->d->client = 0;
+    // if the page was created by us, we own it and need to
+    // destroy it as well.
+    if (page->parent() == q)
+        delete page;
+    else
+        page->disconnect(q);
+}
 …
         return;
+    if (d->page) {
+        d->page->d->client = 0; // unset the page client
+        if (d->page->parent() == this)
+            delete d->page;
+        else
+            d->page->disconnect(this);
+    }
+    d->unsetPageIfExists();
     d->page = page;
     if (!d->page)
         return;
     d->page->d->client = d; // set the page client
+    if (d->overlay)
+        d->overlay->prepareGeometryChange();
     QSize size = geometry().size().toSize();
     page->setViewportSize(size);
+    if (d->resizesToContents)
+        d->updateResizesToContentsForPage();
     QWebFrame* mainFrame = d->page->mainFrame();
 …
 /*!
     \property QGraphicsWebView::zoomFactor
-    \since 4.5
     \brief the zoom factor for the view
 */
 …
 void QGraphicsWebView::updateGeometry()
+{
+    if (d->overlay)
+        d->overlay->prepareGeometryChange();
     QGraphicsWidget::updateGeometry();
 …
+{
     QGraphicsWidget::setGeometry(rect);
+    if (d->overlay)
+        d->overlay->prepareGeometryChange();
     if (!d->page)
 …
 QAction *QGraphicsWebView::pageAction(QWebPage::WebAction action) const
+{
+#ifdef QT_NO_ACTION
+    Q_UNUSED(action)
+    return 0;
+#else
     return page()->action(action);
+#endif
+}
 …
         return d->page->findText(subString, options);
     return false;
+}
+/*!
+    \property QGraphicsWebView::resizesToContents
+    \brief whether the size of the QGraphicsWebView and its viewport changes to match the contents size
+    \since 4.7
+    If this property is set, the QGraphicsWebView will automatically change its
+    size to match the size of the main frame contents. As a result the top level frame
+    will never have scrollbars. It will also make CSS fixed positioning to behave like absolute positioning
+    with elements positioned relative to the document instead of the viewport.
+    This property should be used in conjunction with the QWebPage::preferredContentsSize property.
+    If not explicitly set, the preferredContentsSize is automatically set to a reasonable value.
+    \sa QWebPage::setPreferredContentsSize()
+*/
+void QGraphicsWebView::setResizesToContents(bool enabled)
+{
+    if (d->resizesToContents == enabled)
+        return;
+    d->resizesToContents = enabled;
+    if (d->page)
+        d->updateResizesToContentsForPage();
+}
+bool QGraphicsWebView::resizesToContents() const
+{
+    return d->resizesToContents;
+}
+/*!
+    \property QGraphicsWebView::tiledBackingStoreFrozen
+    \brief whether the tiled backing store updates its contents
+    \since 4.7
+    If the tiled backing store is enabled using QWebSettings::TiledBackingStoreEnabled attribute, this property
+    can be used to disable backing store updates temporarily. This can be useful for example for running
+    a smooth animation that changes the scale of the QGraphicsWebView.
+    When the backing store is unfrozen, its contents will be automatically updated to match the current
+    state of the document. If the QGraphicsWebView scale was changed, the backing store is also
+    re-rendered using the new scale.
+    If the tiled backing store is not enabled, this property does nothing.
+    \sa QWebSettings::TiledBackingStoreEnabled
+    \sa QGraphicsObject::scale
+*/
+bool QGraphicsWebView::isTiledBackingStoreFrozen() const
+{
+#if ENABLE(TILED_BACKING_STORE)
+    WebCore::TiledBackingStore* backingStore = QWebFramePrivate::core(page()->mainFrame())->tiledBackingStore();
+    if (!backingStore)
+        return false;
+    return backingStore->contentsFrozen();
+#else
+    return false;
+#endif
+}
+void QGraphicsWebView::setTiledBackingStoreFrozen(bool frozen)
+{
+#if ENABLE(TILED_BACKING_STORE)
+    WebCore::TiledBackingStore* backingStore = QWebFramePrivate::core(page()->mainFrame())->tiledBackingStore();
+    if (!backingStore)
+        return;
+    backingStore->setContentsFrozen(frozen);
+#else
+    UNUSED_PARAM(frozen);
+#endif
+}
 …
+{
 #ifndef QT_NO_DRAGANDDROP
+    //if (d->page)
+    //    d->page->event(ev);
+    //Just remove this line below when the code above is working
+    Q_UNUSED(ev);
+    if (d->page)
+        d->page->event(ev);
 #else
     Q_UNUSED(ev);

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

-              r769
+              r846
     Q_PROPERTY(bool modified READ isModified)
+    Q_PROPERTY(bool resizesToContents READ resizesToContents WRITE setResizesToContents)
+    Q_PROPERTY(bool tiledBackingStoreFrozen READ isTiledBackingStoreFrozen WRITE setTiledBackingStoreFrozen)
 public:
 …
     bool findText(const QString& subString, QWebPage::FindFlags options = 0);
+    bool resizesToContents() const;
+    void setResizesToContents(bool enabled);
+    bool isTiledBackingStoreFrozen() const;
+    void setTiledBackingStoreFrozen(bool frozen);
     virtual void setGeometry(const QRectF& rect);
 …
     Q_PRIVATE_SLOT(d, void _q_updateMicroFocus())
     Q_PRIVATE_SLOT(d, void _q_pageDestroyed())
+    // we don't want to change the moc based on USE() macro, so this function is here
+    // but will be empty if ACCLERATED_COMPOSITING is disabled
+    Q_PRIVATE_SLOT(d, void syncLayers())
+    Q_PRIVATE_SLOT(d, void _q_contentsSizeChanged(const QSize&))
+    Q_PRIVATE_SLOT(d, void _q_scaleChanged())
     QGraphicsWebViewPrivate* const d;

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp

-              r561
+              r846
     databases.
+    To get access to all databases defined by a security origin, use QWebSecurityOrigin::databases().
+    Each database has an internal name(), as well as a user-friendly name, provided by displayName().
+    Databases are grouped together in security origins. To get access to all databases defined by
+    a security origin, use QWebSecurityOrigin::databases(). Each database has an internal name(),
+    as well as a user-friendly name, provided by displayName(). These names are specified when
+    creating the database in the JavaScript code.
     WebKit uses SQLite to create and access the local SQL databases. The location of the database
 …
     in bytes is returned by size().
     For more information refer to the \l{http://dev.w3.org/html5/webdatabase/}{HTML 5 Draft Standard}.
+    For more information refer to the \l{http://dev.w3.org/html5/webdatabase/}{HTML5 Web SQL Database Draft Standard}.
     \sa QWebSecurityOrigin
 …
 /*!
     Returns the name of the database as seen by the user.
+    Returns the name of the database in a format that is suitable for display to the user.
 */
 QString QWebDatabase::displayName() const

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp

-              r561
+              r846
 #include "PropertyNameArray.h"
 #include "RenderImage.h"
-#include "ScriptFunctionCall.h"
 #include "StaticNodeList.h"
 #include "qt_runtime.h"
 …
     \snippet webkitsnippets/webelement/main.cpp Traversing with QWebElement
+    Individual elements can be inspected or changed using methods such as attribute()
+    or setAttribute(). For examle, to capture the user's input in a text field for later
+    use (auto-completion), a browser could do something like this:
+    \snippet webkitsnippets/webelement/main.cpp autocomplete1
+    When the same page is later revisited, the browser can fill in the text field automatically
+    by modifying the value attribute of the input element:
+    \snippet webkitsnippets/webelement/main.cpp autocomplete2
+    Another use case is to emulate a click event on an element. The following
+    code snippet demonstrates how to call the JavaScript DOM method click() of
+    a submit button:
+    \snippet webkitsnippets/webelement/main.cpp Calling a DOM element method
     The underlying content of QWebElement is explicitly shared. Creating a copy
     of a QWebElement does not create a copy of the content. Instead, both
     instances point to the same element.
-    The element's attributes can be read using attribute() and modified with
-    setAttribute().
     The contents of child elements can be converted to plain text with
 …
     QStringList classes =  attribute(QLatin1String("class")).simplified().split(QLatin1Char(' '), QString::SkipEmptyParts);
-#if QT_VERSION >= 0x040500
     classes.removeDuplicates();
-#else
-    int n = classes.size();
-    int j = 0;
-    QSet<QString> seen;
-    seen.reserve(n);
-    for (int i = 0; i < n; ++i) {
-        const QString& s = classes.at(i);
-        if (seen.contains(s))
-            continue;
-        seen.insert(s);
-        if (j != i)
-            classes[j] = s;
-        ++j;
+    }
-    if (n != j)
-        classes.erase(classes.begin() + j, classes.end());
-#endif
     return classes;
+}

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

-              r769
+              r846
     class Element;
     class Node;
+}
+namespace JSC {
+namespace Bindings {
+    class QtWebElementRuntime;
+}
+}
 …
     friend class QWebHitTestResultPrivate;
     friend class QWebPage;
+    friend class JSC::Bindings::QtWebElementRuntime;
     QWebElementPrivate* d;
 …
 };
+Q_DECLARE_METATYPE(QWebElement)
 #endif // QWEBELEMENT_H

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

-              r769
+              r846
 #include "qwebframe.h"
+#include "Bridge.h"
 #include "CallFrame.h"
 #include "Document.h"
 …
 #include "SelectionController.h"
 #include "SubstituteData.h"
+#include "SVGSMILElement.h"
+#include "TiledBackingStore.h"
 #include "htmlediting.h"
 #include "markup.h"
 …
 #include "qwebsecurityorigin.h"
 #include "qwebsecurityorigin_p.h"
-#include "runtime.h"
 #include "runtime_object.h"
 #include "runtime_root.h"
 …
 #include <qprinter.h>
 #include <qregion.h>
-#if QT_VERSION < 0x040400
-#include "qwebnetworkinterface.h"
-#endif
-#if QT_VERSION >= 0x040400
 #include <qnetworkrequest.h>
-#endif
 using namespace WebCore;
 …
 extern Q_GUI_EXPORT int qt_defaultDpi();
 QT_END_NAMESPACE
+void QWEBKIT_EXPORT qt_drt_setMediaType(QWebFrame* qframe, const QString& type)
+{
+    WebCore::Frame* frame = QWebFramePrivate::core(qframe);
+    WebCore::FrameView* view = frame->view();
+    view->setMediaType(type);
+    frame->document()->updateStyleSelector();
+    view->forceLayout();
+}
+bool QWEBKIT_EXPORT qt_drt_hasDocumentElement(QWebFrame* qframe)
+{
+    return QWebFramePrivate::core(qframe)->document()->documentElement();
+}
 void QWEBKIT_EXPORT qt_drt_setJavaScriptProfilingEnabled(QWebFrame* qframe, bool enabled)
 …
+}
+// Pause a given SVG animation on the target node at a specific time.
+// This method is only intended to be used for testing the SVG animation system.
+bool QWEBKIT_EXPORT qt_drt_pauseSVGAnimation(QWebFrame *qframe, const QString &animationId, double time, const QString &elementId)
+{
+#if !ENABLE(SVG)
+    return false;
+#else
+    Frame* frame = QWebFramePrivate::core(qframe);
+    if (!frame)
+        return false;
+    Document* doc = frame->document();
+    Q_ASSERT(doc);
+    if (!doc->svgExtensions())
+        return false;
+    Node* coreNode = doc->getElementById(animationId);
+    if (!coreNode || !SVGSMILElement::isSMILElement(coreNode))
+        return false;
+    return doc->accessSVGExtensions()->sampleAnimationAtTime(elementId, static_cast<SVGSMILElement*>(coreNode), time);
+#endif
+}
 // Returns the total number of currently running animations (includes both CSS transitions and CSS animations).
 int QWEBKIT_EXPORT qt_drt_numberOfActiveAnimations(QWebFrame *qframe)
 …
+}
+int QWEBKIT_EXPORT qt_drt_pageNumberForElementById(QWebFrame* qFrame, const QString& id, float width, float height)
+{
+    Frame* frame = QWebFramePrivate::core(qFrame);
+    if (!frame)
+        return -1;
+    Element* element = frame->document()->getElementById(AtomicString(id));
+    if (!element)
+        return -1;
+    return PrintContext::pageNumberForElement(element, FloatSize(width, height));
+}
+int QWEBKIT_EXPORT qt_drt_numberOfPages(QWebFrame* qFrame, float width, float height)
+{
+    Frame* frame = QWebFramePrivate::core(qFrame);
+    if (!frame)
+        return -1;
+    return PrintContext::numberOfPages(frame, FloatSize(width, height));
+}
 // Suspend active DOM objects in this frame.
 void QWEBKIT_EXPORT qt_suspendActiveDOMObjects(QWebFrame* qFrame)
 …
         frame->document()->resumeActiveDOMObjects();
+}
+void QWEBKIT_EXPORT qt_drt_evaluateScriptInIsolatedWorld(QWebFrame* qFrame, int worldId, const QString& script)
+{
+    Frame* frame = QWebFramePrivate::core(qFrame);
+    if (frame)
+        JSC::JSValue result = frame->script()->executeScriptInWorld(mainThreadNormalWorld(), script, true).jsValue();
+}
+bool QWEBKIT_EXPORT qtwebkit_webframe_scrollOverflow(QWebFrame* qFrame, int dx, int dy, const QPoint& pos)
+{
+    WebCore::Frame* frame = QWebFramePrivate::core(qFrame);
+    if (!frame || !frame->document() || !frame->view() || !frame->eventHandler())
+        return false;
+    QPoint contentsPos = frame->view()->windowToContents(pos);
+    Node* node = frame->document()->elementFromPoint(contentsPos.x(), contentsPos.y());
+    if (!node)
+        return false;
+    RenderObject* renderer = node->renderer();
+    if (!renderer)
+        return false;
+    if (renderer->isListBox())
+        return false;
+    RenderLayer* renderLayer = renderer->enclosingLayer();
+    if (!renderLayer)
+        return false;
+    bool scrolledHorizontal = false;
+    bool scrolledVertical = false;
+    do {
+        if (dx > 0)
+            scrolledHorizontal = renderLayer->scroll(ScrollRight, ScrollByPixel, dx);
+        else if (dx < 0)
+            scrolledHorizontal = renderLayer->scroll(ScrollLeft, ScrollByPixel, qAbs(dx));
+        if (dy > 0)
+            scrolledVertical = renderLayer->scroll(ScrollDown, ScrollByPixel, dy);
+        else if (dy < 0)
+            scrolledVertical = renderLayer->scroll(ScrollUp, ScrollByPixel, qAbs(dy));
+        if (scrolledHorizontal || scrolledVertical)
+            return true;
+        renderLayer = renderLayer->parent();
+    } while (renderLayer);
+    return false;
+}
+/*!
+  \internal
+  Scrolls nested frames starting at this frame, \a dx pixels to the right
+  and \a dy pixels downward. Both \a dx and \a dy may be negative. First attempts
+  to scroll elements with CSS overflow at position pos, followed by this frame. If this
+  frame doesn't scroll, attempts to scroll the parent
+*/
+void QWEBKIT_EXPORT qtwebkit_webframe_scrollRecursively(QWebFrame* qFrame, int dx, int dy, const QPoint& pos)
+{
+    if (!qFrame)
+        return;
+    if (qtwebkit_webframe_scrollOverflow(qFrame, dx, dy, pos))
+        return;
+    bool scrollHorizontal = false;
+    bool scrollVertical = false;
+    do {
+        if (dx > 0)  // scroll right
+            scrollHorizontal = qFrame->scrollBarValue(Qt::Horizontal) < qFrame->scrollBarMaximum(Qt::Horizontal);
+        else if (dx < 0)  // scroll left
+            scrollHorizontal = qFrame->scrollBarValue(Qt::Horizontal) > qFrame->scrollBarMinimum(Qt::Horizontal);
+        if (dy > 0)  // scroll down
+            scrollVertical = qFrame->scrollBarValue(Qt::Vertical) < qFrame->scrollBarMaximum(Qt::Vertical);
+        else if (dy < 0) //scroll up
+            scrollVertical = qFrame->scrollBarValue(Qt::Vertical) > qFrame->scrollBarMinimum(Qt::Vertical);
+        if (scrollHorizontal || scrollVertical) {
+            qFrame->scroll(dx, dy);
+            return;
+        }
+        qFrame = qFrame->parentFrame();
+    } while (qFrame);
+}
 QWebFrameData::QWebFrameData(WebCore::Page* parentPage, WebCore::Frame* parentFrame,
 …
+}
+void QWebFramePrivate::setPage(QWebPage* newPage)
+{
+    if (page == newPage)
+        return;
+    // The QWebFrame is created as a child of QWebPage or a parent QWebFrame.
+    // That adds it to QObject's internal children list and ensures it will be
+    // deleted when parent QWebPage is deleted. Reparent if needed.
+    if (q->parent() == qobject_cast<QObject*>(page))
+        q->setParent(newPage);
+    page = newPage;
+    emit q->pageChanged();
+}
 WebCore::Scrollbar* QWebFramePrivate::horizontalScrollBar() const
+{
 …
+}
+void QWebFramePrivate::renderPrivate(QPainter *painter, QWebFrame::RenderLayer layer, const QRegion &clip)
+{
+#if ENABLE(TILED_BACKING_STORE)
+void QWebFramePrivate::renderFromTiledBackingStore(GraphicsContext* context, const QRegion& clip)
+{
+    ASSERT(frame->tiledBackingStore());
     if (!frame->view() || !frame->contentRenderer())
         return;
 …
         return;
+    GraphicsContext context(painter);
+    if (context.paintingDisabled() && !context.updatingControlTints())
+    QPainter* painter = context->platformContext();
+    WebCore::FrameView* view = frame->view();
+    int scrollX = view->scrollX();
+    int scrollY = view->scrollY();
+    context->translate(-scrollX, -scrollY);
+    for (int i = 0; i < vector.size(); ++i) {
+        const QRect& clipRect = vector.at(i);
+        painter->save();
+        QRect rect = clipRect.translated(scrollX, scrollY);
+        painter->setClipRect(rect, Qt::IntersectClip);
+        frame->tiledBackingStore()->paint(context, rect);
+        painter->restore();
+    }
+}
+#endif
+void QWebFramePrivate::renderRelativeCoords(GraphicsContext* context, QWebFrame::RenderLayer layer, const QRegion& clip)
+{
+    if (!frame->view() || !frame->contentRenderer())
         return;
+    QVector<QRect> vector = clip.rects();
+    if (vector.isEmpty())
+        return;
+    QPainter* painter = context->platformContext();
     WebCore::FrameView* view = frame->view();
 …
     for (int i = 0; i < vector.size(); ++i) {
         const QRect& clipRect = vector.at(i);
         QRect intersectedRect = clipRect.intersected(view->frameRect());
 …
         if (layer & QWebFrame::ContentsLayer) {
             context.save();
+            context->save();
             int scrollX = view->scrollX();
 …
             QRect rect = intersectedRect;
             context.translate(x, y);
+            context->translate(x, y);
             rect.translate(-x, -y);
             context.translate(-scrollX, -scrollY);
+            context->translate(-scrollX, -scrollY);
             rect.translate(scrollX, scrollY);
             context.clip(view->visibleContentRect());
             view->paintContents(&context, rect);
             context.restore();
+            context->clip(view->visibleContentRect());
+            view->paintContents(context, rect);
+            context->restore();
+        }
 …
             && !view->scrollbarsSuppressed()
             && (view->horizontalScrollbar() || view->verticalScrollbar())) {
             context.save();
+            context->save();
             QRect rect = intersectedRect;
             context.translate(x, y);
+            context->translate(x, y);
             rect.translate(-x, -y);
             view->paintScrollbars(&context, rect);
             context.restore();
+            view->paintScrollbars(context, rect);
+            context->restore();
+        }
+#if ENABLE(PAN_SCROLLING)
         if (layer & QWebFrame::PanIconLayer)
+            view->paintPanScrollIcon(&context);
+            view->paintPanScrollIcon(context);
+#endif
         painter->restore();
+    }
+}
-bool QWEBKIT_EXPORT qtwebkit_webframe_scrollOverflow(QWebFrame* qFrame, int dx, int dy, const QPoint& pos)
+{
-    WebCore::Frame* frame = QWebFramePrivate::core(qFrame);
-    if (!frame || !frame->document() || !frame->view() || !frame->eventHandler())
-        return false;
-    QPoint contentsPos = frame->view()->windowToContents(pos);
-    Node* node = frame->document()->elementFromPoint(contentsPos.x(), contentsPos.y());
-    if (!node)
-        return false;
-    RenderObject* renderer = node->renderer();
-    if (!renderer)
-        return false;
-    if (renderer->isListBox())
-        return false;
-    RenderLayer* renderLayer = renderer->enclosingLayer();
-    if (!renderLayer)
-        return false;
-    bool scrolledHorizontal = false;
-    bool scrolledVertical = false;
-    do {
-        if (dx > 0)
-            scrolledHorizontal = renderLayer->scroll(ScrollRight, ScrollByPixel, dx);
-        else if (dx < 0)
-            scrolledHorizontal = renderLayer->scroll(ScrollLeft, ScrollByPixel, qAbs(dx));
-        if (dy > 0)
-            scrolledVertical = renderLayer->scroll(ScrollDown, ScrollByPixel, dy);
-        else if (dy < 0)
-            scrolledVertical = renderLayer->scroll(ScrollUp, ScrollByPixel, qAbs(dy));
-        if (scrolledHorizontal || scrolledVertical)
-            return true;
-        renderLayer = renderLayer->parent();
-    } while (renderLayer);
-    return false;
+}
 /*!
 …
     to be notified when a new frame is created.
+    The hitTestContent() function can be used to programmatically examine the
+    contents of a frame.
+    There are multiple ways to programmatically examine the contents of a frame.
+    The hitTestContent() function can be used to find elements by coordinate.
+    For access to the underlying DOM tree, there is documentElement(),
+    findAllElements() and findFirstElement().
     A QWebFrame can be printed onto a QPrinter using the print() function.
 …
         d->frame->view()->layout();
     return externalRepresentation(d->frame->contentRenderer());
+    return externalRepresentation(d->frame);
+}
 …
     \property QWebFrame::url
     \brief the url of the frame currently viewed
+    Setting this property clears the view and loads the URL.
+    By default, this property contains an empty, invalid URL.
     \sa urlChanged()
 …
 void QWebFrame::load(const QUrl &url)
+{
-#if QT_VERSION < 0x040400
-    load(QWebNetworkRequest(ensureAbsoluteUrl(url)));
-#else
     load(QNetworkRequest(ensureAbsoluteUrl(url)));
+#endif
+}
+#if QT_VERSION < 0x040400
+/*!
+  Loads a network request, \a req, into this frame.
+  \note The view remains the same until enough data has arrived to display the new url.
+*/
+void QWebFrame::load(const QWebNetworkRequest &req)
+{
+    if (d->parentFrame())
+        d->page->d->insideOpenCall = true;
+    QUrl url = ensureAbsoluteUrl(req.url());
+    QHttpRequestHeader httpHeader = req.httpHeader();
+    QByteArray postData = req.postData();
+    WebCore::ResourceRequest request(url);
+    QString method = httpHeader.method();
+    if (!method.isEmpty())
+        request.setHTTPMethod(method);
+    QList<QPair<QString, QString> > values = httpHeader.values();
+    for (int i = 0; i < values.size(); ++i) {
+        const QPair<QString, QString> &val = values.at(i);
+        request.addHTTPHeaderField(val.first, val.second);
+    }
+    if (!postData.isEmpty())
+        request.setHTTPBody(WebCore::FormData::create(postData.constData(), postData.size()));
+    d->frame->loader()->load(request, false);
+    if (d->parentFrame())
+        d->page->d->insideOpenCall = false;
+}
+#else
+}
 /*!
 …
   \a body is optional and is only used for POST operations.
   \note The view remains the same until enough data has arrived to display the new \a url.
+  \note The view remains the same until enough data has arrived to display the new content.
   \sa setUrl()
 …
         d->page->d->insideOpenCall = false;
+}
-#endif
 /*!
 …
         d->horizontalScrollBarPolicy = policy;
         if (d->frame->view()) {
+            d->frame->view()->setHorizontalScrollbarMode((ScrollbarMode)policy);
+            d->frame->view()->setHorizontalScrollbarMode((ScrollbarMode)policy, policy != Qt::ScrollBarAsNeeded /* lock */);
+            d->frame->view()->updateCanHaveScrollbars();
+        }
     } else {
         d->verticalScrollBarPolicy = policy;
         if (d->frame->view()) {
+            d->frame->view()->setVerticalScrollbarMode((ScrollbarMode)policy);
+            d->frame->view()->setVerticalScrollbarMode((ScrollbarMode)policy, policy != Qt::ScrollBarAsNeeded /* lock */);
+            d->frame->view()->updateCanHaveScrollbars();
+        }
+    }
 …
 /*!
-  \internal
-  Scrolls nested frames starting at this frame, \a dx pixels to the right
-  and \a dy pixels downward. Both \a dx and \a dy may be negative. First attempts
-  to scroll elements with CSS overflow at position pos, followed by this frame. If this
-  frame doesn't scroll, attempts to scroll the parent
-*/
-void QWEBKIT_EXPORT qtwebkit_webframe_scrollRecursively(QWebFrame* qFrame, int dx, int dy, const QPoint& pos)
+{
-    if (!qFrame)
-        return;
-    if (qtwebkit_webframe_scrollOverflow(qFrame, dx, dy, pos))
-        return;
-    bool scrollHorizontal = false;
-    bool scrollVertical = false;
-    do {
-        if (dx > 0)  // scroll right
-            scrollHorizontal = qFrame->scrollBarValue(Qt::Horizontal) < qFrame->scrollBarMaximum(Qt::Horizontal);
-        else if (dx < 0)  // scroll left
-            scrollHorizontal = qFrame->scrollBarValue(Qt::Horizontal) > qFrame->scrollBarMinimum(Qt::Horizontal);
-        if (dy > 0)  // scroll down
-            scrollVertical = qFrame->scrollBarValue(Qt::Vertical) < qFrame->scrollBarMaximum(Qt::Vertical);
-        else if (dy < 0) //scroll up
-            scrollVertical = qFrame->scrollBarValue(Qt::Vertical) > qFrame->scrollBarMinimum(Qt::Vertical);
-        if (scrollHorizontal || scrollVertical) {
-            qFrame->scroll(dx, dy);
-            return;
+        }
-        qFrame = qFrame->parentFrame();
-    } while (qFrame);
+}
-/*!
   \property QWebFrame::scrollPosition
   \since 4.5
 …
 /*!
+  \since 4.7
+  Scrolls the frame to the given \a anchor name.
+*/
+void QWebFrame::scrollToAnchor(const QString& anchor)
+{
+    FrameView *view = d->frame->view();
+    if (view)
+        view->scrollToAnchor(anchor);
+}
+/*!
   \since 4.6
   Render the \a layer of the frame using \a painter clipping to \a clip.
 …
 void QWebFrame::render(QPainter* painter, RenderLayer layer, const QRegion& clip)
+{
+    GraphicsContext context(painter);
+    if (context.paintingDisabled() && !context.updatingControlTints())
+        return;
     if (!clip.isEmpty())
         d->renderPrivate(painter, layer, clip);
+        d->renderRelativeCoords(&context, layer, clip);
     else if (d->frame->view())
         d->renderPrivate(painter, layer, QRegion(d->frame->view()->frameRect()));
+        d->renderRelativeCoords(&context, layer, QRegion(d->frame->view()->frameRect()));
+}
 …
   Render the frame into \a painter clipping to \a clip.
 */
+void QWebFrame::render(QPainter *painter, const QRegion &clip)
+{
+    d->renderPrivate(painter, AllLayers, clip);
+void QWebFrame::render(QPainter* painter, const QRegion& clip)
+{
+    GraphicsContext context(painter);
+    if (context.paintingDisabled() && !context.updatingControlTints())
+        return;
+    d->renderRelativeCoords(&context, AllLayers, clip);
+}
 …
   Render the frame into \a painter.
 */
 void QWebFrame::render(QPainter *painter)
+void QWebFrame::render(QPainter* painter)
+{
     if (!d->frame->view())
         return;
+    d->renderPrivate(painter, AllLayers, QRegion(d->frame->view()->frameRect()));
+    GraphicsContext context(painter);
+    if (context.paintingDisabled() && !context.updatingControlTints())
+        return;
+    d->renderRelativeCoords(&context, AllLayers, QRegion(d->frame->view()->frameRect()));
+}
 …
 void QWebFrame::setTextSizeMultiplier(qreal factor)
+{
     d->frame->setZoomFactor(factor, /*isTextOnly*/true);
+    d->frame->setZoomFactor(factor, ZoomTextOnly);
+}
 …
 void QWebFrame::setZoomFactor(qreal factor)
+{
     d->frame->setZoomFactor(factor, d->frame->isZoomFactorTextOnly());
+    d->frame->setZoomFactor(factor, d->frame->zoomMode());
+}
 …
         return;
     const qreal zoomFactorX = printer->logicalDpiX() / qt_defaultDpi();
     const qreal zoomFactorY = printer->logicalDpiY() / qt_defaultDpi();
+    const qreal zoomFactorX = (qreal)printer->logicalDpiX() / qt_defaultDpi();
+    const qreal zoomFactorY = (qreal)printer->logicalDpiY() / qt_defaultDpi();
     PrintContext printContext(d->frame);

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h

-              r561
+              r846
 #include <QtGui/qicon.h>
 #include <QtScript/qscriptengine.h>
-#if QT_VERSION >= 0x040400
 #include <QtNetwork/qnetworkaccessmanager.h>
-#endif
 #include "qwebkitglobal.h"
 …
     void load(const QUrl &url);
-#if QT_VERSION < 0x040400
-    void load(const QWebNetworkRequest &request);
-#else
     void load(const QNetworkRequest &request,
               QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation,
               const QByteArray &body = QByteArray());
-#endif
     void setHtml(const QString &html, const QUrl &baseUrl = QUrl());
     void setContent(const QByteArray &data, const QString &mimeType = QString(), const QUrl &baseUrl = QUrl());
 …
     void setScrollPosition(const QPoint &pos);
+    void scrollToAnchor(const QString& anchor);
     enum RenderLayer {
         ContentsLayer = 0x10,
 …
     void loadFinished(bool ok);
+    void pageChanged();
 private:
+    friend class QGraphicsWebView;
     friend class QWebPage;
     friend class QWebPagePrivate;

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebframe_p.h

-              r561
+              r846
 #include "EventHandler.h"
+#include "GraphicsContext.h"
 #include "KURL.h"
 #include "PlatformString.h"
 …
         {}
     void init(QWebFrame* qframe, QWebFrameData* frameData);
+    void setPage(QWebPage*);
     inline QWebFrame *parentFrame() { return qobject_cast<QWebFrame*>(q->parent()); }
 …
     static QWebFrame* kit(WebCore::Frame*);
+    void renderPrivate(QPainter*, QWebFrame::RenderLayer, const QRegion& clip);
+    bool scrollOverflow(int dx, int dy);
+    void renderRelativeCoords(WebCore::GraphicsContext*, QWebFrame::RenderLayer, const QRegion& clip);
+#if ENABLE(TILED_BACKING_STORE)
+    void renderFromTiledBackingStore(WebCore::GraphicsContext*, const QRegion& clip);
+#endif
     QWebFrame *q;

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp

r561	r846
541	541	}
542	542	d->lst->removeItem(nullItem);
	543	// Update the HistoryController.
	544	history.d->lst->page()->mainFrame()->loader()->history()->setCurrentItem(history.d->lst->entries()[currentIndex].get());
543	545	history.goToItem(history.itemAt(currentIndex));
544	546	}

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp

-              r561
+              r846
 /*!
   Sets a new default interface, \a defaultInterface, that will be used by all of WebKit
   for managing history.
+  to keep track of visited links.
   If an interface without a parent has already been set, the old interface will be deleted.
 …
 /*!
+  Returns the default interface that will be used by WebKit. If no
+  default interface has been set, QtWebkit will not track history.
+  Returns the default interface that will be used by WebKit. If no default interface has been set,
+  Webkit will not keep track of visited links and a null pointer will be returned.
+  \sa setDefaultInterface
 */
 QWebHistoryInterface* QWebHistoryInterface::defaultInterface()
 …
   The QWebHistoryInterface is an interface that can be used to
+  implement link history. It contains two pure virtual methods that
+  are called by the WebKit engine.  addHistoryEntry() is used to add
+  pages that have been visited to the interface, while
+  historyContains() is used to query whether this page has been
+  visited by the user.
+  keep track of visited links. It contains two pure virtual methods that
+  are called by the WebKit engine: addHistoryEntry() is used to add
+  urls that have been visited to the interface, while
+  historyContains() is used to query whether the given url has been
+  visited by the user. By default the QWebHistoryInterface is not set, so WebKit does not keep
+  track of visited links.
+  \note The history tracked by QWebHistoryInterface is not specific to an instance of QWebPage
+  but applies to all pages.
 */
 …
 /*!
     Destructor.  If this is currently the default interface it will be unset.
+    Destroys the interface.  If this is currently the default interface it will be unset.
 */
 QWebHistoryInterface::~QWebHistoryInterface()

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebinspector.cpp

-              r561
+              r846
     \class QWebInspector
     \since 4.6
+    \inmodule QtWebKit
     \brief The QWebInspector class allows the placement and control of a
     QWebPage's inspector.
+    The inspector allows you to see a page current hierarchy and loading
+    statistics.
+    The QWebPage to be inspected is determined with the setPage() method.
+    The inspector can display a page's hierarchy, its loading statistics and
+    the current state of its individual elements. It is mostly used by web
+    developers.
+    The QWebPage to be inspected must be specified using the setPage() method.
     A typical use of QWebInspector follows:
     \snippet webkitsnippets/qtwebkit_qwebinspector_snippet.cpp 0
+    A QWebInspector can be made visible either programmatically using
+    setVisible(), or by the user through the attached QWebPage's context
+    menu.
     \note A QWebInspector will display a blank widget if either:
 …
     The inspector allows the user to configure some options through its
+    interface (e.g. the resource tracking "Always enable" option).
+    These settings are persisted automatically by QtWebKit using QSettings.
+    However since the QSettings object is instantiated using the empty
+    constructor, QCoreApplication::setOrganizationName() and
+    QCoreApplication::setApplicationName() must be called within your
+    application to enable the persistence of these options.
+*/
+/*!
+    Constructs an empty QWebInspector with parent \a parent.
+    user interface (e.g. the resource tracking "Always enable" option).
+    These settings will be persisted automatically by QtWebKit only if
+    your application previously called QCoreApplication::setOrganizationName()
+    and QCoreApplication::setApplicationName().
+    See QSettings's default constructor documentation for an explanation
+    of why this is necessary.
+*/
+/*!
+    Constructs an unbound QWebInspector with \a parent as its parent.
 */
 QWebInspector::QWebInspector(QWidget* parent)
 …
 /*!
     Sets the QWebPage to be inspected.
     There can only be one QWebInspector associated with a QWebPage
     and vices versa.
     Calling with \a page as null will break the current association, if any.
     If \a page is already associated to another QWebInspector, the association
     will be replaced and the previous QWebInspector will have no page
     associated.
+    Bind this inspector to the QWebPage to be inspected.
+    \bold {Notes:}
+    \list
+        \o There can only be one QWebInspector associated with a QWebPage
+           and vice versa.
+        \o Calling this method with a null \a page will break the current association, if any.
+        \o If \a page is already associated to another QWebInspector, the association
+           will be replaced and the previous QWebInspector will become unbound
+    \endlist
     \sa page()
 …
 bool QWebInspector::event(QEvent* ev)
+{
-    if (ev->type() == QEvent::Close && d->page)
-        d->page->d->inspectorController()->setWindowVisible(false);
     return QWidget::event(ev);
+}
 …
 void QWebInspector::showEvent(QShowEvent* event)
+{
+#if ENABLE(INSPECTOR)
     // Allows QWebInspector::show() to init the inspector.
     if (d->page)
         d->page->d->inspectorController()->show();
+#endif
+}
 …
 void QWebInspector::hideEvent(QHideEvent* event)
+{
+#if ENABLE(INSPECTOR)
+    if (d->page)
+        d->page->d->inspectorController()->close();
+#endif
+}
+/*! \reimp */
+void QWebInspector::closeEvent(QCloseEvent* event)
+{
+#if ENABLE(INSPECTOR)
+    if (d->page)
+        d->page->d->inspectorController()->close();
+#endif
+}

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebinspector.h

-              r561
+              r846
     void showEvent(QShowEvent* event);
     void hideEvent(QHideEvent* event);
+    void closeEvent(QCloseEvent* event);
 private:
 …
     friend class QWebPagePrivate;
     friend class WebCore::InspectorClientQt;
+    friend class WebCore::InspectorFrontendClientQt;
 };
 #endif

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h

-              r561
+              r846
 #include <QtCore/qglobal.h>
+#define QTWEBKIT_VERSION_STR "2.0.2"
+// QTWEBKIT_VERSION is (major << 16) + (minor << 8) + patch. Similar to Qt.
+#define QTWEBKIT_VERSION 0x020002
+// Use: #if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 0, 0)). Similar to Qt.
+#define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
 #if defined(QT_MAKEDLL)        /* create a Qt DLL library */
 #  if defined(BUILD_WEBKIT)
 …
 #endif
-#if QT_VERSION < 0x040400
-    #ifndef QT_BEGIN_NAMESPACE
-    #define QT_BEGIN_NAMESPACE
-    #endif
-    #ifndef QT_END_NAMESPACE
-    #define QT_END_NAMESPACE
-    #endif
-#endif
 #endif // QWEBKITGLOBAL_H

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebkitversion.cpp

-              r561
+              r846
 /*!
+    \relates QWebPage
+    \since 4.6
+    Returns the version number of WebKit at run-time as a string (for
+    example, "531.3").
+    Returns the version number of WebKit at run-time as a string (for
+    example, "531.3"). This is the version of WebKit the application
+    was compiled against.
+    This version is commonly used in WebKit based browsers as part
+    of the user agent string. Web servers and JavaScript might use
+    it to identify the presence of certain WebKit engine features
+    and behaviour.
+    The evolution of this version is bound to the releases of Apple's
+    Safari browser. For a version specific to the QtWebKit library,
+    see QTWEBKIT_VERSION
+    \sa QWebPage::userAgentForUrl()
 */
 QString qWebKitVersion()
 …
 /*!
+    \relates QWebPage
+    \since 4.6
     Returns the 'major' version number of WebKit at run-time as an integer
     (for example, 531). This is the version of WebKit the application
     was compiled against.
+    \sa qWebKitVersion()
 */
 int qWebKitMajorVersion()
 …
 /*!
+    \relates QWebPage
+    \since 4.6
     Returns the 'minor' version number of WebKit at run-time as an integer
     (for example, 3). This is the version of WebKit the application
     was compiled against.
+    \sa qWebKitVersion()
 */
 int qWebKitMinorVersion()
 …
     return WEBKIT_MINOR_VERSION;
+}
+/*!
+    \macro QTWEBKIT_VERSION
+    \relates QWebPage
+    This macro expands a numeric value of the form 0xMMNNPP (MM =
+    major, NN = minor, PP = patch) that specifies QtWebKit's version
+    number. For example, if you compile your application against QtWebKit
+.1.2, the QTWEBKIT_VERSION macro will expand to 0x020102.
+    You can use QTWEBKIT_VERSION to use the latest QtWebKit API where
+    available.
+    \sa QT_VERSION
+*/
+/*!
+    \macro QTWEBKIT_VERSION_STR
+    \relates QWebPage
+    This macro expands to a string that specifies QtWebKit's version number
+    (for example, "2.1.2"). This is the version against which the
+    application is compiled.
+    \sa QTWEBKIT_VERSION
+*/
+/*!
+    \macro QTWEBKIT_VERSION_CHECK
+    \relates QWebPage
+    Turns the major, minor and patch numbers of a version into an
+    integer, 0xMMNNPP (MM = major, NN = minor, PP = patch). This can
+    be compared with another similarly processed version id, for example
+    in a preprocessor statement:
+    \code
+    #if QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 1, 0)
+    // code to use API new in QtWebKit 2.1.0
+    #endif
+    \endcode
+*/

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

-              r799
+              r846
 #include "qwebkitversion.h"
+#include "Chrome.h"
+#include "ContextMenuController.h"
 #include "Frame.h"
 #include "FrameTree.h"
 …
 #include "SecurityOrigin.h"
 #include "Settings.h"
+#include "TiledBackingStore.h"
 #include "Page.h"
 #include "Pasteboard.h"
 …
 #include "PageGroup.h"
 #include "QWebPageClient.h"
+#include "WorkerThread.h"
 #include <QApplication>
 …
 #include <QSysInfo>
 #include <QTextCharFormat>
 #if QT_VERSION >= 0x040400
+#include <QTextDocument>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
-#else
-#include "qwebnetworkinterface.h"
-#endif
 #if defined(Q_WS_X11)
 #include <QX11Info>
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+#include <QTouchEvent>
+#include "PlatformTouchEvent.h"
 #endif
 …
+}
+int QWEBKIT_EXPORT qt_drt_workerThreadCount()
+{
+#if ENABLE(WORKERS)
+    return WebCore::WorkerThread::workerThreadCount();
+#else
+    return 0;
+#endif
+}
 bool QWebPagePrivate::drtRun = false;
 void QWEBKIT_EXPORT qt_drt_run(bool b)
 …
+}
+void QWEBKIT_EXPORT qt_drt_setFrameFlatteningEnabled(QWebPage* page, bool enabled)
+{
+    QWebPagePrivate::core(page)->settings()->setFrameFlatteningEnabled(enabled);
+}
 void QWEBKIT_EXPORT qt_webpage_setGroupName(QWebPage* page, const QString& groupName)
+{
 …
+{
     return page->handle()->page->groupName();
+}
+#if ENABLE(INSPECTOR)
+void QWEBKIT_EXPORT qt_drt_webinspector_executeScript(QWebPage* page, long callId, const QString& script)
+{
+    if (!page->handle()->page->inspectorController())
+        return;
+    page->handle()->page->inspectorController()->evaluateForTestInFrontend(callId, script);
+}
+void QWEBKIT_EXPORT qt_drt_webinspector_close(QWebPage* page)
+{
+    if (!page->handle()->page->inspectorController())
+        return;
+    page->handle()->page->inspectorController()->close();
+}
+void QWEBKIT_EXPORT qt_drt_webinspector_show(QWebPage* page)
+{
+    if (!page->handle()->page->inspectorController())
+        return;
+    page->handle()->page->inspectorController()->show();
+}
+void QWEBKIT_EXPORT qt_drt_setTimelineProfilingEnabled(QWebPage* page, bool enabled)
+{
+    InspectorController* controller = page->handle()->page->inspectorController();
+    if (!controller)
+        return;
+    if (enabled)
+        controller->startTimelineProfiler();
+    else
+        controller->stopTimelineProfiler();
+}
+#endif
+void QWEBKIT_EXPORT qt_drt_enableCaretBrowsing(QWebPage* page, bool value)
+{
+    page->handle()->page->settings()->setCaretBrowsingEnabled(value);
+}
 …
+    }
+    virtual bool isQWidgetClient() const { return true; }
     virtual void scroll(int dx, int dy, const QRect&);
     virtual void update(const QRect& dirtyRect);
 …
     virtual int screenNumber() const;
     virtual QWidget* ownerWidget() const;
+    virtual QRect geometryRelativeToOwnerWidget() const;
     virtual QObject* pluginParent() const;
+    virtual QStyle* style() const;
+    virtual bool viewResizesToContentsEnabled() const { return false; }
     QWidget* view;
 …
+{
 #if defined(Q_WS_X11)
+    if (view)
+        return view->x11Info().screen();
+#endif
+    return view->x11Info().screen();
+#endif
     return 0;
+}
 …
+}
+QRect QWebPageWidgetClient::geometryRelativeToOwnerWidget() const
+{
+    return view->geometry();
+}
 QObject* QWebPageWidgetClient::pluginParent() const
+{
     return view;
+}
+QStyle* QWebPageWidgetClient::style() const
+{
+    return view->style();
+}
 …
     if (actions & Qt::CopyAction)
         result |= DragOperationCopy;
+    // DragOperationgeneric represents InternetExplorer's equivalent of Move operation,
+    // hence it should be considered as "move"
     if (actions & Qt::MoveAction)
         result |= DragOperationMove;
+        result |= (DragOperationMove | DragOperationGeneric);
     if (actions & Qt::LinkAction)
         result |= DragOperationLink;
 …
     else if (actions & DragOperationMove)
         result = Qt::MoveAction;
+    // DragOperationgeneric represents InternetExplorer's equivalent of Move operation,
+    // hence it should be considered as "move"
+    else if (actions & DragOperationGeneric)
+        result = Qt::MoveAction;
     else if (actions & DragOperationLink)
         result = Qt::LinkAction;
 …
     , view(0)
 #endif
+    , clickCausedFocus(false)
+    , viewportSize(QSize(0, 0))
     , inspectorFrontend(0)
     , inspector(0)
     , inspectorIsInternalOnly(false)
-    , viewportSize(QSize(0, 0))
-    , clickCausedFocus(false)
+{
     WebCore::InitializeLoggingChannelsIfNecessary();
     JSC::initializeThreading();
     WebCore::SecurityOrigin::setLocalLoadPolicy(WebCore::SecurityOrigin::AllowLocalLoadsForLocalAndSubstituteData);
+#if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)
+    WebCore::Font::setCodePath(WebCore::Font::Complex);
+#endif
     chromeClient = new ChromeClientQt(q);
 …
     editorClient = new EditorClientQt(q);
     page = new Page(chromeClient, contextMenuClient, editorClient,
                     new DragClientQt(q), new InspectorClientQt(q), 0);
+                    new DragClientQt(q), new InspectorClientQt(q), 0, 0);
     settings = new QWebSettings(page->settings());
 …
 #endif
     mainFrame = 0;
-#if QT_VERSION < 0x040400
-    networkInterface = 0;
-#else
     networkManager = 0;
-#endif
     pluginFactory = 0;
     insideOpenCall = false;
 …
+}
+#if QT_VERSION < 0x040400
+bool QWebPagePrivate::acceptNavigationRequest(QWebFrame *frame, const QWebNetworkRequest &request, QWebPage::NavigationType type)
+WebCore::Page* QWebPagePrivate::core(QWebPage* page)
+{
+    return page->d->page;
+}
+QWebPagePrivate* QWebPagePrivate::priv(QWebPage* page)
+{
+    return page->d;
+}
+bool QWebPagePrivate::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, QWebPage::NavigationType type)
+{
     if (insideOpenCall
 …
     return q->acceptNavigationRequest(frame, request, type);
+}
-#else
-bool QWebPagePrivate::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, QWebPage::NavigationType type)
+{
-    if (insideOpenCall
-        && frame == mainFrame)
-        return true;
-    return q->acceptNavigationRequest(frame, request, type);
+}
-#endif
 void QWebPagePrivate::createMainFrame()
 …
         case WebCore::ContextMenuItemTagItalic: return QWebPage::ToggleItalic;
         case WebCore::ContextMenuItemTagUnderline: return QWebPage::ToggleUnderline;
+#if ENABLE(INSPECTOR)
         case WebCore::ContextMenuItemTagInspectElement: return QWebPage::InspectElement;
+#endif
         default: break;
+    }
 …
         const QList<WebCore::ContextMenuItem> *items, QBitArray *visitedWebActions)
+{
+    QMenu* menu = new QMenu(q->view());
+    if (!client)
+        return 0;
+    QMenu* menu = new QMenu(client->ownerWidget());
     for (int i = 0; i < items->count(); ++i) {
         const ContextMenuItem &item = items->at(i);
 …
 #endif // QT_NO_CONTEXTMENU
+#ifndef QT_NO_ACTION
 void QWebPagePrivate::_q_webActionTriggered(bool checked)
+{
 …
     q->triggerAction(action, checked);
+}
+#endif // QT_NO_ACTION
 void QWebPagePrivate::_q_cleanupLeakMessages()
 …
 void QWebPagePrivate::updateAction(QWebPage::WebAction action)
+{
+#ifdef QT_NO_ACTION
+    Q_UNUSED(action)
+#else
     QAction *a = actions[action];
     if (!a || !mainFrame)
 …
     if (a->isCheckable())
         a->setChecked(checked);
+#endif // QT_NO_ACTION
+}
 …
         tripleClickTimer.stop();
     else
         q->QObject::timerEvent(ev);
+        q->timerEvent(ev);
+}
 …
         { QKeySequence::DeleteStartOfWord, QWebPage::DeleteStartOfWord },
         { QKeySequence::DeleteEndOfWord, QWebPage::DeleteEndOfWord },
-#if QT_VERSION >= 0x040500
         { QKeySequence::InsertParagraphSeparator, QWebPage::InsertParagraphSeparator },
         { QKeySequence::InsertLineSeparator, QWebPage::InsertLineSeparator },
-#endif
         { QKeySequence::SelectAll, QWebPage::SelectAll },
         { QKeySequence::UnknownKey, QWebPage::NoWebAction }
 …
         handled = true;
         QFont defaultFont;
         if (q->view())
             defaultFont = q->view()->font();
+        if (client)
+            defaultFont = client->ownerWidget()->font();
         QFontMetrics fm(defaultFont);
         if (!handleScrolling(ev, frame)) {
 …
     // focusInEvent() we can re-activate the frame.
     FocusController *focusController = page->focusController();
+    // Call setFocused first so that window.onblur doesn't get called twice
+    focusController->setFocused(false);
     focusController->setActive(false);
-    focusController->setFocused(false);
+}
 …
     ev->setDropAction(action);
     if (action != Qt::IgnoreAction)
         ev->accept();
+        ev->acceptProposedAction();
 #endif
+}
 …
     Qt::DropAction action = dragOpToDropAction(page->dragController()->dragEntered(&dragData));
     ev->setDropAction(action);
+    if (action != Qt::IgnoreAction)
+        ev->accept();
+    // We must accept this event in order to receive the drag move events that are sent
+    // while the drag and drop action is in progress.
+    ev->acceptProposedAction();
 #endif
+}
 …
     ev->setDropAction(action);
     if (action != Qt::IgnoreAction)
         ev->accept();
+        ev->acceptProposedAction();
 #endif
+}
 …
                       dropActionToDragOp(ev->possibleActions()));
     Qt::DropAction action = dragOpToDropAction(page->dragController()->dragUpdated(&dragData));
+    m_lastDropAction = action;
     ev->setDropAction(action);
+    if (action != Qt::IgnoreAction)
+        ev->accept();
+    // We must accept this event in order to receive the drag move events that are sent
+    // while the drag and drop action is in progress.
+    ev->acceptProposedAction();
 #endif
+}
 …
     DragData dragData(ev->mimeData(), ev->pos().toPoint(),
             QCursor::pos(), dropActionToDragOp(ev->possibleActions()));
+    Qt::DropAction action = dragOpToDropAction(page->dragController()->performDrag(&dragData));
+    if (action != Qt::IgnoreAction)
+        ev->accept();
+    if (page->dragController()->performDrag(&dragData))
+        ev->acceptProposedAction();
 #endif
+}
 …
+{
 #ifndef QT_NO_DRAGANDDROP
+    // Overwrite the defaults set by QDragManager::defaultAction()
+    ev->setDropAction(m_lastDropAction);
     DragData dragData(ev->mimeData(), ev->pos(), QCursor::pos(),
+                      dropActionToDragOp(ev->possibleActions()));
+    Qt::DropAction action = dragOpToDropAction(page->dragController()->performDrag(&dragData));
+    if (action != Qt::IgnoreAction)
+        ev->accept();
+                      dropActionToDragOp(Qt::DropAction(ev->dropAction())));
+    if (page->dragController()->performDrag(&dragData))
+        ev->acceptProposedAction();
 #endif
+}
 …
     WebCore::Frame *frame = page->focusController()->focusedOrMainFrame();
     WebCore::Editor *editor = frame->editor();
+#if QT_VERSION >= 0x040600
+    QInputMethodEvent::Attribute selection(QInputMethodEvent::Selection, 0, 0, QVariant());
+#endif
     if (!editor->canEdit()) {
 …
     Vector<CompositionUnderline> underlines;
+    bool hasSelection = false;
     for (int i = 0; i < ev->attributes().size(); ++i) {
 …
             QTextCharFormat textCharFormat = a.value.value<QTextFormat>().toCharFormat();
             QColor qcolor = textCharFormat.underlineColor();
             underlines.append(CompositionUnderline(a.start, a.length, Color(makeRGBA(qcolor.red(), qcolor.green(), qcolor.blue(), qcolor.alpha())), false));
+            underlines.append(CompositionUnderline(qMin(a.start, (a.start + a.length)), qMax(a.start, (a.start + a.length)), Color(makeRGBA(qcolor.red(), qcolor.green(), qcolor.blue(), qcolor.alpha())), false));
             break;
+        }
         case QInputMethodEvent::Cursor: {
             frame->setCaretVisible(a.length); //if length is 0 cursor is invisible
+            frame->selection()->setCaretVisible(a.length); //if length is 0 cursor is invisible
             if (a.length > 0) {
                 RenderObject* caretRenderer = frame->selection()->caretRenderer();
 …
 #if QT_VERSION >= 0x040600
         case QInputMethodEvent::Selection: {
+            if (renderTextControl) {
+                renderTextControl->setSelectionStart(qMin(a.start, (a.start + a.length)));
+                renderTextControl->setSelectionEnd(qMax(a.start, (a.start + a.length)));
+            selection = a;
+            hasSelection = true;
+            break;
+        }
+#endif
+        }
+    }
+    if (renderTextControl && ev->replacementLength() > 0) {
+        renderTextControl->setSelectionStart(qMax(renderTextControl->selectionStart() + ev->replacementStart(), 0));
+        renderTextControl->setSelectionEnd(qMin(renderTextControl->selectionStart() + ev->replacementLength(), static_cast<int>(renderTextControl->text().length())));
+        // Commit regardless of whether commitString is empty, to get rid of selection.
+        editor->confirmComposition(ev->commitString());
+    } else if (!ev->commitString().isEmpty()) {
+        editor->confirmComposition(ev->commitString());
+    }
+    // 1. empty preedit with a selection attribute, and start/end of 0 cancels composition
+    // 2. empty preedit with a selection attribute, and start/end of non-0 updates selection of current preedit text
+    // 3. populated preedit with a selection attribute, and start/end of 0 or non-0 updates selection of supplied preedit text
+    // 4. otherwise event is updating supplied pre-edit text
+    QString preedit = ev->preeditString();
+#if QT_VERSION >= 0x040600
+    if (hasSelection) {
+        QString text = (renderTextControl) ? QString(renderTextControl->text()) : QString();
+        if (preedit.isEmpty() && selection.start + selection.length > 0)
+            preedit = text;
+        editor->setComposition(preedit, underlines,
+                               (selection.length < 0) ? selection.start + selection.length : selection.start,
+                               (selection.length < 0) ? selection.start : selection.start + selection.length);
+    } else
+#endif
+        editor->setComposition(preedit, underlines, preedit.length(), 0);
+    ev->accept();
+}
+#ifndef QT_NO_PROPERTIES
+typedef struct {
+    const char* name;
+    double deferredRepaintDelay;
+    double initialDeferredRepaintDelayDuringLoading;
+    double maxDeferredRepaintDelayDuringLoading;
+    double deferredRepaintDelayIncrementDuringLoading;
+} QRepaintThrottlingPreset;
+void QWebPagePrivate::dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent* event)
+{
+    if (event->propertyName() == "_q_viewMode") {
+        QString mode = q->property("_q_viewMode").toString();
+        if (mode != viewMode) {
+            viewMode = mode;
+            WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+            WebCore::FrameView* view = frame->view();
+            frame->document()->updateStyleSelector();
+            view->forceLayout();
+        }
+    } else if (event->propertyName() == "_q_HTMLTokenizerChunkSize") {
+        int chunkSize = q->property("_q_HTMLTokenizerChunkSize").toInt();
+        q->handle()->page->setCustomHTMLTokenizerChunkSize(chunkSize);
+    } else if (event->propertyName() == "_q_HTMLTokenizerTimeDelay") {
+        double timeDelay = q->property("_q_HTMLTokenizerTimeDelay").toDouble();
+        q->handle()->page->setCustomHTMLTokenizerTimeDelay(timeDelay);
+    } else if (event->propertyName() == "_q_RepaintThrottlingDeferredRepaintDelay") {
+        double p = q->property("_q_RepaintThrottlingDeferredRepaintDelay").toDouble();
+        FrameView::setRepaintThrottlingDeferredRepaintDelay(p);
+    } else if (event->propertyName() == "_q_RepaintThrottlingnInitialDeferredRepaintDelayDuringLoading") {
+        double p = q->property("_q_RepaintThrottlingnInitialDeferredRepaintDelayDuringLoading").toDouble();
+        FrameView::setRepaintThrottlingnInitialDeferredRepaintDelayDuringLoading(p);
+    } else if (event->propertyName() == "_q_RepaintThrottlingMaxDeferredRepaintDelayDuringLoading") {
+        double p = q->property("_q_RepaintThrottlingMaxDeferredRepaintDelayDuringLoading").toDouble();
+        FrameView::setRepaintThrottlingMaxDeferredRepaintDelayDuringLoading(p);
+    } else if (event->propertyName() == "_q_RepaintThrottlingDeferredRepaintDelayIncrementDuringLoading") {
+        double p = q->property("_q_RepaintThrottlingDeferredRepaintDelayIncrementDuringLoading").toDouble();
+        FrameView::setRepaintThrottlingDeferredRepaintDelayIncrementDuringLoading(p);
+    } else if (event->propertyName() == "_q_RepaintThrottlingPreset") {
+        static const QRepaintThrottlingPreset presets[] = {
+            {   "NoThrottling",     0,      0,      0,      0 },
+            {   "Legacy",       0.025,      0,    2.5,    0.5 },
+            {   "Minimal",       0.01,      0,      1,    0.2 },
+            {   "Medium",       0.025,      1,      5,    0.5 },
+            {   "Heavy",          0.1,      2,     10,      1 }
+        };
+        QString p = q->property("_q_RepaintThrottlingPreset").toString();
+        for(int i = 0; i < sizeof(presets) / sizeof(presets[0]); i++) {
+            if(p == presets[i].name) {
+                FrameView::setRepaintThrottlingDeferredRepaintDelay(
+                        presets[i].deferredRepaintDelay);
+                FrameView::setRepaintThrottlingnInitialDeferredRepaintDelayDuringLoading(
+                        presets[i].initialDeferredRepaintDelayDuringLoading);
+                FrameView::setRepaintThrottlingMaxDeferredRepaintDelayDuringLoading(
+                        presets[i].maxDeferredRepaintDelayDuringLoading);
+                FrameView::setRepaintThrottlingDeferredRepaintDelayIncrementDuringLoading(
+                        presets[i].deferredRepaintDelayIncrementDuringLoading);
+                break;
+            }
-            break;
+        }
+#endif
+        }
+    }
+    if (!ev->commitString().isEmpty())
+        editor->confirmComposition(ev->commitString());
+    else if (!ev->preeditString().isEmpty()) {
+        QString preedit = ev->preeditString();
+        editor->setComposition(preedit, underlines, preedit.length(), 0);
+    }
+    ev->accept();
+}
+    }
+#if ENABLE(TILED_BACKING_STORE)
+    else if (event->propertyName() == "_q_TiledBackingStoreTileSize") {
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        if (!frame->tiledBackingStore())
+            return;
+        QSize tileSize = q->property("_q_TiledBackingStoreTileSize").toSize();
+        frame->tiledBackingStore()->setTileSize(tileSize);
+    } else if (event->propertyName() == "_q_TiledBackingStoreTileCreationDelay") {
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        if (!frame->tiledBackingStore())
+            return;
+        int tileCreationDelay = q->property("_q_TiledBackingStoreTileCreationDelay").toInt();
+        frame->tiledBackingStore()->setTileCreationDelay(static_cast<double>(tileCreationDelay) / 1000.);
+    } else if (event->propertyName() == "_q_TiledBackingStoreKeepAreaMultiplier") {
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        if (!frame->tiledBackingStore())
+            return;
+        FloatSize keepMultiplier;
+        FloatSize coverMultiplier;
+        frame->tiledBackingStore()->getKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
+        QSizeF qSize = q->property("_q_TiledBackingStoreKeepAreaMultiplier").toSizeF();
+        keepMultiplier = FloatSize(qSize.width(), qSize.height());
+        frame->tiledBackingStore()->setKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
+    } else if (event->propertyName() == "_q_TiledBackingStoreCoverAreaMultiplier") {
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        if (!frame->tiledBackingStore())
+            return;
+        FloatSize keepMultiplier;
+        FloatSize coverMultiplier;
+        frame->tiledBackingStore()->getKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
+        QSizeF qSize = q->property("_q_TiledBackingStoreCoverAreaMultiplier").toSizeF();
+        coverMultiplier = FloatSize(qSize.width(), qSize.height());
+        frame->tiledBackingStore()->setKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
+    }
+#endif
+}
+#endif
 void QWebPagePrivate::shortcutOverrideEvent(QKeyEvent* event)
 …
         direction = ScrollDown;
     } else if (ev == QKeySequence::MoveToPreviousPage
                || (ev->key() == Qt::Key_Space) && (ev->modifiers() & Qt::ShiftModifier)) {
+               || ((ev->key() == Qt::Key_Space) && (ev->modifiers() & Qt::ShiftModifier))) {
         granularity = ScrollByPage;
         direction = ScrollUp;
     } else
 #endif // QT_NO_SHORTCUT
     if (ev->key() == Qt::Key_Up && ev->modifiers() & Qt::ControlModifier
+    if ((ev->key() == Qt::Key_Up && ev->modifiers() & Qt::ControlModifier)
                || ev->key() == Qt::Key_Home) {
         granularity = ScrollByDocument;
         direction = ScrollUp;
     } else if (ev->key() == Qt::Key_Down && ev->modifiers() & Qt::ControlModifier
+    } else if ((ev->key() == Qt::Key_Down && ev->modifiers() & Qt::ControlModifier)
                || ev->key() == Qt::Key_End) {
         granularity = ScrollByDocument;
 …
+}
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+void QWebPagePrivate::touchEvent(QTouchEvent* event)
+{
+    WebCore::Frame* frame = QWebFramePrivate::core(mainFrame);
+    if (!frame->view())
+        return;
+    bool accepted = frame->eventHandler()->handleTouchEvent(PlatformTouchEvent(event));
+    event->setAccepted(accepted);
+}
+#endif
 /*!
   This method is used by the input method to query a set of properties of the page
 …
     switch (property) {
         case Qt::ImMicroFocus: {
+            return QVariant(frame->selection()->absoluteCaretBounds());
+            WebCore::FrameView* view = frame->view();
+            if (view && view->needsLayout()) {
+                // We can't access absoluteCaretBounds() while the view needs to layout.
+                return QVariant();
+            }
+            return QVariant(view->contentsToWindow(frame->selection()->absoluteCaretBounds()));
+        }
         case Qt::ImFont: {
 …
                     return QVariant(renderTextControl->selectionEnd() - TextIterator::rangeLength(range.get()));
+                }
                 return QVariant(renderTextControl->selectionEnd());
+                return QVariant(frame->selection()->extent().offsetInContainerNode());
+            }
             return QVariant();
 …
                     return QVariant(renderTextControl->selectionStart() - TextIterator::rangeLength(range.get()));
+                }
                 return QVariant(renderTextControl->selectionStart());
+                return QVariant(frame->selection()->base().offsetInContainerNode());
+            }
             return QVariant();
 …
 QWebInspector* QWebPagePrivate::getOrCreateInspector()
+{
+#if ENABLE(INSPECTOR)
     if (!inspector) {
         QWebInspector* insp = new QWebInspector;
 …
         Q_ASSERT(inspector); // Associated through QWebInspector::setPage(q)
+    }
+#endif
     return inspector;
+}
 …
 InspectorController* QWebPagePrivate::inspectorController()
+{
+#if ENABLE(INSPECTOR)
     return page->inspectorController();
+#else
+    return 0;
+#endif
+}
 …
    \enum QWebPage::FindFlag
    This enum describes the options available to QWebPage's findText() function. The options
+   This enum describes the options available to the findText() function. The options
    can be OR-ed together from the following list:
 …
     local filesystem or an equivalent - such as the Qt resource system - then linkClicked() is emitted.
     \value DelegateAllLinks Whenever a link is activated the linkClicked() signal is emitted.
+    \sa QWebPage::linkDelegationPolicy
 */
 …
     \value NavigationTypeFormResubmitted An HTML form was submitted a second time.
     \value NavigationTypeOther A navigation to another document using a method not listed above.
+    \sa acceptNavigationRequest()
 */
 …
     Actions only have an effect when they are applicable. The availability of
     actions can be be determined by checking \l{QAction::}{isEnabled()} on the
     action returned by \l{QWebPage::}{action()}.
+    action returned by action().
     One method of enabling the text editing, cursor movement, and text selection actions
 …
     \value Forward Navigate forward in the history of navigated links.
     \value Stop Stop loading the current page.
+    \value StopScheduledPageRefresh Stop all pending page refresh/redirect requests.
     \value Reload Reload the current page.
     \value ReloadAndBypassCache Reload the current page, but do not use any local cache. (Added in Qt 4.6)
 …
     \enum QWebPage::WebWindowType
+    This enum describes the types of window that can be created by the createWindow() function.
     \value WebBrowserWindow The window is a regular web browser window.
     \value WebModalDialog The window acts as modal dialog.
 …
     QWebPage's API is very similar to QWebView, as you are still provided with
+    common functions like action() (known as \l{QWebView::}{pageAction()} in
+    QWebView), triggerAction(), findText() and settings(). More QWebView-like
+    functions can be found in the main frame of QWebPage, obtained via
+    QWebPage::mainFrame(). For example, the load(), setUrl() and setHtml()
+    unctions for QWebPage can be accessed using QWebFrame.
+    common functions like action() (known as
+    \l{QWebView::pageAction()}{pageAction}() in QWebView), triggerAction(),
+    findText() and settings(). More QWebView-like functions can be found in the
+    main frame of QWebPage, obtained via the mainFrame() function. For example,
+    the \l{QWebFrame::load()}{load}(), \l{QWebFrame::setUrl()}{setUrl}() and
+    \l{QWebFrame::setHtml()}{setHtml}() functions for QWebPage can be accessed
+    using QWebFrame.
     The loadStarted() signal is emitted when the page begins to load.The
     loadProgress() signal, on the other hand, is emitted whenever an element
     of the web page completes loading, such as an embedded image, a script,
+    etc. Finally, the loadFinished() signal is emitted when the page has
+    loaded completely. Its argument, either true or false, indicates whether
+    or not the load operation succeeded.
+    etc. Finally, the loadFinished() signal is emitted when the page contents
+    are loaded completely, independent of script execution or page rendering.
+    Its argument, either true or false, indicates whether or not the load
+    operation succeeded.
     \section1 Using QWebPage in a Widget-less Environment
 …
     , d(new QWebPagePrivate(this))
+{
     setView(qobject_cast<QWidget *>(parent));
+    setView(qobject_cast<QWidget*>(parent));
     connect(this, SIGNAL(loadProgress(int)), this, SLOT(_q_onLoadProgressChanged(int)));
 …
     \since 4.6
+    Returns the frame at the given point \a pos.
+    Returns the frame at the given point \a pos, or 0 if there is no frame at
+    that position.
     \sa mainFrame(), currentFrame()
 …
     \sa view()
 */
+void QWebPage::setView(QWidget *view)
+{
+    if (this->view() != view) {
+        d->view = view;
+        if (!view) {
+            delete d->client;
+            d->client = 0;
+        } else {
+            if (!d->client)
+                d->client = new QWebPageWidgetClient(view);
+            else
+                static_cast<QWebPageWidgetClient*>(d->client)->view = view;
+        }
+        setViewportSize(view ? view->size() : QSize(0, 0));
+    }
+void QWebPage::setView(QWidget* view)
+{
+    if (this->view() == view)
+        return;
+    d->view = view;
+    setViewportSize(view ? view->size() : QSize(0, 0));
+    // If we have no client, we install a special client delegating
+    // the responsibility to the QWidget. This is the code path
+    // handling a.o. the "legacy" QWebView.
+    //
+    // If such a special delegate already exist, we substitute the view.
+    if (d->client) {
+        if (d->client->isQWidgetClient())
+            static_cast<QWebPageWidgetClient*>(d->client)->view = view;
+        return;
+    }
+    if (view)
+        d->client = new QWebPageWidgetClient(view);
+}
 …
     Q_UNUSED(frame)
 #ifndef QT_NO_MESSAGEBOX
+    QMessageBox::information(view(), tr("JavaScript Alert - %1").arg(mainFrame()->url().host()), msg, QMessageBox::Ok);
+    QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
+    QMessageBox::information(parent, tr("JavaScript Alert - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QMessageBox::Ok);
 #endif
+}
 …
     return true;
 #else
+    return QMessageBox::Yes == QMessageBox::information(view(), tr("JavaScript Confirm - %1").arg(mainFrame()->url().host()), msg, QMessageBox::Yes, QMessageBox::No);
+    QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
+    return QMessageBox::Yes == QMessageBox::information(parent, tr("JavaScript Confirm - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QMessageBox::Yes, QMessageBox::No);
 #endif
+}
 …
     user, the implementation should return true and the result string must not be null.
     The default implementation uses QInputDialog::getText.
+    The default implementation uses QInputDialog::getText().
 */
 bool QWebPage::javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result)
 …
     bool ok = false;
 #ifndef QT_NO_INPUTDIALOG
+    QString x = QInputDialog::getText(view(), tr("JavaScript Prompt - %1").arg(mainFrame()->url().host()), msg, QLineEdit::Normal, defaultValue, &ok);
+    QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
+    QString x = QInputDialog::getText(parent, tr("JavaScript Prompt - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QLineEdit::Normal, defaultValue, &ok);
     if (ok && result)
         *result = x;
 …
     return false;
 #else
+    return QMessageBox::Yes == QMessageBox::information(view(), tr("JavaScript Problem - %1").arg(mainFrame()->url().host()), tr("The script on this page appears to have a problem. Do you want to stop the script?"), QMessageBox::Yes, QMessageBox::No);
+    QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
+    return QMessageBox::Yes == QMessageBox::information(parent, tr("JavaScript Problem - %1").arg(mainFrame()->url().host()), tr("The script on this page appears to have a problem. Do you want to stop the script?"), QMessageBox::Yes, QMessageBox::No);
 #endif
+}
 …
     the request to QWebView's createWindow() function; otherwise it returns a null pointer.
+    If \a type is WebModalDialog, the application must call setWindowModality(Qt::ApplicationModal) on the new window.
     \sa acceptNavigationRequest()
 */
 QWebPage *QWebPage::createWindow(WebWindowType type)
+{
     QWebView *webView = qobject_cast<QWebView *>(view());
+    QWebView *webView = qobject_cast<QWebView*>(view());
     if (webView) {
         QWebView *newView = webView->createWindow(type);
 …
 /*!
     This function is called whenever WebKit encounters a HTML object element with type "application/x-qt-plugin".
     The \a classid, \a url, \a paramNames and \a paramValues correspond to the HTML object element attributes and
     child elements to configure the embeddable object.
+    This function is called whenever WebKit encounters a HTML object element with type "application/x-qt-plugin". It is
+    called regardless of the value of QWebSettings::PluginsEnabled. The \a classid, \a url, \a paramNames and \a paramValues
+    correspond to the HTML object element attributes and child elements to configure the embeddable object.
 */
 QObject *QWebPage::createPlugin(const QString &classid, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues)
 …
                 frameLoadRequest(url, frame), features))
             newPage->chrome()->show();
+    }
+}
+static void collectChildFrames(QWebFrame* frame, QList<QWebFrame*>& list)
+{
+    list << frame->childFrames();
+    QListIterator<QWebFrame*> it(frame->childFrames());
+    while (it.hasNext()) {
+        collectChildFrames(it.next(), list);
+    }
+}
 …
             break;
         case InspectElement: {
+#if ENABLE(INSPECTOR)
             if (!d->hitTestResult.isNull()) {
                 d->getOrCreateInspector(); // Make sure the inspector is created
 …
                 d->page->inspectorController()->inspect(d->hitTestResult.d->innerNonSharedNode.get());
+            }
+#endif
+            break;
+        }
+        case StopScheduledPageRefresh: {
+            QWebFrame* topFrame = mainFrame();
+            topFrame->d->frame->redirectScheduler()->cancel();
+            QList<QWebFrame*> childFrames;
+            collectChildFrames(topFrame, childFrames);
+            QListIterator<QWebFrame*> it(childFrames);
+            while (it.hasNext())
+                it.next()->d->frame->redirectScheduler()->cancel();
             break;
+        }
 …
     By default, for a newly-created Web page, this property contains a size with
     zero width and height.
+    \sa QWebFrame::render(), preferredContentsSize
 */
 void QWebPage::setViewportSize(const QSize &size) const
 …
         WebCore::FrameView* view = frame->d->frame->view();
         view->setFrameRect(QRect(QPoint(0, 0), size));
-        view->forceLayout();
         view->adjustViewSize();
+    }
 …
     \property QWebPage::preferredContentsSize
     \since 4.6
+    \brief the size of the fixed layout
+    The size affects the layout of the page in the viewport.  If set to a fixed size of
+x768 for example then webkit will layout the page as if the viewport were that size
+    rather than something different.
+    \brief the preferred size of the contents
+    If this property is set to a valid size, it is used to lay out the page.
+    If it is not set (the default), the viewport size is used instead.
+    \sa viewportSize
 */
 void QWebPage::setPreferredContentsSize(const QSize &size) const
 …
     \sa createWindow()
 */
-#if QT_VERSION >= 0x040400
 bool QWebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, QWebPage::NavigationType type)
-#else
-bool QWebPage::acceptNavigationRequest(QWebFrame *frame, const QWebNetworkRequest &request, QWebPage::NavigationType type)
-#endif
+{
     Q_UNUSED(frame)
 …
+}
+#ifndef QT_NO_ACTION
 /*!
    Returns a QAction for the specified WebAction \a action.
 …
     QString text;
     QIcon icon;
     QStyle *style = view() ? view()->style() : qApp->style();
+    QStyle *style = d->client ? d->client->style() : qApp->style();
     bool checkable = false;
 …
         case Back:
             text = contextMenuItemTagGoBack();
-#if QT_VERSION >= 0x040400
             icon = style->standardIcon(QStyle::SP_ArrowBack);
-#endif
             break;
         case Forward:
             text = contextMenuItemTagGoForward();
-#if QT_VERSION >= 0x040400
             icon = style->standardIcon(QStyle::SP_ArrowForward);
-#endif
             break;
         case Stop:
             text = contextMenuItemTagStop();
-#if QT_VERSION >= 0x040400
             icon = style->standardIcon(QStyle::SP_BrowserStop);
-#endif
             break;
         case Reload:
             text = contextMenuItemTagReload();
-#if QT_VERSION >= 0x040400
             icon = style->standardIcon(QStyle::SP_BrowserReload);
-#endif
             break;
 …
     return a;
+}
+#endif // QT_NO_ACTION
 /*!
     \property QWebPage::modified
     \brief whether the page contains unsubmitted form data
+    \brief whether the page contains unsubmitted form data, or the contents have been changed.
     By default, this property is false.
+    \sa contentsChanged(), contentEditable, undoStack()
 */
 bool QWebPage::isModified() const
 …
 /*!
     Returns a pointer to the undo stack used for editable content.
+    \sa modified
 */
 QUndoStack *QWebPage::undoStack() const
 …
         d->leaveEvent(ev);
         break;
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    case QEvent::TouchBegin:
+    case QEvent::TouchUpdate:
+    case QEvent::TouchEnd:
+        d->touchEvent(static_cast<QTouchEvent*>(ev));
+        break;
+#endif
+#ifndef QT_NO_PROPERTIES
+    case QEvent::DynamicPropertyChange:
+        d->dynamicPropertyChangeEvent(static_cast<QDynamicPropertyChangeEvent*>(ev));
+        break;
+#endif
     default:
         return QObject::event(ev);
 …
 /*!
     Similar to QWidget::focusNextPrevChild it focuses the next focusable web element
+    Similar to QWidget::focusNextPrevChild() it focuses the next focusable web element
     if \a next is true; otherwise the previous element is focused.
 …
     cursor. If disabled (the default) only HTML elements in the web page with their
     \c{contenteditable} attribute set are editable.
+    \sa modified, contentsChanged(), WebAction
 */
 void QWebPage::setContentEditable(bool editable)
 …
 void QWebPage::updatePositionDependentActions(const QPoint &pos)
+{
+#ifndef QT_NO_ACTION
     // First we disable all actions, but keep track of which ones were originally enabled.
     QBitArray originallyEnabledWebActions(QWebPage::WebActionCount);
 …
+        }
+    }
+#endif // QT_NO_ACTION
     d->createMainFrame();
 …
     WebCore::ContextMenu menu(result);
     menu.populate();
+#if ENABLE(INSPECTOR)
     if (d->page->inspectorController()->enabled())
         menu.addInspectElementItem();
+#endif
     QBitArray visitedWebActions(QWebPage::WebActionCount);
 …
 #endif // QT_NO_CONTEXTMENU
+#ifndef QT_NO_ACTION
     // Finally, we restore the original enablement for the actions that were not put into the menu.
     originallyEnabledWebActions &= ~visitedWebActions; // Mask out visited actions (they're part of the menu)
 …
+        }
+    }
+#endif // QT_NO_ACTION
     // This whole process ensures that any actions put into to the context menu has the right
 …
     file selection is allowed.
+    \omitvalue ErrorPageExtension (introduced in Qt 4.6)
+    \value ErrorPageExtension Whether the web page can provide an error page when loading fails.
+    (introduced in Qt 4.6)
+    \sa ChooseMultipleFilesExtensionOption, ChooseMultipleFilesExtensionReturn, ErrorPageExtensionOption, ErrorPageExtensionReturn
 */
 …
     \enum QWebPage::ErrorDomain
     \since 4.6
+    \internal
+    \value QtNetwork
+    \value Http
+    \value WebKit
+    This enum describes the domain of an ErrorPageExtensionOption object (i.e. the layer in which the error occurred).
+    \value QtNetwork The error occurred in the QtNetwork layer; the error code is of type QNetworkReply::NetworkError.
+    \value Http The error occurred in the HTTP layer; the error code is a HTTP status code (see QNetworkRequest::HttpStatusCodeAttribute).
+    \value WebKit The error is an internal WebKit error.
 */
 …
     \inmodule QtWebKit
+    \sa QWebPage::extension()
+    \sa QWebPage::extension() QWebPage::ExtensionReturn
+*/
+/*!
+    \class QWebPage::ExtensionReturn
+    \since 4.4
+    \brief The ExtensionReturn class provides an output result from a QWebPage's extension.
+    \inmodule QtWebKit
+    \sa QWebPage::extension() QWebPage::ExtensionOption
 */
 …
     \inmodule QtWebKit
     The ErrorPageExtensionOption class holds the \a url for which an error occoured as well as
+    The ErrorPageExtensionOption class holds the \a url for which an error occurred as well as
     the associated \a frame.
     The error itself is reported by an error \a domain, the \a error code as well as \a errorString.
+    \sa QWebPage::ErrorPageExtensionReturn
+    \sa QWebPage::extension() QWebPage::ErrorPageExtensionReturn
+*/
+/*!
+    \variable QWebPage::ErrorPageExtensionOption::url
+    \brief the url for which an error occurred
+*/
+/*!
+    \variable QWebPage::ErrorPageExtensionOption::frame
+    \brief the frame associated with the error
+*/
+/*!
+    \variable QWebPage::ErrorPageExtensionOption::domain
+    \brief the domain that reported the error
+*/
+/*!
+    \variable QWebPage::ErrorPageExtensionOption::error
+    \brief the error code. Interpretation of the value depends on the \a domain
+    \sa QWebPage::ErrorDomain
+*/
+/*!
+    \variable QWebPage::ErrorPageExtensionOption::errorString
+    \brief a string that describes the error
 */
 …
     \a baseUrl.
     \sa QWebPage::ErrorPageExtensionOption, QString::toUtf8()
+    \sa QWebPage::extension() QWebPage::ErrorPageExtensionOption, QString::toUtf8()
 */
 …
     Constructs a new error page object.
+*/
+/*!
+    \variable QWebPage::ErrorPageExtensionReturn::contentType
+    \brief the error page's content type
+*/
+/*!
+    \variable QWebPage::ErrorPageExtensionReturn::encoding
+    \brief the error page encoding
+*/
+/*!
+    \variable QWebPage::ErrorPageExtensionReturn::baseUrl
+    \brief the base url
+    External objects such as stylesheets or images referenced in the HTML are located relative to this url.
+*/
+/*!
+    \variable QWebPage::ErrorPageExtensionReturn::content
+    \brief the HTML content of the error page
 */
 …
     and the suggested filenames which might be provided.
+    \sa QWebPage::chooseFile(), QWebPage::ChooseMultipleFilesExtensionReturn
+    \sa QWebPage::extension() QWebPage::chooseFile(), QWebPage::ChooseMultipleFilesExtensionReturn
+*/
+/*!
+    \variable QWebPage::ChooseMultipleFilesExtensionOption::parentFrame
+    \brief The frame in which the request originated
+*/
+/*!
+    \variable QWebPage::ChooseMultipleFilesExtensionOption::suggestedFileNames
+    \brief The suggested filenames
+*/
+/*!
+    \variable QWebPage::ChooseMultipleFilesExtensionReturn::fileNames
+    \brief The selected filenames
 */
 …
     when the extension is invoked.
     \sa QWebPage::ChooseMultipleFilesExtensionOption
+    \sa QWebPage::extension() QWebPage::ChooseMultipleFilesExtensionOption
 */
 …
     argument is provided as input to the extension; the output results can be stored in \a output.
+    The behavior of this function is determined by \a extension.
+    The behavior of this function is determined by \a extension. The \a option
+    and \a output values are typically casted to the corresponding types (for
+    example, ChooseMultipleFilesExtensionOption and
+    ChooseMultipleFilesExtensionReturn for ChooseMultipleFilesExtension).
     You can call supportsExtension() to check if an extension is supported by the page.
 …
         // FIXME: do not ignore suggestedFiles
         QStringList suggestedFiles = static_cast<const ChooseMultipleFilesExtensionOption*>(option)->suggestedFileNames;
+        QStringList names = QFileDialog::getOpenFileNames(view(), QString::null);
+        QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
+        QStringList names = QFileDialog::getOpenFileNames(parent, QString::null);
         static_cast<ChooseMultipleFilesExtensionReturn*>(output)->fileNames = names;
         return true;
 …
             return d->page->markAllMatchesForText(subString, caseSensitivity, true, 0);
     } else {
+        if (subString.isEmpty()) {
+            d->page->mainFrame()->selection()->clear();
+            Frame* frame = d->page->mainFrame()->tree()->firstChild();
+            while (frame) {
+                frame->selection()->clear();
+                frame = frame->tree()->traverseNextWithWrap(false);
+            }
+        }
         ::FindDirection direction = ::FindDirectionForward;
         if (options & FindBackward)
 …
     A suggested filename may be provided in \a suggestedFile. The frame originating the
     request is provided as \a parentFrame.
+    \sa ChooseMultipleFilesExtension
 */
 QString QWebPage::chooseFile(QWebFrame *parentFrame, const QString& suggestedFile)
 …
     Q_UNUSED(parentFrame)
 #ifndef QT_NO_FILEDIALOG
+    return QFileDialog::getOpenFileName(view(), QString::null, suggestedFile);
+    QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
+    return QFileDialog::getOpenFileName(parent, QString::null, suggestedFile);
 #else
     return QString::null;
 #endif
+}
-#if QT_VERSION < 0x040400 && !defined qdoc
-void QWebPage::setNetworkInterface(QWebNetworkInterface *interface)
+{
-    d->networkInterface = interface;
+}
-QWebNetworkInterface *QWebPage::networkInterface() const
+{
-    if (d->networkInterface)
-        return d->networkInterface;
-    else
-        return QWebNetworkInterface::defaultInterface();
+}
-#ifndef QT_NO_NETWORKPROXY
-void QWebPage::setNetworkProxy(const QNetworkProxy& proxy)
+{
-    d->networkProxy = proxy;
+}
-QNetworkProxy QWebPage::networkProxy() const
+{
-    return d->networkProxy;
+}
-#endif
-#else
 /*!
 …
     return d->networkManager;
+}
-#endif
 /*!
 …
     \endlist
 */
+QString QWebPage::userAgentForUrl(const QUrl& url) const
+{
+    Q_UNUSED(url)
+    QString ua = QLatin1String("Mozilla/5.0 ("
+QString QWebPage::userAgentForUrl(const QUrl&) const
+{
+    // splitting the string in three and user QStringBuilder is better than using QString::arg()
+    static QString firstPart;
+    static QString secondPart;
+    static QString thirdPart;
+    if (firstPart.isNull() || secondPart.isNull() || thirdPart.isNull()) {
+        QString firstPartTemp;
+        firstPartTemp.reserve(150);
+        firstPartTemp += QString::fromLatin1("Mozilla/5.0 ("
     // Platform
 #ifdef Q_WS_MAC
     "Macintosh"
+        "Macintosh"
 #elif defined Q_WS_QWS
     "QtEmbedded"
+        "QtEmbedded"
 #elif defined Q_WS_WIN
     "Windows"
+        "Windows"
 #elif defined Q_WS_X11
     "X11"
+        "X11"
 #elif defined Q_OS_SYMBIAN
     "Symbian"
+        "Symbian"
 #elif defined Q_OS_OS2
     "OS/2"
+        "OS/2"
 #else
+    "Unknown"
+#endif
+    // Placeholder for Platform Version
+    "%1; "
+    // Placeholder for security strength (N or U)
+    "%2; "
+    // Subplatform"
+        "Unknown"
+#endif
+    );
+#if defined Q_OS_SYMBIAN
+        QSysInfo::SymbianVersion symbianVersion = QSysInfo::symbianVersion();
+        switch (symbianVersion) {
+        case QSysInfo::SV_9_2:
+            firstPartTemp += QString::fromLatin1("OS/9.2");
+            break;
+        case QSysInfo::SV_9_3:
+            firstPartTemp += QString::fromLatin1("OS/9.3");
+            break;
+        case QSysInfo::SV_9_4:
+            firstPartTemp += QString::fromLatin1("OS/9.4");
+            break;
+        case QSysInfo::SV_SF_2:
+            firstPartTemp += QString::fromLatin1("/2");
+            break;
+        case QSysInfo::SV_SF_3:
+            firstPartTemp += QString::fromLatin1("/3");
+            break;
+        case QSysInfo::SV_SF_4:
+            firstPartTemp += QString::fromLatin1("/4");
+        default:
+            break;
+        }
+#endif
+        firstPartTemp += QString::fromLatin1("; ");
+        // SSL support
+#if !defined(QT_NO_OPENSSL)
+        // we could check QSslSocket::supportsSsl() here, but this makes
+        // OpenSSL, certificates etc being loaded in all cases were QWebPage
+        // is used. This loading is not needed for non-https.
+        firstPartTemp += QString::fromLatin1("U; ");
+        // this may lead to a false positive: We indicate SSL since it is
+        // compiled in even though supportsSsl() might return false
+#else
+        firstPartTemp += QString::fromLatin1("N; ");
+#endif
+        // Operating system
 #ifdef Q_OS_AIX
     "AIX"
+        firstPartTemp += QString::fromLatin1("AIX");
 #elif defined Q_OS_WIN32
+    "%3"
+        switch (QSysInfo::WindowsVersion) {
+        case QSysInfo::WV_32s:
+            firstPartTemp += QString::fromLatin1("Windows 3.1");
+            break;
+        case QSysInfo::WV_95:
+            firstPartTemp += QString::fromLatin1("Windows 95");
+            break;
+        case QSysInfo::WV_98:
+            firstPartTemp += QString::fromLatin1("Windows 98");
+            break;
+        case QSysInfo::WV_Me:
+            firstPartTemp += QString::fromLatin1("Windows 98; Win 9x 4.90");
+            break;
+        case QSysInfo::WV_NT:
+            firstPartTemp += QString::fromLatin1("WinNT4.0");
+            break;
+        case QSysInfo::WV_2000:
+            firstPartTemp += QString::fromLatin1("Windows NT 5.0");
+            break;
+        case QSysInfo::WV_XP:
+            firstPartTemp += QString::fromLatin1("Windows NT 5.1");
+            break;
+        case QSysInfo::WV_2003:
+            firstPartTemp += QString::fromLatin1("Windows NT 5.2");
+            break;
+        case QSysInfo::WV_VISTA:
+            firstPartTemp += QString::fromLatin1("Windows NT 6.0");
+            break;
+         case QSysInfo::WV_WINDOWS7:
+            firstPartTemp += QString::fromLatin1("Windows NT 6.1");
+            break;
+         case QSysInfo::WV_CE:
+            firstPartTemp += QString::fromLatin1("Windows CE");
+            break;
+         case QSysInfo::WV_CENET:
+            firstPartTemp += QString::fromLatin1("Windows CE .NET");
+            break;
+         case QSysInfo::WV_CE_5:
+            firstPartTemp += QString::fromLatin1("Windows CE 5.x");
+            break;
+         case QSysInfo::WV_CE_6:
+            firstPartTemp += QString::fromLatin1("Windows CE 6.x");
+            break;
+        }
+#elifif defined Q_OS_OS2
+        switch (QSysInfo::os2Version()) {
+        default:
+        case QSysInfo::OV_Unknown:
+            firstPartTemp += QLatin1String("Unknown"); break;
+        case QSysInfo::OV_2_0:
+            firstPartTemp += QLatin1String("2.0"); break;
+        case QSysInfo::OV_2_1:
+            firstPartTemp += QLatin1String("2.1"); break;
+        case QSysInfo::OV_2_11:
+            firstPartTemp += QLatin1String("2.11"); break;
+        case QSysInfo::OV_3_0:
+            firstPartTemp += QLatin1String("Warp 3"); break;
+        case QSysInfo::OV_4_0:
+            firstPartTemp += QLatin1String("Warp 4"); break;
+        case QSysInfo::OV_4_5:
+            firstPartTemp += QLatin1String("Warp 4.5"); break;
+        case QSysInfo::OV_4_52:
+            firstPartTemp += QLatin1String("Warp 4.52"); break;
+        case QSysInfo::OV_ECS_Unknown:
+            firstPartTemp += QLatin1String("eCS"); break;
+        case QSysInfo::OV_ECS_1_0:
+            firstPartTemp += QLatin1String("eCS 1.0"); break;
+        case QSysInfo::OV_ECS_1_1:
+            firstPartTemp += QLatin1String("eCS 1.1"); break;
+        case QSysInfo::OV_ECS_1_2:
+            firstPartTemp += QLatin1String("eCS 1.2"); break;
+        case QSysInfo::OV_ECS_2_0:
+            firstPartTemp += QLatin1String("eCS 2.0"); break;
+        }
 #elif defined Q_OS_DARWIN
 #ifdef __i386__ || __x86_64__
     "Intel Mac OS X"
+        firstPartTemp += QString::fromLatin1("Intel Mac OS X");
 #else
     "PPC Mac OS X"
+        firstPartTemp += QString::fromLatin1("PPC Mac OS X");
 #endif
 #elif defined Q_OS_BSDI
     "BSD"
+        firstPartTemp += QString::fromLatin1("BSD");
 #elif defined Q_OS_BSD4
     "BSD Four"
+        firstPartTemp += QString::fromLatin1("BSD Four");
 #elif defined Q_OS_CYGWIN
     "Cygwin"
+        firstPartTemp += QString::fromLatin1("Cygwin");
 #elif defined Q_OS_DGUX
     "DG/UX"
+        firstPartTemp += QString::fromLatin1("DG/UX");
 #elif defined Q_OS_DYNIX
     "DYNIX/ptx"
+        firstPartTemp += QString::fromLatin1("DYNIX/ptx");
 #elif defined Q_OS_FREEBSD
     "FreeBSD"
+        firstPartTemp += QString::fromLatin1("FreeBSD");
 #elif defined Q_OS_HPUX
     "HP-UX"
+        firstPartTemp += QString::fromLatin1("HP-UX");
 #elif defined Q_OS_HURD
     "GNU Hurd"
+        firstPartTemp += QString::fromLatin1("GNU Hurd");
 #elif defined Q_OS_IRIX
     "SGI Irix"
+        firstPartTemp += QString::fromLatin1("SGI Irix");
 #elif defined Q_OS_LINUX
+    "Linux"
+#if defined(__x86_64__)
+        firstPartTemp += QString::fromLatin1("Linux x86_64");
+#elif defined(__i386__)
+        firstPartTemp += QString::fromLatin1("Linux i686");
+#else
+        firstPartTemp += QString::fromLatin1("Linux");
+#endif
 #elif defined Q_OS_LYNX
     "LynxOS"
+        firstPartTemp += QString::fromLatin1("LynxOS");
 #elif defined Q_OS_NETBSD
     "NetBSD"
+        firstPartTemp += QString::fromLatin1("NetBSD");
 #elif defined Q_OS_OS2
     "%3"
+        firstPartTemp += QString::fromLatin1("OS/2");
 #elif defined Q_OS_OPENBSD
     "OpenBSD"
+        firstPartTemp += QString::fromLatin1("OpenBSD");
 #elif defined Q_OS_OS2EMX
     "OS/2"
+        firstPartTemp += QString::fromLatin1("OS/2");
 #elif defined Q_OS_OSF
     "HP Tru64 UNIX"
+        firstPartTemp += QString::fromLatin1("HP Tru64 UNIX");
 #elif defined Q_OS_QNX6
     "QNX RTP Six"
+        firstPartTemp += QString::fromLatin1("QNX RTP Six");
 #elif defined Q_OS_QNX
     "QNX"
+        firstPartTemp += QString::fromLatin1("QNX");
 #elif defined Q_OS_RELIANT
     "Reliant UNIX"
+        firstPartTemp += QString::fromLatin1("Reliant UNIX");
 #elif defined Q_OS_SCO
     "SCO OpenServer"
+        firstPartTemp += QString::fromLatin1("SCO OpenServer");
 #elif defined Q_OS_SOLARIS
     "Sun Solaris"
+        firstPartTemp += QString::fromLatin1("Sun Solaris");
 #elif defined Q_OS_ULTRIX
+    "DEC Ultrix"
+#elif defined Q_WS_S60
+    ""
+        firstPartTemp += QString::fromLatin1("DEC Ultrix");
+#elif defined Q_OS_SYMBIAN
+        firstPartTemp += QLatin1Char(' ');
+        QSysInfo::S60Version s60Version = QSysInfo::s60Version();
+        switch (s60Version) {
+        case QSysInfo::SV_S60_3_1:
+            firstPartTemp += QString::fromLatin1("Series60/3.1");
+            break;
+        case QSysInfo::SV_S60_3_2:
+            firstPartTemp += QString::fromLatin1("Series60/3.2");
+            break;
+        case QSysInfo::SV_S60_5_0:
+            firstPartTemp += QString::fromLatin1("Series60/5.0");
+            break;
+        default:
+            break;
+        }
 #elif defined Q_OS_UNIX
     "UNIX BSD/SYSV system"
+        firstPartTemp += QString::fromLatin1("UNIX BSD/SYSV system");
 #elif defined Q_OS_UNIXWARE
     "UnixWare Seven, Open UNIX Eight"
+        firstPartTemp += QString::fromLatin1("UnixWare Seven, Open UNIX Eight");
 #else
+    "Unknown"
+#endif
+    // Placeholder for SubPlatform Version
+    "%4; ");
+    // Platform Version
+    QString osVer;
+#ifdef Q_OS_SYMBIAN
+    QSysInfo::SymbianVersion symbianVersion = QSysInfo::symbianVersion();
+    switch (symbianVersion) {
+    case QSysInfo::SV_9_2:
+        osVer = "OS/9.2";
+        break;
+    case QSysInfo::SV_9_3:
+        osVer = "OS/9.3";
+        break;
+    case QSysInfo::SV_9_4:
+        osVer = "OS/9.4";
+        break;
+    case QSysInfo::SV_SF_2:
+        osVer = "/2";
+        break;
+    case QSysInfo::SV_SF_3:
+        osVer = "/3";
+        break;
+    case QSysInfo::SV_SF_4:
+        osVer = "/4";
+        break;
+    default:
+        osVer = "";
+    }
+#endif
+    ua = ua.arg(osVer);
+    QChar securityStrength(QLatin1Char('N'));
+#if !defined(QT_NO_OPENSSL)
+    // we could check QSslSocket::supportsSsl() here, but this makes
+    // OpenSSL, certificates etc being loaded in all cases were QWebPage
+    // is used. This loading is not needed for non-https.
+    securityStrength = QLatin1Char('U');
+    // this may lead to a false positive: We indicate SSL since it is
+    // compiled in even though supportsSsl() might return false
+#endif
+    ua = ua.arg(securityStrength);
+#if defined Q_OS_WIN32
+    QString ver;
+    switch (QSysInfo::WindowsVersion) {
+        case QSysInfo::WV_32s:
+            ver = "Windows 3.1";
+            break;
+        case QSysInfo::WV_95:
+            ver = "Windows 95";
+            break;
+        case QSysInfo::WV_98:
+            ver = "Windows 98";
+            break;
+        case QSysInfo::WV_Me:
+            ver = "Windows 98; Win 9x 4.90";
+            break;
+        case QSysInfo::WV_NT:
+            ver = "WinNT4.0";
+            break;
+        case QSysInfo::WV_2000:
+            ver = "Windows NT 5.0";
+            break;
+        case QSysInfo::WV_XP:
+            ver = "Windows NT 5.1";
+            break;
+        case QSysInfo::WV_2003:
+            ver = "Windows NT 5.2";
+            break;
+        case QSysInfo::WV_VISTA:
+            ver = "Windows NT 6.0";
+            break;
+#if QT_VERSION > 0x040500
+        case QSysInfo::WV_WINDOWS7:
+            ver = "Windows NT 6.1";
+            break;
+#endif
+        case QSysInfo::WV_CE:
+            ver = "Windows CE";
+            break;
+        case QSysInfo::WV_CENET:
+            ver = "Windows CE .NET";
+            break;
+        case QSysInfo::WV_CE_5:
+            ver = "Windows CE 5.x";
+            break;
+        case QSysInfo::WV_CE_6:
+            ver = "Windows CE 6.x";
+            break;
+    }
+    ua = QString(ua).arg(ver);
+#endif
+#if defined Q_OS_OS2
+    QString ver;
+    switch (QSysInfo::os2Version()) {
+        default:
+        case QSysInfo::OV_Unknown:
+            ver = QLatin1String("Unknown"); break;
+        case QSysInfo::OV_2_0:
+            ver = QLatin1String("2.0"); break;
+        case QSysInfo::OV_2_1:
+            ver = QLatin1String("2.1"); break;
+        case QSysInfo::OV_2_11:
+            ver = QLatin1String("2.11"); break;
+        case QSysInfo::OV_3_0:
+            ver = QLatin1String("Warp 3"); break;
+        case QSysInfo::OV_4_0:
+            ver = QLatin1String("Warp 4"); break;
+        case QSysInfo::OV_4_5:
+            ver = QLatin1String("Warp 4.5"); break;
+        case QSysInfo::OV_4_52:
+            ver = QLatin1String("Warp 4.52"); break;
+        case QSysInfo::OV_ECS_Unknown:
+            ver = QLatin1String("eCS"); break;
+        case QSysInfo::OV_ECS_1_0:
+            ver = QLatin1String("eCS 1.0"); break;
+        case QSysInfo::OV_ECS_1_1:
+            ver = QLatin1String("eCS 1.1"); break;
+        case QSysInfo::OV_ECS_1_2:
+            ver = QLatin1String("eCS 1.2"); break;
+        case QSysInfo::OV_ECS_2_0:
+            ver = QLatin1String("eCS 2.0"); break;
+    }
+    ua = QString(ua).arg(ver);
+#endif
+    // SubPlatform Version
+    QString subPlatformVer;
+#ifdef Q_WS_S60
+    QSysInfo::S60Version s60Version = QSysInfo::s60Version();
+    switch (s60Version) {
+    case QSysInfo::SV_S60_3_1:
+        subPlatformVer = "Series60/3.1";
+        break;
+    case QSysInfo::SV_S60_3_2:
+        subPlatformVer = "Series60/3.2";
+        break;
+    case QSysInfo::SV_S60_5_0:
+        subPlatformVer = "Series60/5.0";
+        break;
+    default:
+        subPlatformVer = "";
+    }
+#endif
+    ua = ua.arg(subPlatformVer);
+        firstPartTemp += QString::fromLatin1("Unknown");
+#endif
+        // language is the split
+        firstPartTemp += QString::fromLatin1("; ");
+        firstPartTemp.squeeze();
+        firstPart = firstPartTemp;
+        QString secondPartTemp;
+        secondPartTemp.reserve(150);
+        secondPartTemp += QString::fromLatin1(") ");
+        // webkit/qt version
+        secondPartTemp += QString::fromLatin1("AppleWebKit/");
+        secondPartTemp += qWebKitVersion();
+        secondPartTemp += QString::fromLatin1(" (KHTML, like Gecko) ");
+        // Application name split the third part
+        secondPartTemp.squeeze();
+        secondPart = secondPartTemp;
+        QString thirdPartTemp;
+        thirdPartTemp.reserve(150);
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
+        thirdPartTemp += QLatin1String(" Mobile Safari/");
+#else
+        thirdPartTemp += QLatin1String(" Safari/");
+#endif
+        thirdPartTemp += qWebKitVersion();
+        thirdPartTemp.squeeze();
+        thirdPart = thirdPartTemp;
+        Q_ASSERT(!firstPart.isNull());
+        Q_ASSERT(!secondPart.isNull());
+        Q_ASSERT(!thirdPart.isNull());
+    }
     // Language
+    QLocale locale;
+    if (view())
+        locale = view()->locale();
+    QString name = locale.name();
+    name.replace(QLatin1Char('_'), QLatin1Char('-'));
+    ua.append(name);
+    ua.append(QLatin1String(") "));
+    // webkit/qt version
+    ua.append(QString(QLatin1String("AppleWebKit/%1 (KHTML, like Gecko) "))
+                      .arg(QString(qWebKitVersion())));
+    QString languageName;
+    if (d->client && d->client->ownerWidget())
+        languageName = d->client->ownerWidget()->locale().name();
+    else
+        languageName = QLocale().name();
+    languageName.replace(QLatin1Char('_'), QLatin1Char('-'));
     // Application name/version
     QString appName = QCoreApplication::applicationName();
     if (!appName.isEmpty()) {
-        ua.append(appName);
-#if QT_VERSION >= 0x040400
         QString appVer = QCoreApplication::applicationVersion();
         if (!appVer.isEmpty())
+            ua.append(QLatin1Char('/') + appVer);
+#endif
+            appName.append(QLatin1Char('/') + appVer);
     } else {
         // Qt version
+        ua.append(QLatin1String("Qt/"));
+        ua.append(QLatin1String(qVersion()));
+    }
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
+    ua.append(QString(QLatin1String(" Mobile Safari/%1"))
+                      .arg(qWebKitVersion()));
+#else
+    ua.append(QString(QLatin1String(" Safari/%1"))
+                      .arg(qWebKitVersion()));
+#endif
+    return ua;
+        appName = QString::fromLatin1("Qt/") + QString::fromLatin1(qVersion());
+    }
+    return firstPart + languageName + secondPart + appName + thirdPart;
+}
 …
     Returns the number of bytes that were received from the network to render the current page.
     \sa totalBytes()
+    \sa totalBytes(), loadProgress()
 */
 quint64 QWebPage::bytesReceived() const
 …
     \fn void QWebPage::loadStarted()
     This signal is emitted when a new load of the page is started.
+    This signal is emitted when a page starts loading content.
     \sa loadFinished()
 …
     \fn void QWebPage::loadFinished(bool ok)
+    This signal is emitted when a load of the page is finished.
+    This signal is emitted when the page finishes loading content. This signal
+    is independant of script execution or page rendering.
     \a ok will indicate whether the load was successful or any error occurred.
     \sa loadStarted()
+    \sa loadStarted(), ErrorPageExtension
 */
 …
     This signal is emitted whenever the page creates a new \a frame.
+    \sa currentFrame()
 */
 …
     \fn void QWebPage::selectionChanged()
+    This signal is emitted whenever the selection changes.
+    This signal is emitted whenever the selection changes, either interactively
+    or programmatically (e.g. by calling triggerAction() with a selection action).
     \sa selectedText()
 …
     as well as other editable content.
     \sa contentEditable, QWebFrame::toHtml(), QWebFrame::toPlainText()
+    \sa contentEditable, modified, QWebFrame::toHtml(), QWebFrame::toPlainText()
 */
 …
     \fn void QWebPage::unsupportedContent(QNetworkReply *reply)
+    This signal is emitted when WebKit cannot handle a link the user navigated to.
+    This signal is emitted when WebKit cannot handle a link the user navigated to or a
+    web server's response includes a "Content-Disposition" header with the 'attachment'
+    directive. If "Content-Disposition" is present in \a reply, the web server is indicating
+    that the client should prompt the user to save the content regardless of content-type.
+    See RFC 2616 sections 19.5.1 for details about Content-Disposition.
     At signal emission time the meta-data of the QNetworkReply \a reply is available.
 …
     This signal is emitted when for example the position of the cursor in an editable form
     element changes. It is used inform input methods about the new on-screen position where
     the user is able to enter text. This signal is usually connected to QWidget's updateMicroFocus()
     slot.
+    element changes. It is used to inform input methods about the new on-screen position where
+    the user is able to enter text. This signal is usually connected to the
+    QWidget::updateMicroFocus() slot.
 */
 …
     This signal is emitted whenever the web site shown in \a frame is asking to store data
     to the database \a databaseName and the quota allocated to that web site is exceeded.
+    \sa QWebDatabase
 */

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h

-              r561
+              r846
     class FrameLoaderClientQt;
     class InspectorClientQt;
+    class InspectorFrontendClientQt;
     class ResourceHandle;
     class HitTestResult;
 …
         AlignRight,
+        StopScheduledPageRefresh,
         WebActionCount
     };
 …
 #endif
-#if QT_VERSION < 0x040400 && !defined(qdoc)
-    void setNetworkInterface(QWebNetworkInterface *interface);
-    QWebNetworkInterface *networkInterface() const;
-    // #### why is this in the page itself?
-#ifndef QT_NO_NETWORKPROXY
-    void setNetworkProxy(const QNetworkProxy& proxy);
-    QNetworkProxy networkProxy() const;
-#endif
-#else
     void setNetworkAccessManager(QNetworkAccessManager *manager);
     QNetworkAccessManager *networkAccessManager() const;
-#endif
     void setPluginFactory(QWebPluginFactory *factory);
 …
     QString selectedText() const;
+#ifndef QT_NO_ACTION
     QAction *action(WebAction action) const;
+#endif
     virtual void triggerAction(WebAction action, bool checked = false);
 …
     void menuBarVisibilityChangeRequested(bool visible);
-#if QT_VERSION >= 0x040400
     void unsupportedContent(QNetworkReply *reply);
     void downloadRequested(const QNetworkRequest &request);
-#endif
     void microFocusChanged();
 …
     virtual QObject *createPlugin(const QString &classid, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
-#if QT_VERSION >= 0x040400
     virtual bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type);
-#else
-    virtual bool acceptNavigationRequest(QWebFrame *frame, const QWebNetworkRequest &request, NavigationType type);
-#endif
     virtual QString chooseFile(QWebFrame *originatingFrame, const QString& oldFile);
     virtual void javaScriptAlert(QWebFrame *originatingFrame, const QString& msg);
 …
 private:
     Q_PRIVATE_SLOT(d, void _q_onLoadProgressChanged(int))
+#ifndef QT_NO_ACTION
     Q_PRIVATE_SLOT(d, void _q_webActionTriggered(bool checked))
+#endif
     Q_PRIVATE_SLOT(d, void _q_cleanupLeakMessages())
 …
     friend class QWebPagePrivate;
     friend class QWebView;
+    friend class QWebViewPrivate;
     friend class QGraphicsWebView;
+    friend class QGraphicsWebViewPrivate;
     friend class QWebInspector;
     friend class WebCore::ChromeClientQt;
 …
     friend class WebCore::FrameLoaderClientQt;
     friend class WebCore::InspectorClientQt;
+    friend class WebCore::InspectorFrontendClientQt;
     friend class WebCore::ResourceHandle;
     friend class WebCore::QNetworkReplyHandler;

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h

-              r561
+              r846
     QWebPagePrivate(QWebPage*);
     ~QWebPagePrivate();
+    static WebCore::Page* core(QWebPage*);
+    static QWebPagePrivate* priv(QWebPage*);
     void createMainFrame();
 #ifndef QT_NO_CONTEXTMENU
 …
     void inputMethodEvent(QInputMethodEvent*);
+#ifndef QT_NO_PROPERTIES
+    void dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent*);
+#endif
     void shortcutOverrideEvent(QKeyEvent*);
     void leaveEvent(QEvent*);
 …
     void handleSoftwareInputPanel(Qt::MouseButton);
     bool handleScrolling(QKeyEvent*, WebCore::Frame*);
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    void touchEvent(QTouchEvent*);
+#endif
     void setInspector(QWebInspector*);
 …
     bool clickCausedFocus;
-#if QT_VERSION < 0x040400
-    bool acceptNavigationRequest(QWebFrame *frame, const QWebNetworkRequest &request, QWebPage::NavigationType type);
-    QWebNetworkInterface *networkInterface;
-#ifndef QT_NO_NETWORKPROXY
-    QNetworkProxy networkProxy;
-#endif
-#else
     bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, QWebPage::NavigationType type);
     QNetworkAccessManager *networkManager;
-#endif
     bool forwardUnsupportedContent;
 …
     QWebInspector* inspector;
     bool inspectorIsInternalOnly; // True if created through the Inspect context menu action
+    Qt::DropAction m_lastDropAction;
+    QString viewMode;
     static bool drtRun;

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp

-              r561
+              r846
     \class QWebPluginFactory
     \since 4.4
+    \brief The QWebPluginFactory class creates plugins to be embedded into web
+    pages.
+    \inmodule QtWebKit
+    QWebPluginFactory is a factory for creating plugins for QWebPage. A plugin
+    factory can be installed on a QWebPage using QWebPage::setPluginFactory().
+    \brief The QWebPluginFactory class is used to embed custom data types in web pages.
+    \inmodule QtWebKit
+    The HTML \c{<object>} tag is used to embed arbitrary content into a web page,
+    for example:
+    \code
+    <object type="application/x-pdf" data="http://qt.nokia.com/document.pdf" width="500" height="400"></object>
+    \endcode
+    QtWebkit will natively handle the most basic data types like \c{text/html} and
+    \c{image/jpeg}, but for any advanced or custom data types you will need to
+    provide a handler yourself.
+    QWebPluginFactory is a factory for creating plugins for QWebPage, where each
+    plugin provides support for one or more data types. A plugin factory can be
+    installed on a QWebPage using QWebPage::setPluginFactory().
     \note The plugin factory is only used if plugins are enabled through QWebSettings.
     You can provide a QWebPluginFactory by implementing the plugins() and the
     create() method. For plugins() it is necessary to describe the plugins the
+    You provide a QWebPluginFactory by implementing the plugins() and the
+    create() methods. For plugins() it is necessary to describe the plugins the
     factory can create, including a description and the supported MIME types.
     The MIME types each plugin can handle should match the ones specified in
     in the HTML \c{<object>} tag.
+    in the HTML \c{<object>} tag of your content.
     The create() method is called if the requested MIME type is supported. The
     implementation has to return a new instance of the plugin requested for the
     given MIME type and the specified URL.
+    The plugins themselves are subclasses of QObject, but currently only plugins
+    based on either QWidget or QGraphicsWidget are supported.
 */
 …
     \class QWebPluginFactory::Plugin
     \since 4.4
     \brief the QWebPluginFactory::Plugin structure describes the properties of a plugin a QWebPluginFactory can create.
+    \brief The QWebPluginFactory::Plugin structure describes the properties of a plugin a QWebPluginFactory can create.
     \inmodule QtWebKit
 …
     \note Currently, this function is only called when JavaScript programs
     access the global \c plugins or \c mimetypes objects.
+    access the global \c plugins or \c mimetypes objects.
 */
 …
 /*!
     \enum QWebPluginFactory::Extension
+    \internal
     This enum describes the types of extensions that the plugin factory can support. Before using these extensions, you
 …
 /*!
     \class QWebPluginFactory::ExtensionOption
+    \internal
     \since 4.4
     \brief The ExtensionOption class provides an extended input argument to QWebPluginFactory's extension support.
 …
 /*!
     \class QWebPluginFactory::ExtensionReturn
+    \internal
     \since 4.4
     \brief The ExtensionOption class provides an extended output argument to QWebPluginFactory's extension support.
 …
     This virtual function can be reimplemented in a QWebPluginFactory subclass to provide support for extensions. The \a option
     argument is provided as input to the extension; the output results can be stored in \a output.
+    \internal
     The behaviour of this function is determined by \a extension.
 …
     This virtual function returns true if the plugin factory supports \a extension; otherwise false is returned.
+    \internal
     \sa extension()
 */

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp

-              r561
+              r846
+}
+void QWEBKIT_EXPORT qt_drt_setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme)
+{
+    SecurityOrigin::setDomainRelaxationForbiddenForURLScheme(forbidden, scheme);
+}
 /*!
     \class QWebSecurityOrigin
 …
     \c{http://www.malicious.com/evil.html} from accessing \c{http://www.example.com/}'s resources,
     because they are of a different security origin.
+    By default local schemes like \c{file://} and \c{qrc://} are concidered to be in the same
+    security origin, and can access each other's resources. You can add additional local schemes
+    by using QWebSecurityOrigin::addLocalScheme(), or override the default same-origin behavior
+    by setting QWebSettings::LocalContentCanAccessFileUrls to \c{false}.
+    \note Local resources are by default restricted from accessing remote content, which
+    means your \c{file://} will not be able to access \c{http://domain.com/foo.html}. You
+    can relax this restriction by setting QWebSettings::LocalContentCanAccessRemoteUrls to
+    \c{true}.
     Call QWebFrame::securityOrigin() to get the QWebSecurityOrigin for a frame in a
 …
     Adds the given \a scheme to the list of schemes that are considered equivalent
+    to the \c file: scheme. They are not subject to cross domain restrictions.
+    to the \c file: scheme.
+    Cross domain restrictions depend on the two web settings QWebSettings::LocalContentCanAccessFileUrls
+    and QWebSettings::LocalContentCanAccessFileUrls. By default all local schemes are concidered to be
+    in the same security origin, and local schemes can not access remote content.
 */
 void QWebSecurityOrigin::addLocalScheme(const QString& scheme)
 …
     Removes the given \a scheme from the list of local schemes.
+    \note You can not remove the \c{file://} scheme from the list
+    of local schemes.
     \sa addLocalScheme()
 */
 …
 /*!
     \since 4.6
+    Returns a list of all the schemes that were set by the application as local schemes,
+    Returns a list of all the schemes concidered to be local.
+    By default this is \c{file://} and \c{qrc://}.
     \sa addLocalScheme(), removeLocalScheme()
 */

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp

-              r561
+              r846
 #include "Cache.h"
 #include "CrossOriginPreflightResultCache.h"
+#include "Database.h"
 #include "FontCache.h"
 #include "Page.h"
 …
 #include <QFileInfo>
-#if ENABLE(QT_BEARER)
 #include "NetworkStateNotifier.h"
-#endif
 void QWEBKIT_EXPORT qt_networkAccessAllowed(bool isAllowed)
 …
         hash->insert(QWebSettings::DefaultFrameIconGraphic, QPixmap(QLatin1String(":webkit/resources/urlIcon.png")));
         hash->insert(QWebSettings::TextAreaSizeGripCornerGraphic, QPixmap(QLatin1String(":webkit/resources/textAreaResizeCorner.png")));
+        hash->insert(QWebSettings::DeleteButtonGraphic, QPixmap(QLatin1String(":webkit/resources/deleteButton.png")));
+    }
 …
                                       global->attributes.value(QWebSettings::JavascriptEnabled));
         settings->setJavaScriptEnabled(value);
+#if USE(ACCELERATED_COMPOSITING)
+        value = attributes.value(QWebSettings::AcceleratedCompositingEnabled,
+                                      global->attributes.value(QWebSettings::AcceleratedCompositingEnabled));
+        settings->setAcceleratedCompositingEnabled(value);
+#endif
+#if ENABLE(3D_CANVAS)
+        value = attributes.value(QWebSettings::WebGLEnabled,
+                                 global->attributes.value(QWebSettings::WebGLEnabled));
+        settings->setWebGLEnabled(value);
+#endif
         value = attributes.value(QWebSettings::JavascriptCanOpenWindows,
                                       global->attributes.value(QWebSettings::JavascriptCanOpenWindows));
 …
         settings->setPrivateBrowsingEnabled(value);
+        value = attributes.value(QWebSettings::SpatialNavigationEnabled,
+                                      global->attributes.value(QWebSettings::SpatialNavigationEnabled));
+        settings->setSpatialNavigationEnabled(value);
         value = attributes.value(QWebSettings::JavascriptCanAccessClipboard,
                                       global->attributes.value(QWebSettings::JavascriptCanAccessClipboard));
         settings->setDOMPasteAllowed(value);
+        settings->setJavaScriptCanAccessClipboard(value);
         value = attributes.value(QWebSettings::DeveloperExtrasEnabled,
 …
         settings->setDeveloperExtrasEnabled(value);
+        value = attributes.value(QWebSettings::FrameFlatteningEnabled,
+                                      global->attributes.value(QWebSettings::FrameFlatteningEnabled));
+        settings->setFrameFlatteningEnabled(value);
         QUrl location = !userStyleSheetLocation.isEmpty() ? userStyleSheetLocation : global->userStyleSheetLocation;
         settings->setUserStyleSheetLocation(WebCore::KURL(location));
 …
         value = attributes.value(QWebSettings::ZoomTextOnly,
                                  global->attributes.value(QWebSettings::ZoomTextOnly));
         settings->setZoomsTextOnly(value);
+        settings->setZoomMode(value ? WebCore::ZoomTextOnly : WebCore::ZoomPage);
         value = attributes.value(QWebSettings::PrintElementBackgrounds,
 …
         settings->setShouldPrintBackgrounds(value);
+#if ENABLE(DATABASE)
         value = attributes.value(QWebSettings::OfflineStorageDatabaseEnabled,
                                       global->attributes.value(QWebSettings::OfflineStorageDatabaseEnabled));
+        settings->setDatabasesEnabled(value);
+        WebCore::Database::setIsAvailable(value);
+#endif
         value = attributes.value(QWebSettings::OfflineWebApplicationCacheEnabled,
 …
         value = attributes.value(QWebSettings::LocalStorageEnabled,
                                       global->attributes.value(QWebSettings::LocalStorageEnabled));
         settings->setLocalStorageEnabled(value);
 …
                                       global->attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls));
         settings->setAllowUniversalAccessFromFileURLs(value);
+        value = attributes.value(QWebSettings::LocalContentCanAccessFileUrls,
+                                      global->attributes.value(QWebSettings::LocalContentCanAccessFileUrls));
+        settings->setAllowFileAccessFromFileURLs(value);
+        value = attributes.value(QWebSettings::XSSAuditingEnabled,
+                                      global->attributes.value(QWebSettings::XSSAuditingEnabled));
+        settings->setXSSAuditorEnabled(value);
+#if ENABLE(TILED_BACKING_STORE)
+        value = attributes.value(QWebSettings::TiledBackingStoreEnabled,
+                                      global->attributes.value(QWebSettings::TiledBackingStoreEnabled));
+        settings->setTiledBackingStoreEnabled(value);
+#endif
+        value = attributes.value(QWebSettings::SiteSpecificQuirksEnabled,
+                                      global->attributes.value(QWebSettings::SiteSpecificQuirksEnabled));
+        settings->setNeedsSiteSpecificQuirks(value);
         settings->setUsesPageCache(WebCore::pageCache()->capacity());
     } else {
 …
     each attribute.
     QWebSettings also configures global properties such as the Web page memory
     cache and the Web page icon database, local database storage and offline
+    QWebSettings also configures global properties such as the web page memory
+    cache, icon database, local database storage and offline
     applications storage.
 …
     \l{QWebSettings::PluginsEnabled}{PluginsEnabled} attribute. For many applications,
     this attribute is enabled for all pages by setting it on the
+    \l{globalSettings()}{global settings object}.
+    \l{globalSettings()}{global settings object}. QtWebKit will always ignore this setting
+    when processing Qt plugins. The decision to allow a Qt plugin is made by the client
+    in its reimplementation of QWebPage::createPlugin().
     \section1 Web Application Support
 …
     \value MinimumFontSize The hard minimum font size.
     \value MinimumLogicalFontSize The minimum logical font size that is applied
         after zooming with QWebFrame's textSizeMultiplier().
+        when zooming out with QWebFrame::setTextSizeMultiplier().
     \value DefaultFontSize The default font size for regular text.
     \value DefaultFixedFontSize The default font size for fixed-pitch text.
 …
     \value AutoLoadImages Specifies whether images are automatically loaded in
         web pages.
+        web pages. This is enabled by default.
     \value DnsPrefetchEnabled Specifies whether QtWebkit will try to pre-fetch DNS entries to
         speed up browsing. This only works as a global attribute. Only for Qt 4.6 and later.
+        speed up browsing. This only works as a global attribute. Only for Qt 4.6 and later. This is disabled by default.
     \value JavascriptEnabled Enables or disables the running of JavaScript
         programs.
+        programs. This is enabled by default
     \value JavaEnabled Enables or disables Java applets.
         Currently Java applets are not supported.
+    \value PluginsEnabled Enables or disables plugins in Web pages.
+    \value PluginsEnabled Enables or disables plugins in Web pages (e.g. using NPAPI). Qt plugins
+        with a mimetype such as "application/x-qt-plugin" are not affected by this setting. This is disabled by default.
     \value PrivateBrowsingEnabled Private browsing prevents WebKit from
         recording visited pages in the history and storing web page icons.
+        recording visited pages in the history and storing web page icons. This is disabled by default.
     \value JavascriptCanOpenWindows Specifies whether JavaScript programs
         can open new windows.
+        can open new windows. This is disabled by default.
     \value JavascriptCanAccessClipboard Specifies whether JavaScript programs
         can read or write to the clipboard.
+        can read or write to the clipboard. This is disabled by default.
     \value DeveloperExtrasEnabled Enables extra tools for Web developers.
         Currently this enables the "Inspect" element in the context menu as
+        well as the use of QWebInspector which controls the WebKit WebInspector
+        for web site debugging.
+        well as the use of QWebInspector which controls the web inspector
+        for web site debugging. This is disabled by default.
+    \value SpatialNavigationEnabled Enables or disables the Spatial Navigation
+        feature, which consists in the ability to navigate between focusable
+        elements in a Web page, such as hyperlinks and form controls, by using
+        Left, Right, Up and Down arrow keys. For example, if a user presses the
+        Right key, heuristics determine whether there is an element he might be
+        trying to reach towards the right and which element he probably wants.
+        This is disabled by default.
     \value LinksIncludedInFocusChain Specifies whether hyperlinks should be
         included in the keyboard focus chain.
     \value ZoomTextOnly Specifies whether the zoom factor on a frame applies to
         only the text or all content.
+        included in the keyboard focus chain. This is enabled by default.
+    \value ZoomTextOnly Specifies whether the zoom factor on a frame applies
+        only to the text or to all content. This is disabled by default.
     \value PrintElementBackgrounds Specifies whether the background color and images
         are also drawn when the page is printed.
+        are also drawn when the page is printed. This is enabled by default.
     \value OfflineStorageDatabaseEnabled Specifies whether support for the HTML 5
         offline storage feature is enabled or not. Disabled by default.
+        offline storage feature is enabled or not. This is disabled by default.
     \value OfflineWebApplicationCacheEnabled Specifies whether support for the HTML 5
         web application cache feature is enabled or not. Disabled by default.
+        web application cache feature is enabled or not. This is disabled by default.
     \value LocalStorageEnabled Specifies whether support for the HTML 5
         local storage feature is enabled or not. Disabled by default.
+        local storage feature is enabled or not. This is disabled by default.
     \value LocalStorageDatabaseEnabled \e{This enum value is deprecated.} Use
         QWebSettings::LocalStorageEnabled instead.
+    \value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are allowed to access remote urls.
+    \value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are
+        allowed to access remote urls. This is disabled by default. For more information
+        about security origins and local vs. remote content see QWebSecurityOrigin.
+    \value LocalContentCanAccessFileUrls Specifies whether locally loaded documents are
+        allowed to access other local urls. This is enabled by default. For more information
+        about security origins and local vs. remote content see QWebSecurityOrigin.
+    \value XSSAuditingEnabled Specifies whether load requests should be monitored for cross-site
+        scripting attempts. Suspicious scripts will be blocked and reported in the inspector's
+        JavaScript console. Enabling this feature might have an impact on performance
+        and it is disabled by default.
+    \value AcceleratedCompositingEnabled This feature, when used in conjunction with
+        QGraphicsWebView, accelerates animations of web content. CSS animations of the transform and
+        opacity properties will be rendered by composing the cached content of the animated elements.
+        This is enabled by default.
+    \value TiledBackingStoreEnabled This setting enables the tiled backing store feature
+        for a QGraphicsWebView. With the tiled backing store enabled, the web page contents in and around
+        the current visible area is speculatively cached to bitmap tiles. The tiles are automatically kept
+        in sync with the web page as it changes. Enabling tiling can significantly speed up painting heavy
+        operations like scrolling. Enabling the feature increases memory consumption. It does not work well
+        with contents using CSS fixed positioning (see also \l{QGraphicsWebView::}{resizesToContents} property).
+        \l{QGraphicsWebView::}{tiledBackingStoreFrozen} property allows application to temporarily
+        freeze the contents of the backing store. This is disabled by default.
+    \value FrameFlatteningEnabled With this setting each subframe is expanded to its contents.
+        On touch devices, it is desired to not have any scrollable sub parts of the page
+        as it results in a confusing user experience, with scrolling sometimes scrolling sub parts
+        and at other times scrolling the page itself. For this reason iframes and framesets are
+        barely usable on touch devices. This will flatten all the frames to become one scrollable page.
+        This is disabled by default.
+    \value SiteSpecificQuirksEnabled This setting enables WebKit's workaround for broken sites. It is
+        enabled by default.
 */
 …
     d->attributes.insert(QWebSettings::DnsPrefetchEnabled, false);
     d->attributes.insert(QWebSettings::JavascriptEnabled, true);
+    d->attributes.insert(QWebSettings::SpatialNavigationEnabled, false);
     d->attributes.insert(QWebSettings::LinksIncludedInFocusChain, true);
     d->attributes.insert(QWebSettings::ZoomTextOnly, false);
 …
     d->attributes.insert(QWebSettings::LocalStorageEnabled, false);
     d->attributes.insert(QWebSettings::LocalContentCanAccessRemoteUrls, false);
+    d->attributes.insert(QWebSettings::LocalContentCanAccessFileUrls, true);
+    d->attributes.insert(QWebSettings::AcceleratedCompositingEnabled, true);
+    d->attributes.insert(QWebSettings::TiledBackingStoreEnabled, false);
+    d->attributes.insert(QWebSettings::FrameFlatteningEnabled, false);
+    d->attributes.insert(QWebSettings::SiteSpecificQuirksEnabled, true);
     d->offlineStorageDefaultQuota = 5 * 1024 * 1024;
     d->defaultTextEncoding = QLatin1String("iso-8859-1");
 …
     with UTF-8 and Base64 encoded data, such as:
+    "data:text/css;charset=utf-8;base64,cCB7IGJhY2tncm91bmQtY29sb3I6IHJlZCB9Ow==;"
+    "data:text/css;charset=utf-8;base64,cCB7IGJhY2tncm91bmQtY29sb3I6IHJlZCB9Ow=="
+    \note If the base64 data is not valid, the style will not be applied.
     \sa userStyleSheetUrl()
 …
     to store "favicons" associated with web sites.
     \a path must point to an existing directory where the icons are stored.
+    \a path must point to an existing directory.
     Setting an empty path disables the icon database.
+    \sa iconDatabasePath(), clearIconDatabase()
 */
 void QWebSettings::setIconDatabasePath(const QString& path)
 …
     Returns the web site's icon for \a url.
     If the web site does not specify an icon, or the icon is not in the
+    If the web site does not specify an icon \bold OR if the icon is not in the
     database, a null QIcon is returned.
 …
     given \a type.
     For example, when an image cannot be loaded the pixmap specified by
+    For example, when an image cannot be loaded, the pixmap specified by
     \l{QWebSettings::WebGraphic}{MissingImageGraphic} is drawn instead.
 …
     Returns a previously set pixmap used to draw replacement graphics of the
     specified \a type.
-    For example, when an image cannot be loaded the pixmap specified by
-    \l{QWebSettings::WebGraphic}{MissingImageGraphic} is drawn instead.
     \sa setWebGraphic()
 …
     The Page Cache allows for a nicer user experience when navigating forth or back
+    to pages in the forward/back history, by pausing and resuming up to \a pages
+    per page group.
+    to pages in the forward/back history, by pausing and resuming up to \a pages.
     For more information about the feature, please refer to:
 …
 /*!
     Resets the actual font family to the default font family, specified by
     \a which.
+    Resets the actual font family specified by \a which to the one set
+    in the global QWebSettings instance.
     This function has no effect on the global QWebSettings instance.
 …
     \fn void QWebSettings::resetAttribute(WebAttribute attribute)
+    Resets the setting of \a attribute.
+    Resets the setting of \a attribute to the value specified in the
+    global QWebSettings instance.
     This function has no effect on the global QWebSettings instance.
 …
     \since 4.5
     Sets the path for HTML5 offline storage to \a path.
     \a path must point to an existing directory where the databases are stored.
+    Sets \a path as the save location for HTML5 client-side database storage data.
+    \a path must point to an existing directory.
     Setting an empty path disables the feature.
+    Support for client-side databases can enabled by setting the
+    \l{QWebSettings::OfflineStorageDatabaseEnabled}{OfflineStorageDatabaseEnabled} attribute.
     \sa offlineStoragePath()
 …
     \since 4.5
     Returns the path of the HTML5 offline storage or an empty string if the
+    Returns the path of the HTML5 client-side database storage or an empty string if the
     feature is disabled.
 …
 /*!
     \since 4.6
-    \relates QWebSettings
     Sets the path for HTML5 offline web application cache storage to \a path.
     An application cache acts like an HTTP cache in some sense. For documents
     that use the application cache via JavaScript, the loader mechinery will
+    that use the application cache via JavaScript, the loader engine will
     first ask the application cache for the contents, before hitting the
     network.
 …
     http://dev.w3.org/html5/spec/Overview.html#appcache
     \a path must point to an existing directory where the cache is stored.
+    \a path must point to an existing directory.
     Setting an empty path disables the feature.
+    Support for offline web application cache storage can enabled by setting the
+    \l{QWebSettings::OfflineWebApplicationCacheEnabled}{OfflineWebApplicationCacheEnabled} attribute.
     \sa offlineWebApplicationCachePath()
 …
 /*!
     \since 4.6
-    \relates QWebSettings
     Returns the path of the HTML5 offline web application cache storage
 …
+{
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
+    WebCore::cacheStorage().empty();
+    WebCore::cacheStorage().vacuumDatabaseFile();
     WebCore::cacheStorage().setMaximumSize(maximumSize);
 #endif
 …
 /*!
     \since 4.6
-    \relates QWebSettings
     Sets the path for HTML5 local storage to \a path.
 …
 /*!
     \since 4.6
-    \relates QWebSettings
     Returns the path for HTML5 local storage.
 …
 /*!
     \since 4.6
+    \relates QWebSettings
+    Enables WebKit persistent data and sets the path to \a path.
+    If the \a path is empty the path for persistent data is set to the
+    user-specific data location specified by
+    \l{QDesktopServices::DataLocation}{DataLocation}.
+    Enables WebKit data persistence and sets the path to \a path.
+    If \a path is empty, the user-specific data location specified by
+    \l{QDesktopServices::DataLocation}{DataLocation} will be used instead.
+    This method will simultaneously set and enable the iconDatabasePath(),
+    localStoragePath(), offlineStoragePath() and offlineWebApplicationCachePath().
     \sa localStoragePath()
 */
 …
     if (path.isEmpty()) {
+#ifndef QT_NO_DESKTOPSERVICES
         storagePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+#endif
         if (storagePath.isEmpty())
             storagePath = WebCore::pathByAppendingComponent(QDir::homePath(), QCoreApplication::applicationName());

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h

-              r561
+              r846
         OfflineWebApplicationCacheEnabled,
         LocalStorageEnabled,
 #ifdef QT_DEPRECATED
+#if defined(QT_DEPRECATED) || defined(qdoc)
         LocalStorageDatabaseEnabled = LocalStorageEnabled,
 #endif
         LocalContentCanAccessRemoteUrls,
+        DnsPrefetchEnabled
+        DnsPrefetchEnabled,
+        XSSAuditingEnabled,
+        AcceleratedCompositingEnabled,
+        SpatialNavigationEnabled,
+        LocalContentCanAccessFileUrls,
+        TiledBackingStoreEnabled,
+        FrameFlatteningEnabled,
+        SiteSpecificQuirksEnabled
     };
     enum WebGraphic {
 …
         MissingPluginGraphic,
         DefaultFrameIconGraphic,
+        TextAreaSizeGripCornerGraphic
+        TextAreaSizeGripCornerGraphic,
+        DeleteButtonGraphic
     };
     enum FontSize {

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp

-              r651
+              r846
 #include "qwebview.h"
+#include "Page.h"
 #include "QWebPageClient.h"
+#include "Settings.h"
 #include "qwebframe.h"
 #include "qwebpage_p.h"
 #include "qbitmap.h"
 #include "qevent.h"
 …
     void _q_pageDestroyed();
+    void unsetPageIfExists();
     QWebView *view;
 …
 #ifdef Q_WS_MAEMO_5
 #include "qabstractkineticscroller.h"
+class QWebViewKineticScroller : public QAbstractKineticScroller {
+#include "qapplication.h"
+// QCoreApplication::sendSpontaneousEvent() is private, hence this friend wrapper
+bool qt_sendSpontaneousEvent(QObject* receiver, QEvent* ev)
+{
+    return QCoreApplication::sendSpontaneousEvent(receiver, ev);
+}
+class QWebViewKineticScroller : public QObject, public QAbstractKineticScroller {
 public:
+    QWebViewKineticScroller() : QAbstractKineticScroller() {}
+    // remember the frame where the button was pressed
+    QWebViewKineticScroller()
+        : QObject()
+        , QAbstractKineticScroller()
+        , m_view(0)
+        , m_ignoreEvents(false)
+    {
+    }
+    void setWidget(QWebView* widget)
+    {
+        if (m_view) {
+            m_view->removeEventFilter(this);
+            QWebFrame* frame = m_view->page()->mainFrame();
+            frame->setScrollBarPolicy(Qt::Vertical, m_oldVerticalScrollBarPolicy);
+            frame->setScrollBarPolicy(Qt::Horizontal, m_oldHorizontalScrollBarPolicy);
+        }
+        m_view = widget;
+        setParent(m_view);
+        if (m_view) {
+            QWebFrame* frame = m_view->page()->mainFrame();
+            m_oldHorizontalScrollBarPolicy = frame->scrollBarPolicy(Qt::Horizontal);
+            m_oldVerticalScrollBarPolicy = frame->scrollBarPolicy(Qt::Vertical);
+            frame->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
+            frame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
+            m_view->installEventFilter(this);
+        }
+    }
+protected:
     bool eventFilter(QObject* o, QEvent* ev)
+    {
+        if (!o || m_view != o || m_ignoreEvents || !m_view->isEnabled())
+            return QObject::eventFilter(o, ev);
+        bool res = false;
         switch (ev->type()) {
         case QEvent::MouseButtonPress: {
+            // remember the frame where the button was pressed
             QWebFrame* hitFrame = scrollingFrameAt(static_cast<QMouseEvent*>(ev)->pos());
             if (hitFrame)
                 m_frame = hitFrame;
+            // fall through
+        }
+        case QEvent::MouseMove:
+        case QEvent::MouseButtonRelease:
+        case QEvent::MouseButtonDblClick:
+            res = handleMouseEvent(static_cast<QMouseEvent*>(ev));
             break;
+        }
         default:
             break;
+        }
+        return QAbstractKineticScroller::eventFilter(o, ev);
+    }
+protected:
+        return res ? true : QObject::eventFilter(o, ev);
+    }
+    void cancelLeftMouseButtonPress(const QPoint& /* globalPressPos */)
+    {
+        QMouseEvent cmem(QEvent::MouseMove, QPoint(-INT_MAX, -INT_MAX), Qt::LeftButton, QApplication::mouseButtons() | Qt::LeftButton, QApplication::keyboardModifiers());
+        sendEvent(m_view, &cmem);
+        QMouseEvent cmer(QEvent::MouseButtonRelease, QPoint(-INT_MAX, -INT_MAX), Qt::LeftButton, QApplication::mouseButtons() & ~Qt::LeftButton, QApplication::keyboardModifiers());
+        sendEvent(m_view, &cmer);
+    }
     QWebFrame* currentFrame() const
+    {
+        if (!m_frame.isNull())
+            return m_frame.data();
+        QWebView* view = static_cast<QWebView*>(widget());
+        QWebFrame* frame = view->page()->mainFrame();
+        return frame;
+        if (m_frame)
+            return m_frame;
+        if (m_view)
+            return m_view->page()->mainFrame();
+        return 0;
+    }
 …
     QWebFrame* scrollingFrameAt(const QPoint& pos) const
+    {
+        QWebView* view = static_cast<QWebView*>(widget());
+        QWebFrame* mainFrame = view->page()->mainFrame();
+        QWebFrame* hitFrame = mainFrame->hitTestContent(pos).frame();
+        QSize range = hitFrame->contentsSize() - hitFrame->geometry().size();
+        while (hitFrame && range.width() <= 1 && range.height() <= 1)
+            hitFrame = hitFrame->parentFrame();
+        return hitFrame;
+    }
+    void attachToWidget()
+    {
+        QWebView* view = static_cast<QWebView*>(widget());
+        QWebFrame* mainFrame = view->page()->mainFrame();
+        m_oldHorizontalScrollBarPolicy = mainFrame->scrollBarPolicy(Qt::Horizontal);
+        m_oldVerticalScrollBarPolicy = mainFrame->scrollBarPolicy(Qt::Vertical);
+        mainFrame->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
+        mainFrame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
+        view->installEventFilter(this);
+    }
+    void removeFromWidget()
+    {
+        QWebView* view = static_cast<QWebView*>(widget());
+        view->removeEventFilter(this);
+        QWebFrame* mainFrame = view->page()->mainFrame();
+        mainFrame->setScrollBarPolicy(Qt::Vertical, m_oldVerticalScrollBarPolicy);
+        mainFrame->setScrollBarPolicy(Qt::Horizontal, m_oldHorizontalScrollBarPolicy);
+    }
+    QRect positionRange() const
+    {
+        QRect r;
+        QWebFrame* frame = currentFrame();
+        r.setSize(frame->contentsSize() - frame->geometry().size());
+        return r;
+    }
+    QPoint position() const
+        QWebFrame* hitFrame = 0;
+        if (m_view) {
+            QWebFrame* frame = m_view->page()->mainFrame();
+            hitFrame = frame->hitTestContent(pos).frame();
+            QSize range = hitFrame->contentsSize() - hitFrame->geometry().size();
+            while (hitFrame && range.width() <= 1 && range.height() <= 1)
+                hitFrame = hitFrame->parentFrame();
+            return hitFrame;
+        }
+    }
+    QPoint maximumScrollPosition() const
+    {
         QWebFrame* frame = currentFrame();
+        return frame->scrollPosition();
+        QSize s = frame ? frame->contentsSize() - frame->geometry().size() : QSize(0, 0);
+        return QPoint(qMax(0, s.width()), qMax(0, s.height()));
+    }
+    QPoint scrollPosition() const
+    {
+        QWebFrame* frame = currentFrame();
+        return frame ? frame->scrollPosition() : QPoint();
+    }
     QSize viewportSize() const
+    {
         return static_cast<QWebView*>(widget())->page()->viewportSize();
+    }
     void setPosition(const QPoint& point, const QPoint& /* overShootDelta */)
+        return m_view ? m_view->page()->viewportSize() : QSize();
+    }
+    void setScrollPosition(const QPoint& point, const QPoint& /* overShootDelta */)
+    {
         QWebFrame* frame = currentFrame();
+        frame->setScrollPosition(point);
+    }
+        if (frame)
+            frame->setScrollPosition(point);
+    }
+    void sendEvent(QWidget* w, QEvent* ev)
+    {
+        m_ignoreEvents = true;
+        qt_sendSpontaneousEvent(w, ev);
+        m_ignoreEvents = false;
+    }
+    QWebView* m_view;
+    bool m_ignoreEvents;
     QPointer<QWebFrame> m_frame;
     Qt::ScrollBarPolicy m_oldVerticalScrollBarPolicy;
 …
 #endif
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    setAttribute(Qt::WA_AcceptTouchEvents);
+#endif
 #if defined(Q_WS_MAEMO_5)
     QAbstractKineticScroller* scroller = new QWebViewKineticScroller();
+    scroller->setWidget(this);
+    static_cast<QWebViewKineticScroller*>(scroller)->setWidget(this);
+    setProperty("kineticScroller", QVariant::fromValue(scroller));
 #endif
     setAcceptDrops(true);
 …
+}
+void QWebViewPrivate::unsetPageIfExists()
+{
+    if (!page)
+        return;
+    // if the page client is the special client constructed for
+    // delegating the responsibilities to a QWidget, we need
+    // to destroy it.
+    if (page->d->client && page->d->client->isQWidgetClient())
+        delete page->d->client;
+    page->d->client = 0;
+    // if the page was created by us, we own it and need to
+    // destroy it as well.
+    if (page->parent() == view)
+        delete page;
+    else
+        page->disconnect(view);
+}
 /*!
     Makes \a page the new web page of the web view.
 …
     if (d->page == page)
         return;
+    if (d->page) {
+        d->page->d->client = 0; // unset the page client
+        if (d->page->parent() == this)
+            delete d->page;
+        else
+            d->page->disconnect(this);
+    }
+    d->unsetPageIfExists();
     d->page = page;
     if (d->page) {
         d->page->setView(this);
 …
 */
-#if QT_VERSION < 0x040400 && !defined(qdoc)
-void QWebView::load(const QWebNetworkRequest &request)
-#else
 void QWebView::load(const QNetworkRequest &request,
                     QNetworkAccessManager::Operation operation,
                     const QByteArray &body)
+#endif
+{
+    page()->mainFrame()->load(request
+#if QT_VERSION >= 0x040400
+                              , operation, body
+#endif
+                             );
+{
+    page()->mainFrame()->load(request, operation, body);
+}
 …
+}
+#ifndef QT_NO_ACTION
 /*!
     Returns a pointer to a QAction that encapsulates the specified web action \a action.
 …
     return page()->action(action);
+}
+#endif
 /*!
 …
             d->page->event(e);
 #ifndef QT_NO_CURSOR
-#if QT_VERSION >= 0x040400
         } else if (e->type() == QEvent::CursorChange) {
             // An unsetCursor will set the cursor to Qt::ArrowCursor.
 …
                 d->page->d->client->resetCursor();
 #endif
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+        } else if (e->type() == QEvent::TouchBegin
+                   || e->type() == QEvent::TouchEnd
+                   || e->type() == QEvent::TouchUpdate) {
+            d->page->event(e);
+            if (e->isAccepted())
+                return true;
 #endif
         } else if (e->type() == QEvent::Leave)

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h

-              r561
+              r846
 #include <QtGui/qpainter.h>
 #include <QtCore/qurl.h>
-#if QT_VERSION >= 0x040400
 #include <QtNetwork/qnetworkaccessmanager.h>
-#endif
 QT_BEGIN_NAMESPACE
 …
     void load(const QUrl& url);
-#if QT_VERSION < 0x040400 && !defined(qdoc)
-    void load(const QWebNetworkRequest& request);
-#else
     void load(const QNetworkRequest& request,
               QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation,
               const QByteArray &body = QByteArray());
-#endif
     void setHtml(const QString& html, const QUrl& baseUrl = QUrl());
     void setContent(const QByteArray& data, const QString& mimeType = QString(), const QUrl& baseUrl = QUrl());
 …
     QString selectedText() const;
+#ifndef QT_NO_ACTION
     QAction* pageAction(QWebPage::WebAction action) const;
+#endif
     void triggerPageAction(QWebPage::WebAction action, bool checked = false);

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

-              r769
+              r846
+-09-12  Martin Smith  <martin.smith@nokia.com>
+        Reviewed by Simon Hausmann.
+        doc: Changed the title so lists of contents sort better.
+        * docs/qtwebkit.qdoc:
+-09-12  David Boddie  <david.boddie@nokia.com>
+        Reviewed by Simon Hausmann.
+        Doc: More work on the QML documentation.
+        * declarative/qdeclarativewebview.cpp:
+-09-12  Martin Jones  <martin.jones@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qml] Ensure WebView gets focus when an editable node is clicked on.
+        Task-number: QTBUG-13342
+        * declarative/qdeclarativewebview.cpp:
+        (GraphicsWebView::mousePressEvent):
+-09-12  David Boddie  <david.boddie@nokia.com>
+        Reviewed by Simon Hausmann.
+        Doc: qdoc fixes.
+        * declarative/qdeclarativewebview.cpp:
+-09-12  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] let WebKit inject itself into the qt configuration
+        Task-number: QTBUG-12379
+        * qt_webkit_version.pri: Use the faster + instead of *
+        operator to add webkit to the config.
+-09-12  Martin Smith  <martin.smith@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Fix group of declarative web view in QML docs.
+        * declarative/qdeclarativewebview.cpp:
+-08-20  Girish Ramakrishnan  <girish@forwardbias.in>
+        Reviewed by Ariya Hidayat.
+        [Qt] Allow wmode=transparent in QWebView on Maemo5 after r65775.
+        https://bugs.webkit.org/show_bug.cgi?id=44043
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createPlugin):
+-08-19  Girish Ramakrishnan  <girish@forwardbias.in>
+        Reviewed by Kenneth Christiansen.
+        [Qt] Inject wmode=opaque for both QWebView and QGraphicsWebView on Maemo5
+        as Flash XEmbed support is flaky.
+        https://bugs.webkit.org/show_bug.cgi?id=44043
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createPlugin):
+-08-05  David Leong  <david.leong@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Input mode states are not reset after entering a password field
+        https://bugs.webkit.org/show_bug.cgi?id=43530
+        Input mode hints are not reset if clicking on password <input> elements then
+        clicking on <textarea> elements
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::setInputMethodState):
+        * tests/qwebview/resources/input_types.html:
+        * tests/qwebview/tst_qwebview.cpp:
+        (tst_QWebView::focusInputTypes):
+-07-27  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Tor Arne VestbÃž.
+        [Qt] Incorrect input method hints
+        https://bugs.webkit.org/show_bug.cgi?id=43037
+        Properly set or reset all input method hints when
+        activating input fields.
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::setInputMethodState):
+        * tests/qwebview/tst_qwebview.cpp:
+        (tst_QWebView::focusInputTypes): Extended unit test to verify that we
+        reset hints.
+-10-30  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Use the default timeout interval for JS as the HTML tokenizer delay for setHtml()
+        This ensures that long-running JavaScript (for example due to a modal alert() dialog),
+        will not trigger a deferred load after only 500ms (the default tokenizer delay) while
+        still giving a reasonable timeout (10 seconds) to prevent deadlock.
+        https://bugs.webkit.org/show_bug.cgi?id=29381
+        * Api/qwebframe.cpp: Document the behaviour
+        * WebCoreSupport/FrameLoaderClientQt.cpp: set the custom tokenizer delay for substitute loads
+        * tests/qwebframe/tst_qwebframe.cpp: Add test
+-07-07  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
+        Reviewed by Darin Adler.
+        Prevent assertion/duplicate loads for non-deferred subtitute-data loads
+        https://bugs.webkit.org/show_bug.cgi?id=30879
+        MainResourceLoader uses the member m_initialRequest to store requests for future
+        deferred loads. When doing the actual load in handleDataLoadNow(), we therefore
+        have to clear this request so that subsequent entries into the loader will not
+        start yet another load.
+        This can happen as a result of a PageGroupLoadDeferrer going out of scope when
+        returning from Chrome::runJavaScriptAlert(), which calls setDeferredLoading(false),
+        but only in the case of using both substitute-data and non-deferred main resource
+        load together. That's why two new DRT functions were added:
+         * queueLoadHTMLString()
+         * setDeferMainResourceLoad()
+        The change adds DRT hooks for Mac, Win and Qt for these two functions. For Mac
+        and Win the hook uses new SPI in WebDataSource. For Qt a new static member was
+        added to the FrameLoaderClientQt and accessed though DumpRenderTreeSupportQt.
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::setDeferMainResourceDataLoad):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createDocumentLoader):
+        * WebCoreSupport/FrameLoaderClientQt.h:
+-07-23  David Boddie  <dboddie@trolltech.com>
+        Reviewed by Simon Hausmann.
+        Doc: Fixed incorrect QML property type.
+        * declarative/qdeclarativewebview.cpp:
+-07-23  Simon Hausmann  <simon.hausmann@nokia.com>
+        [Qt] Build fix for Qt apps
+        Add webkit to QT_CONFIG. qconfig.pri will read qt_webkit_version.pri and
+        that's how it will pick up webkit in QT_CONFIG.
+        * qt_webkit_version.pri:
+-07-09  Kent Hansen  <kent.hansen@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Skip test that never terminates on maemo5
+        Due to https://bugs.webkit.org/show_bug.cgi?id=38538
+        the tst_QWebPage::infiniteLoopJS() autotest never terminates.
+        Skip the test so that the test case may run to completion.
+        Patch by Dominik Holland <dominik.holland@nokia.com>
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::infiniteLoopJS):
+-07-09  Simon Hausmann <simon.hausmann@nokia.com>
+        Unreviewed trivial Symbian build fix.
+        [Qt] Fix the Symbian build when compiling without S60
+        Use Q_OS_SYMBIAN instead of Q_WS_S60 for the user agent
+        determination.
+        * Api/qwebpage.cpp:
+        (QWebPage::userAgentForUrl):
+-07-09  Kristian Amlie  <kristian.amlie@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.
+        * declarative/declarative.pro: Use QT_LIBINFIX.
+-06-01  Raine Makelainen  <raine.makelainen@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt]: REGRESSION(r58703): QWebSettings::JavascriptCanAccessClipboard has wrong case in "Javascript" part.
+        https://bugs.webkit.org/show_bug.cgi?id=39878
+        QWebSettings::JavaScriptCanAccessClipboard reverted back to
+        QWebSettings::JavascriptCanAccessClipboard. QWebSettings::DOMPasteAllowed enum removed.
+        Value of QWebSettings::JavascriptCanAccessClipboard to setDOMPasteAllowed and
+        setJavaScriptCanAccessClipboard of WebCore::Settings.
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        * Api/qwebsettings.h:
+-05-03  Abhishek Arya  <inferno@chromium.org>
+        Reviewed by Adam Barth.
+        Add support for controlling clipboard access from javascript.
+        Clipboard access from javascript is disabled by default.
+        https://bugs.webkit.org/show_bug.cgi?id=27751
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        * Api/qwebsettings.h:
+-03-24  Kent Hansen  <kent.hansen@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Rename QWebSettings::XSSAuditorEnabled to XSSAuditingEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=36522
+        For consistency with other QWebSettings attributes.
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        * Api/qwebsettings.h:
+-05-19  Antti Koivisto  <koivisto@iki.fi>
+        Rubber-stamped by Kenneth Rohde Christiansen.
+        [Qt] TiledBackingStore updates broken when not using resizesToContents mode
+        https://bugs.webkit.org/show_bug.cgi?id=39359
+        Put the back logic that was lost in refactoring.
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::visibleRectForTiledBackingStore):
+        * WebCoreSupport/PageClientQt.cpp:
+        (WebCore::PageClientQGraphicsWidget::graphicsItemVisibleRect):
+        * WebCoreSupport/PageClientQt.h:
+        (WebCore::PageClientQWidget::viewResizesToContentsEnabled):
+        (WebCore::PageClientQGraphicsWidget::viewResizesToContentsEnabled):
+-07-01  Bea Lam  <bea.lam@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Doc improvements for QDeclarativeWebView
+        * declarative/qdeclarativewebview.cpp:
+-07-01  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Create QComboBoxes when clicked and destroy on hide.
+        https://bugs.webkit.org/show_bug.cgi?id=41451
+        Currently a QComboBox is created for each RenderMenuList and
+        it gets destroyed either when the RenderMenuList or the
+        QWebView (its Qt parent) is destroyed. This cause a crash
+        when the QWebView is destroyed before the render tree (which
+        is kept in cache).
+        This patch aim to destroy the QComboBox as soon as its popup
+        gets hidden, and likewise, create it only when the popup is
+        requested to be shown.
+        It also removes the unneeded reference to the QGraphicsProxyWidget,
+        destroying the QComboBox automatically destroys its bound
+        proxywidget.
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopupCombo::hidePopup):
+        (WebCore::QtFallbackWebPopup::QtFallbackWebPopup):
+        (WebCore::QtFallbackWebPopup::~QtFallbackWebPopup):
+        (WebCore::QtFallbackWebPopup::show):
+        (WebCore::QtFallbackWebPopup::hide):
+        (WebCore::QtFallbackWebPopup::destroyPopup):
+        (WebCore::QtFallbackWebPopup::populate):
+        * WebCoreSupport/QtFallbackWebPopup.h:
+-06-30  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Make sure we catch closed QComboBox popups.
+        https://bugs.webkit.org/show_bug.cgi?id=39019
+        The way it works currently is using the QComboBox::show/hidePopup
+        virtual method to catch popup requests in the middle. There is
+        some cases however that the popup widget gets closed without
+        going through the hidePopup method.
+        This patch adds an event filter to the popup's view to know when
+        it gets closed and calls hidePopup to call our handling code.
+        This may get hidePopup called twice but this shouldn't have any
+        effect.
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopupCombo::QtFallbackWebPopupCombo):
+        (WebCore::QtFallbackWebPopupCombo::eventFilter):
+        * WebCoreSupport/QtFallbackWebPopup.h:
+-06-25  Luiz Agostini  <luiz.agostini@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] QtWebKit crashes if <select>'s render changes in its onchange event
+        https://bugs.webkit.org/show_bug.cgi?id=41164
+        QtWebKit crashes if <select>'s renderer changes in its onchange event.
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::~QtFallbackWebPopup):
+-06-28  Andreas Kling  <andreas.kling@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] QGraphicsWebView crash when calling setScale() before setUrl()
+        https://bugs.webkit.org/show_bug.cgi?id=40000
+        Check 'page' before dereference in _q_scaleChanged()
+        Autotest included.
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::_q_scaleChanged):
+        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+        (tst_QGraphicsWebView::crashOnSetScaleBeforeSetUrl):
+-06-24  Simon Hausmann  <simon.hausmann@nokia.com>
+        Unreviewed Symbian build fix.
+        The QML WebKit integration needs to be part of QtWebKit.sis
+        * declarative/declarative.pro: Removed non-working deployment.
+-06-23  David Boddie  <dboddie@trolltech.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Doc: Fixed documentation errors.
+        * docs/qtwebkit-bridge.qdoc:
+-06-23  Alessandro Portale  <alessandro.portale@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Provide the Webkit Qml plugin with a UID3 on Symbian
+        ...otherwise we cannot Symbian sign it.
+        * declarative/declarative.pro:
+-06-23  Simon Hausmann  <simon.hausmann@nokia.com>
+        Unreviewed Qt package build fix.
+        When building without build-webkit, set OUTPUT_DIR if necessary, like
+        in the other .pro files.
+        * declarative/declarative.pro:
+-06-22  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Fix compilation with QT_NO_COMBOBOX.
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::createSelectPopup):
+-06-11  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by nobody, build fix.
+        [Qt] Second fix attempt for the build break introduced by r61002.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::QWebPagePrivate):
+-06-11  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by nobody, build fix.
+        [Qt] Fix build break introduced by r61002.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::QWebPagePrivate):
+-05-31  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Implement the simple text code path.
+        https://bugs.webkit.org/show_bug.cgi?id=40077
+        Remove the FONT_FAST_PATH macro and use the Qt's
+        fast text implementation instead of the one of WebKit.
+        The Qt::TextBypassShaping flag is used to tell Qt to
+        only use the glyph advances.
+        Qt 4.7 is needed to get this flag thus the complex path is always
+        used if QtWebKit is compiled against an earlier version.
+        Contrary to the WebKit's implementation, the complex code path
+        is taken if the text is RightToLeft, justified or is formatted
+        with non-zero letter or word spacing.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::QWebPagePrivate):
+-06-21  Simon Hausmann  <simon.hausmann@nokia.com>
+        Unreviewed build fix.
+        [Qt] Fix package builds
+        Don't use rpath unless we're building inside the trunk.
+        * declarative/declarative.pro:
+-06-19  Mirko Damiani  <mirko@develer.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Avoid truncation of zoom factor in QWebFrame's print function.
+        https://bugs.webkit.org/show_bug.cgi?id=40662
+        The zoom factor is a qreal number but its value is truncated to an
+        integer. So a cast to qreal is needed to avoid this issue.
+        * Api/qwebframe.cpp:
+        (QWebFrame::print):
+-06-19  No'am Rosenthal  <noam.rosenthal@nokia.com>
+        Reviewed by Simon Hausmann.
+        Bridge documentation: some snippets have the wrong indentation
+        https://bugs.webkit.org/show_bug.cgi?id=40717
+        Fixed code snippets
+        * docs/webkitsnippets/qtwebkit_bridge_snippets.cpp:
+        (wrapInFunction):
+-06-19  Olivier Goffart  <olivier.goffart@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Compilation in QWebPagePrivate::timerEvent with clang
+        https://bugs.webkit.org/show_bug.cgi?id=40714
+        QObject::timerEvent is protected and cannot be accessed by QWebPagePrivate
+        with clang
+        QWebPagePrivate is a friend of QWebPage and then should have access to
+        all protected members of parents of QWebPage, including QObject.
+        But the clang team do not want to conform to this aspect of the specification
+        because "It is either a drafting error or a horrible mistake."
+        See http://llvm.org/bugs/show_bug.cgi?id=6840
+        This change is better because QWebPage does not reimplement the timerEvent
+        (QWebPagePrivate::timerEvent is called from QWebPage::event)
+        So customers that would reimplement their own timerEvent
+        for their own timer now get a chance to catch them.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::timerEvent):
+-06-18  Alexis Menard  <alexis.menard@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Fix documentation for the declarative module import.
+        * declarative/qdeclarativewebview.cpp:
+-06-18  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Antti Koivisto.
+        REGRESSION(r60958) [Qt] qwebpage::inputMethods auto-test fails
+        https://bugs.webkit.org/show_bug.cgi?id=40830
+        When activating a regular input method field, always set or unset the ImhHiddenText
+        input method hint.
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::setInputMethodState):
+-06-10  Raine Makelainen  <raine.makelainen@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        Impossible to set input method hints based HTML5 input types
+        https://bugs.webkit.org/show_bug.cgi?id=40107
+        EditorClientQt to set input method hints for "number", "tel",
+        "email", and "url" HTML input elements.
+        Tests for HTML input elements and input method hints added for
+        QGraphicsWebView and QWebView.
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::setInputMethodState):
+        * tests/qgraphicswebview/resources/input_types.html: Added.
+        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+        (GraphicsWebView::GraphicsWebView):
+        (GraphicsWebView::fireMouseClick):
+        (tst_QGraphicsWebView::focusInputTypes):
+        * tests/qgraphicswebview/tst_qgraphicswebview.qrc: Added.
+        * tests/qwebview/resources/input_types.html: Added.
+        * tests/qwebview/tst_qwebview.cpp:
+        (WebView::fireMouseClick):
+        (tst_QWebView::focusInputTypes):
+        * tests/qwebview/tst_qwebview.qrc:
+-06-18  Alexis Menard  <alexis.menard@nokia.com>
+        Reviewed by Simon Hausmann.
+        Fix documentation issue on the onAlert handler.
+        Fix compilation issue with QT_NO_ACTION.
+        * declarative/qdeclarativewebview.cpp:
+        * declarative/qdeclarativewebview_p.h:
+-06-18  Alexis Menard  <alexis.menard@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Change the target path to QtWebKit.
+        * declarative/declarative.pro:
+-06-17  Robert Hogan  <robert@webkit.org>
+        [Qt] Build fix
+        Unreviewed.
+        Remove includes in qdeclarativewebview*.* that rely on an installation
+        of QtWebKit.
+        * declarative/qdeclarativewebview.cpp:
+        * declarative/qdeclarativewebview_p.h:
+-06-17  Alexis Menard  <alexis.menard@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Upstream the WebKit QML integration plugin
+        https://bugs.webkit.org/show_bug.cgi?id=40050
+        Add to the Qt port the QML WebKit integration plugin.
+        QDeclarativeWebView is creating the item and expose
+        properties. The C++ API is not public, only the
+        properties are.
+        * declarative/declarative.pro: Added.
+        * declarative/plugin.cpp: Added.
+        (WebKitQmlPlugin::registerTypes):
+        * declarative/qdeclarativewebview.cpp: Added.
+        (QDeclarativeWebViewPrivate::QDeclarativeWebViewPrivate):
+        (QDeclarativeWebViewPrivate::):
+        (QDeclarativeWebViewPrivate::windowObjectsAppend):
+        (GraphicsWebView::GraphicsWebView):
+        (GraphicsWebView::mousePressEvent):
+        (GraphicsWebView::mouseReleaseEvent):
+        (GraphicsWebView::mouseDoubleClickEvent):
+        (GraphicsWebView::timerEvent):
+        (GraphicsWebView::mouseMoveEvent):
+        (QDeclarativeWebView::QDeclarativeWebView):
+        (QDeclarativeWebView::~QDeclarativeWebView):
+        (QDeclarativeWebView::init):
+        (QDeclarativeWebView::componentComplete):
+        (QDeclarativeWebView::status):
+        (QDeclarativeWebView::progress):
+        (QDeclarativeWebView::doLoadStarted):
+        (QDeclarativeWebView::doLoadProgress):
+        (QDeclarativeWebView::pageUrlChanged):
+        (QDeclarativeWebView::doLoadFinished):
+        (QDeclarativeWebView::url):
+        (QDeclarativeWebView::setUrl):
+        (QDeclarativeWebView::preferredWidth):
+        (QDeclarativeWebView::setPreferredWidth):
+        (QDeclarativeWebView::preferredHeight):
+        (QDeclarativeWebView::setPreferredHeight):
+        (QDeclarativeWebView::evaluateJavaScript):
+        (QDeclarativeWebView::updateDeclarativeWebViewSize):
+        (QDeclarativeWebView::initialLayout):
+        (QDeclarativeWebView::updateContentsSize):
+        (QDeclarativeWebView::geometryChanged):
+        (QDeclarativeWebView::javaScriptWindowObjects):
+        (QDeclarativeWebView::qmlAttachedProperties):
+        (QDeclarativeWebViewPrivate::updateWindowObjects):
+        (QDeclarativeWebView::renderingEnabled):
+        (QDeclarativeWebView::setRenderingEnabled):
+        (QDeclarativeWebView::heuristicZoom):
+        (QDeclarativeWebView::pressGrabTime):
+        (QDeclarativeWebView::setPressGrabTime):
+        (QDeclarativeWebView::backAction):
+        (QDeclarativeWebView::forwardAction):
+        (QDeclarativeWebView::reloadAction):
+        (QDeclarativeWebView::stopAction):
+        (QDeclarativeWebView::title):
+        (QDeclarativeWebView::icon):
+        (QDeclarativeWebView::setStatusText):
+        (QDeclarativeWebView::windowObjectCleared):
+        (QDeclarativeWebView::statusText):
+        (QDeclarativeWebView::page):
+        (QDeclarativeWebView::settingsObject):
+        (QDeclarativeWebView::setPage):
+        (QDeclarativeWebView::load):
+        (QDeclarativeWebView::html):
+        (QDeclarativeWebView::setHtml):
+        (QDeclarativeWebView::setContent):
+        (QDeclarativeWebView::history):
+        (QDeclarativeWebView::settings):
+        (QDeclarativeWebView::createWindow):
+        (QDeclarativeWebView::newWindowComponent):
+        (QDeclarativeWebView::setNewWindowComponent):
+        (QDeclarativeWebView::newWindowParent):
+        (QDeclarativeWebView::setNewWindowParent):
+        (QDeclarativeWebView::contentsSize):
+        (QDeclarativeWebView::contentsScale):
+        (QDeclarativeWebView::setContentsScale):
+        (QDeclarativeWebView::elementAreaAt):
+        (QDeclarativeWebPage::QDeclarativeWebPage):
+        (QDeclarativeWebPage::~QDeclarativeWebPage):
+        (QDeclarativeWebPage::chooseFile):
+        (QDeclarativeWebPage::javaScriptAlert):
+        (QDeclarativeWebPage::javaScriptConfirm):
+        (QDeclarativeWebPage::javaScriptPrompt):
+        (QDeclarativeWebPage::viewItem):
+        (QDeclarativeWebPage::createWindow):
+        * declarative/qdeclarativewebview_p.h: Added.
+        (QDeclarativeWebView::):
+        (QDeclarativeWebView::isComponentCompletePublic):
+        (QDeclarativeWebViewAttached::QDeclarativeWebViewAttached):
+        (QDeclarativeWebViewAttached::windowObjectName):
+        (QDeclarativeWebViewAttached::setWindowObjectName):
+        (QDeclarativeWebSettings::QDeclarativeWebSettings):
+        (QDeclarativeWebSettings::standardFontFamily):
+        (QDeclarativeWebSettings::setStandardFontFamily):
+        (QDeclarativeWebSettings::fixedFontFamily):
+        (QDeclarativeWebSettings::setFixedFontFamily):
+        (QDeclarativeWebSettings::serifFontFamily):
+        (QDeclarativeWebSettings::setSerifFontFamily):
+        (QDeclarativeWebSettings::sansSerifFontFamily):
+        (QDeclarativeWebSettings::setSansSerifFontFamily):
+        (QDeclarativeWebSettings::cursiveFontFamily):
+        (QDeclarativeWebSettings::setCursiveFontFamily):
+        (QDeclarativeWebSettings::fantasyFontFamily):
+        (QDeclarativeWebSettings::setFantasyFontFamily):
+        (QDeclarativeWebSettings::minimumFontSize):
+        (QDeclarativeWebSettings::setMinimumFontSize):
+        (QDeclarativeWebSettings::minimumLogicalFontSize):
+        (QDeclarativeWebSettings::setMinimumLogicalFontSize):
+        (QDeclarativeWebSettings::defaultFontSize):
+        (QDeclarativeWebSettings::setDefaultFontSize):
+        (QDeclarativeWebSettings::defaultFixedFontSize):
+        (QDeclarativeWebSettings::setDefaultFixedFontSize):
+        (QDeclarativeWebSettings::autoLoadImages):
+        (QDeclarativeWebSettings::setAutoLoadImages):
+        (QDeclarativeWebSettings::javascriptEnabled):
+        (QDeclarativeWebSettings::setJavascriptEnabled):
+        (QDeclarativeWebSettings::javaEnabled):
+        (QDeclarativeWebSettings::setJavaEnabled):
+        (QDeclarativeWebSettings::pluginsEnabled):
+        (QDeclarativeWebSettings::setPluginsEnabled):
+        (QDeclarativeWebSettings::privateBrowsingEnabled):
+        (QDeclarativeWebSettings::setPrivateBrowsingEnabled):
+        (QDeclarativeWebSettings::javascriptCanOpenWindows):
+        (QDeclarativeWebSettings::setJavascriptCanOpenWindows):
+        (QDeclarativeWebSettings::javascriptCanAccessClipboard):
+        (QDeclarativeWebSettings::setJavascriptCanAccessClipboard):
+        (QDeclarativeWebSettings::developerExtrasEnabled):
+        (QDeclarativeWebSettings::setDeveloperExtrasEnabled):
+        (QDeclarativeWebSettings::linksIncludedInFocusChain):
+        (QDeclarativeWebSettings::setLinksIncludedInFocusChain):
+        (QDeclarativeWebSettings::zoomTextOnly):
+        (QDeclarativeWebSettings::setZoomTextOnly):
+        (QDeclarativeWebSettings::printElementBackgrounds):
+        (QDeclarativeWebSettings::setPrintElementBackgrounds):
+        (QDeclarativeWebSettings::offlineStorageDatabaseEnabled):
+        (QDeclarativeWebSettings::setOfflineStorageDatabaseEnabled):
+        (QDeclarativeWebSettings::offlineWebApplicationCacheEnabled):
+        (QDeclarativeWebSettings::setOfflineWebApplicationCacheEnabled):
+        (QDeclarativeWebSettings::localStorageDatabaseEnabled):
+        (QDeclarativeWebSettings::setLocalStorageDatabaseEnabled):
+        (QDeclarativeWebSettings::localContentCanAccessRemoteUrls):
+        (QDeclarativeWebSettings::setLocalContentCanAccessRemoteUrls):
+        * declarative/qmldir: Added.
+        * docs/qtwebkit.qdocconf:
+-06-17  Mark Brand  <mabrand@mabrand.nl>
+        Reviewed by Simon Hausmann.
+        [Qt] use "win32-g++*" scope to match all MinGW makespecs
+        The scope "win32-g++" comes from the name of the makespec. However, it
+        is frequently used to check for MinGW. This works fine as long as
+        win32-g++ is the only makespec for MinGW. Now we need the wildcard
+        to cover "win32-g++-cross" as well.
+        * Api/DerivedSources.pro:
+-05-28  Viatcheslav Ostapenko  <ostapenko.viatcheslav@nokia.com>
+        Reviewed by Simon Hausmann, Antti Koivisto
+        [Qt] Add internal Qt Api to configure repaint throttling parameters.
+        https://bugs.webkit.org/show_bug.cgi?id=38401
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+-06-12  Dawit Alemayehu  <adawit@kde.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        Added an attribute to enable/disable site specific quirks mode in WebKit.
+        The attribute is enabled by default.
+        https://bugs.webkit.org/show_bug.cgi?id=40073
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        (QWebSettings::QWebSettings):
+        * Api/qwebsettings.h:
+-06-09  Pierre Rossi  <pierre.rossi@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        QWebPage::findText() does not clear selection when passed empty string
+        https://bugs.webkit.org/show_bug.cgi?id=31779
+        * Api/qwebpage.cpp:
+        (QWebPage::findText):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::findText):
+-06-12  No'am Rosenthal  <noam.rosenthal@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Add documentation to the QtWebkit bridge
+        https://bugs.webkit.org/show_bug.cgi?id=35861
+        The previous accepted patch was actually a faulty one; It was hard to trace since it's just a documentation
+        change. The new patch amends that, with the correct snippets and grammar fixes.
+        * docs/qtwebkit-bridge.qdoc:
+        * docs/webkitsnippets/qtwebkit_bridge_snippets.cpp:
+        (wrapInFunction):
+-06-11  Jesus Sanchez-Palencia  <jesus@webkit.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Typo error in QWebPluginFactory Documentation
+        https://bugs.webkit.org/show_bug.cgi?id=40490
+        * Api/qwebpluginfactory.cpp:
+-06-10  Andy Shaw  <andy.shaw@nokia.com>
+        Reviewed by Simon Hausmann.
+        REGRESSION: [Qt] When dragging onto a page that handles the drag in Javascript it will be a move and not a copy by default
+        https://bugs.webkit.org/show_bug.cgi?id=40401
+        The correct pattern in Qt for Dnd events is to use acceptProposedAction() instead
+        of accept().
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dragEnterEvent):
+        (QWebPagePrivate::dragMoveEvent):
+        (QWebPagePrivate::dropEvent):
+-06-02  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+        Reviewed by Shinichiro Hamaji.
+        [Qt] Fix compilation with QT_NO_PROPERTIES
+        https://bugs.webkit.org/show_bug.cgi?id=38324
+        * Api/qwebpage.cpp:
+        (QWebPage::event):
+        * Api/qwebpage_p.h:
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::openInspectorFrontend):
+-05-17  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Fix compilation with QT_NO_COMBOBOX
+        https://bugs.webkit.org/show_bug.cgi?id=38324
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::createSelectPopup):
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        * WebCoreSupport/QtFallbackWebPopup.h:
+-05-02  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Fix compilation with QT_NO_BEARERMANAGEMENT
+        https://bugs.webkit.org/show_bug.cgi?id=38324
+        * Api/qwebsettings.cpp:
+-03-24  Viatcheslav Ostapenko  <ostapenko.viatcheslav@nokia.com>
+        Reviewed by Laszlo Gombos.
+        Auto-uppercase and predictive text need to be disabled for S60 (as for maemo)
+        https://bugs.webkit.org/show_bug.cgi?id=33176
+        * WebCoreSupport/EditorClientQt.cpp:
+-06-01  Noam Rosenthal  <noam.rosenthal@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Add documentation to the QtWebkit bridge
+        https://bugs.webkit.org/show_bug.cgi?id=35861
+        This patch includes comprehensive qdoc documentation for the QtWebkit bridge.
+        * docs/qtwebkit-bridge.qdoc: Added.
+        * docs/qtwebkit.qdoc:
+        * docs/webkitsnippets/doc_src_qtscript.qdoc: Added.
+        * docs/webkitsnippets/qtwebkit_bridge_snippets.cpp: Added.
+        (wrapInFunction):
+-06-01  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Laszlo Gombos.
+        [Qt] Rename versioning .pri file to what Qt's mkspecs/features/qt.pri expects.
+        * qt_webkit_version.pri: Renamed from WebKit/qt/qtwebkit_version.pri.
+-05-31  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Escape backslashes in the .pro files
+        qmake in Qt 4.7 warns about unescaped backspaces and deprecates them.
+        * Api/DerivedSources.pro:
+        * docs/docs.pri:
 -05-19  Denis Dzyubenko <denis.dzyubenko@nokia.com>
 …
         * Api/qwebpage.cpp:
         (QWebPage::userAgentForUrl):
+-05-28  Antti Koivisto  <koivisto@iki.fi>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add a missing #if ENABLE(), some null checking.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+-05-28  Antti Koivisto  <koivisto@iki.fi>
+        Reviewed by Kenneth Rohde Christiansen.
+        https://bugs.webkit.org/show_bug.cgi?id=39874
+        [Qt] Make tiled backing store more configurable
+        Make tile size, tile creation delay and tiling area dynamically configurable.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+-05-29  Dawit Alemayehu  <adawit@kde.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        Added a WebAction to stop all pending page refresh/redirect
+        requests set through the <meta http-equiv="refresh"...> tag.
+        https://bugs.webkit.org/show_bug.cgi?id=29899
+        * Api/qwebpage.cpp:
+        (QWebPage::triggerAction):
+        * Api/qwebpage.h:
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::testStopScheduledPageRefresh):
+-04-20  Robert Hogan  <robert@webkit.org>
+        Reviewed by Simon Hausmann.
+        [Qt] Add more support for textInputController
+        Add support for selectedRange(), setMarkedText(), insertText(),
+        and firstRectForCharacterRange().
+        https://bugs.webkit.org/show_bug.cgi?id=35702
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::inputMethodEvent):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+-05-20  Janne Koskinen  <janne.p.koskinen@digia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] WINSCW compile fix for qwebframe test
+        https://bugs.webkit.org/show_bug.cgi?id=38722
+        WINSCW cannot determine template type up the hierarchy
+        to common base class.
+        * tests/qwebframe/tst_qwebframe.cpp:
+-05-23  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Update the Symbian version for the user agent
+        https://bugs.webkit.org/show_bug.cgi?id=38389
+        Fixes a regression introduced by r58648. Ensure that the "Symbian" string
+        is only listed one time in the User Agent string.
+        In addition make an effort to align the User Agent string to already
+        released WebKit based products for Symbian.
+        * Api/qwebpage.cpp:
+        (QWebPage::userAgentForUrl):
+-05-21  Simon Hausmann  <simon.hausmann@nokia.com>
+        Symbian build fix.
+        [Qt] Updated the wins def file with one new export.
+        The DRT symbols are still missing, but I can't build DRT ;(
+        * symbian/bwins/QtWebKitu.def:
+-05-12  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Laszlo Gombos.
+        Add a comment to explain the web inspector dynamic property url hook
+        and that it's there on purpose :)
+        https://bugs.webkit.org/show_bug.cgi?id=35340
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::openInspectorFrontend):
+-05-06  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Replace public inspector url with private property for QtLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=35340
+        Replace the public API with a private dynamic property until this feature
+        is ready.
+        * Api/qwebsettings.cpp:
+        * Api/qwebsettings.h:
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::openInspectorFrontend):
+        * symbian/bwins/QtWebKitu.def:
+        * symbian/eabi/QtWebKitu.def:
+-05-20  Luiz Agostini  <luiz.agostini@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Skipping popup focus test for maemo
+        https://bugs.webkit.org/show_bug.cgi?id=39314
+        Skipping popup focus test for maemo in qwebframe auto test.
+        The test method tst_QWebFrame::popupFocus() was testing popup focus AND input
+        field focus. The input field focus has been removed from the method popupFocus()
+        and a new test method named inputFieldFocus() has been added. Finally the test
+        method popupFocus() has been skipped for maemo.
+        * tests/qwebframe/tst_qwebframe.cpp:
+-05-20  Rajiv Ramanasankaran  <rajiv.ramanasankaran@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] QWebPage::inputMethodQuery() returns wrong values for Qt::ImCursorPosition, Qt::ImAnchorPosition
+        https://bugs.webkit.org/show_bug.cgi?id=38779
+        The earlier implementation was written with the assumption that in this scenario the
+        anchor position always corresponds to the START index and that the current cursor position
+        always corresponds to the END index in WebKit.
+        Updated the implementation of QWebPage::inputMethodQuery(Qt::ImCursorPosition) and
+        QWebPage::inputMethodQuery(Qt::ImAnchorPosition) for the case where the Editor is not in
+        composition mode. In the non-composition mode, the Anchor and the Current cursor positions
+        correspond to the Base and Extent position offsets in WebKit.
+        Also added the auto-tests for the RIGHT to LEFT and LEFT to RIGHT selections.
+        * Api/qwebpage.cpp:
+        (QWebPage::inputMethodQuery): Now returning correct values for Qt::ImCursorPosition and
+        Qt::ImAnchorPosition when the Editor is not in composition mode.
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods): Added auto-tests for RIGHT to LEFT and LEFT to RIGHT selections
 -05-12  Joe Ligman  <joseph.ligman@nokia.com>
 …
         (qtwebkit_webframe_scrollRecursively):
+-05-17  Antti Koivisto  <koivisto@iki.fi>
+        Reviewed by Kenneth Rohde Christiansen.
+        https://bugs.webkit.org/show_bug.cgi?id=39218
+        [Qt] Tiled backing store tiles sometimes flicker when exiting a zoom animation
+        Tiles sometimes flicker when exiting a zoom animation. This happens as a result
+        of the visible rectangle being momentarily out of sync.
+        Instead of updating the visible rect by explicitly setting it, pull it through
+        the client and recompute in WebKit the level.
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::paint):
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::visibleRectForTiledBackingStore):
+        * WebCoreSupport/ChromeClientQt.h:
+-05-18  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
+        Reviewed by Simon Hausmann.
+        Fix QWebHistory serialization.
+        Regression was caused by bug 33224. The streaming function
+        should generate a documentSequenceNumber for all loaded values.
+        [Qt] tst_QWebHistory::serialize_2() fails
+        https://bugs.webkit.org/show_bug.cgi?id=37322
+        * Api/qwebhistory.cpp:
+        (operator>>):
+-05-14  Kent Hansen <kent.hansen@nokia.com>, Jocelyn Turcotte <jocelyn.turcotte@nokia.com>, Tor Arne VestbÃž <tor.arne.vestbo@nokia.com>, Henry Haverinen <henry.haverinen@nokia.com>, Jedrzej Nowacki <jedrzej.nowacki@nokia.com>, Andreas Kling <andreas.kling@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Merge overhaul of the QtWebKit API documentation
+        Numerous improvements in wording, qdoc warning fixes and
+        clarifications, done in a team work effort.
+        No functional changes.
+        * Api/qwebdatabase.cpp:
+        * Api/qwebelement.cpp:
+        * Api/qwebframe.cpp:
+        * Api/qwebhistoryinterface.cpp:
+        * Api/qwebinspector.cpp:
+        * Api/qwebkitversion.cpp:
+        * Api/qwebpage.cpp:
+        * Api/qwebpluginfactory.cpp:
+        * Api/qwebsecurityorigin.cpp:
+        * Api/qwebsettings.cpp:
+        * Api/qwebsettings.h:
+        * docs/qtwebkit.qdoc:
+        * docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp:
+        (wrapInFunction):
+        * docs/webkitsnippets/webelement/main.cpp:
+        (findButtonAndClick):
+        (autocomplete1):
+        (autocomplete2):
+        (main):
+-05-14  Martin Smith  <msmith@trolltech.com>
+        Reviewed by Simon Hausmann.
+        Documentation: Fix overview grouping.
+        * docs/qtwebkit.qdoc:
+-05-14  Benjamin Poulain  <benjamin.poulain@nokia.com>
+        Reviewed by Laszlo Gombos.
+        [QT] Update the Symbian version for the user agent
+        https://bugs.webkit.org/show_bug.cgi?id=38389
+        Update the user agent for Symbian^2 to Symbian^4
+        * Api/qwebpage.cpp:
+        (QWebPage::userAgentForUrl):
+-05-11  Antonio Gomes  <tonikitoo@webkit.org>
+        Reviewed by Kenneth Christiansen.
+        [Qt] emit initialLayoutCompleted signal from FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout
+        https://bugs.webkit.org/show_bug.cgi?id=38921
+        Emit initialLayoutCompleted signal from FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout
+        instead of FrameLoaderClientQt::dispatchDidFirstLayout , because the former ensures that a
+        visual content layed out on the frame.
+        It matches to QWebFrame::initialLayoutCompleted signal documentation at:
+        "... This is the first time you will see contents displayed on the frame ..."
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchDidFirstLayout):
+        (WebCore::FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout):
+-05-11  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Laszlo Gombos.
+        [Qt] REGRESSION(r58497) tst_QGraphicsWebView::crashOnViewlessWebPages() is failing
+        https://bugs.webkit.org/show_bug.cgi?id=38655
+        Fix double free by moving the connect till after the resize.
+        The bug is causes by the fact that a resize of an empty page causes a
+        layout, thus deleting the qgraphicswebview before setHtml is called,
+        which then deletes it again, causing a double free.
+        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+        (tst_QGraphicsWebView::crashOnViewlessWebPages):
+-05-11  Diego Gonzalez  <diegohcg@webkit.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] tst_QWebPage::inputMethods failing on Maemo5
+        https://bugs.webkit.org/show_bug.cgi?id=38685
+        Check if the SIP (Software Input Panel) is triggered, which normally
+        happens on mobile platforms, when a user input form receives a mouse click.
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+-05-09  Noam Rosenthal  <noam.rosenthal@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Crash in QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate when animation were used
+        https://bugs.webkit.org/show_bug.cgi?id=38574
+        The fix uses a QWeakPointer for rootGraphicsLayer, protecting from a crash in case the layer is deleted before the QGraphicsWebView.
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::QGraphicsWebViewPrivate):
+        (QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate):
+        (QGraphicsWebViewPrivate::setRootGraphicsLayer):
+        (QGraphicsWebViewPrivate::updateCompositingScrollPosition):
+-05-03  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Expose HTMLTokenizer yielding parameters
+        https://bugs.webkit.org/show_bug.cgi?id=37023
+        Enables to set TimeDelay and ChunkSize for
+        HTMLTokenizer.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+-05-04  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] QWebPage viewMode property
+        https://bugs.webkit.org/show_bug.cgi?id=38119
+        Rename the property from wrt_viewMode to _q_viewMode.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::viewModes):
+-04-28  Luiz Agostini  <luiz.agostini@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] QWebPage viewMode property
+        https://bugs.webkit.org/show_bug.cgi?id=38119
+        Replacing method qt_wrt_setViewMode by wrt_viewMode property.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+        (QWebPage::event):
+        * Api/qwebpage_p.h:
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::wrt_viewModes):
+-04-09  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt]Fix compile error with QT_NO_IM
+        https://bugs.webkit.org/show_bug.cgi?id=36533
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopupCombo::hidePopup):
+-04-02  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+        Reviewed by Eric Seidel.
+        [Qt]Fix compile error with QT_NO_SETTINGS
+        https://bugs.webkit.org/show_bug.cgi?id=36533
+        If QT_NO_SETTINGS is defined, QSettings is not available.
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::populateSetting):
+        (WebCore::InspectorClientQt::storeSetting):
+-03-25  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+        Reviewed by Eric Seidel.
+        [Qt]Fix compile error with QT_NO_DESKTOPSERVICES
+        https://bugs.webkit.org/show_bug.cgi?id=36533
+        * Api/qwebsettings.cpp:
+        (QWebSettings::enablePersistentStorage):
+-03-25  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+        Reviewed by Eric Seidel.
+        [Qt]Fix compile error with QT_NO_DEBUG_STREAM
+        https://bugs.webkit.org/show_bug.cgi?id=36533
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::graphicsItemVisibleRect):
+-04-29  Janne Koskinen  <janne.p.koskinen@digia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] QtWebKit versioning added
+        https://bugs.webkit.org/show_bug.cgi?id=37207
+        QtWebkit releases separated from Qt release cycle.
+        * qtwebkit_version.pri: Added.
+-05-02  Benjamin Poulain  <benjamin.poulain@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] QWebPage::userAgentForUrl is terrible API
+        https://bugs.webkit.org/show_bug.cgi?id=33875
+        Simplify the creation of the user agent string to avoid some
+        overhead for each loaded url.
+        The static part of the user agent is cached so it only have
+        to be made once.
+        This creation has been made in order to simplify the code.
+        The two variable: application name and current language are
+        set dynamically when needed.
+        The default locale is non longer created if the widget locale
+        is used.
+        * Api/qwebpage.cpp:
+        (QWebPage::userAgentForUrl):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::userAgentApplicationName):
+        (tst_QWebPage::userAgentLocaleChange):
+-05-02  Noam Rosenthal  <noam.rosenthal@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] GraphicsLayer: animation incorrect when scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=38371
+        This is a regression introduced with the invalidate-on-scroll code path, that uses QGraphicsWebViewPrivate::update()
+        instead of QGraphicsWebViewPrivate::scroll(). The patch makes sure that the scrolling position is correct on
+        each content update - this shouldn't have a performance impact - the only overhead is an additional value-test on each update.
+        Tested by http://www.the-art-of-web.com/css/css-animation/
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::update):
+-04-29  Andreas Kling  <andreas.kling@nokia.com>
+        Reviewed by Simon Hausmann.
+        Remove unnecessary call to FrameView::forceLayout() in setViewportSize()
+        This prevents a double relayout on resize.
+        https://bugs.webkit.org/show_bug.cgi?id=38179
+        Thanks to Nate Whetsell <nathan.whetsell@gmail.com> for spotting this.
+        * Api/qwebpage.cpp:
+        (QWebPage::setViewportSize):
+-04-29  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Tor Arne VestbÃž.
+        [Qt] REGRESSION(r57982): tst_qwebpage::showModalDialog() crashes
+        https://bugs.webkit.org/show_bug.cgi?id=38314
+        Make sure that there's always a main frame when returning from createWindow()
+        to the caller in WebCore.
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::createWindow):
+-04-28  Janne Koskinen  <janne.p.koskinen@digia.com>
+        Reviewed by Simon Hausmann <simon.hausmann@nokia.com>
+        [Qt] WINS DEF file freeze
+        Updated WINSCW def file with added and removed symbols.
+        * symbian/bwins/QtWebKitu.def:
+-04-22  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Remove translatable strings from the hybridPixmap test.
+        https://bugs.webkit.org/show_bug.cgi?id=37867
+        * tests/hybridPixmap/widget.ui:
+-04-22  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Fix autotests .qrc file paths when built in Qt.
+        Compiling auto-tests from qt/tests/auto/qweb* produced
+        failing tests since these .pro files include the
+        ones in WebKit/qt/tests and the .qrc file was
+        not added to RESOURCES
+        * tests/benchmarks/loading/loading.pro:
+        * tests/benchmarks/painting/painting.pro:
+        * tests/qgraphicswebview/qgraphicswebview.pro:
+        * tests/qwebelement/qwebelement.pro:
+        * tests/qwebframe/qwebframe.pro:
+        * tests/qwebhistory/qwebhistory.pro:
+        * tests/qwebhistoryinterface/qwebhistoryinterface.pro:
+        * tests/qwebinspector/qwebinspector.pro:
+        * tests/qwebpage/qwebpage.pro:
+        * tests/qwebplugindatabase/qwebplugindatabase.pro:
+        * tests/qwebview/qwebview.pro:
+        * tests/tests.pri:
+-04-26  Bruno Schmidt  <bruno.schmidt@gmail.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Exposing an QVariantMap containing QObjectStar to Javascript
+        causes Segmentation Fault
+        https://bugs.webkit.org/show_bug.cgi?id=34729
+        If an QVariantMap containing QObjectStar is added to the to QtWebkit
+        Javascript, it's use causes Segmentation Fault.
+        It happens because, in the case QMetaType::QVariantMap, the "root"
+        object that is inside of a PassRefPtr is passed recursively inside a
+        loop to recover the content of the map, but the PassRefPtr semantics
+        prohibit its use inside a loop, so the "root" object mus be passed
+        using the method "PassRefPtr::get" in order to keep the current
+        reference.
+        * tests/qwebframe/tst_qwebframe.cpp:
+        (MyQObject::MyQObject): new property variantMapProperty
+        (MyQObject::variantMapProperty): read variantMapProperty
+        (MyQObject::setVariantMapProperty): write variantMapProperty
 -04-26  Thiago Macieira  <thiago.macieira@nokia.com>
 …
         * Api/qwebkitversion.h:
+-04-21  Yi Shen  <yi.4.shen@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Check the request empty or not in ChromeClientQt::createWindow()
+        https://bugs.webkit.org/show_bug.cgi?id=37821
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::createWindow):
+-04-22  John Pavan  <john.pavan@nokia.com>
+        Reviewed by Laszlo Gombos.
+        [Qt] inputMethodQuery returns coordinates in web page coordinates rather than in item coordinates.
+        https://bugs.webkit.org/show_bug.cgi?id=37163
+        QWebPage::inputMethodQuery is modified so that it
+        returns coordinates in the widget's coordinate system.
+        Tests are added for QGraphicsWebView and QWebView
+        to verify that this behavior is correct after the webpage
+        has been scrolled.
+        * Api/qwebpage.cpp:
+        (QWebPage::inputMethodQuery):
+        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+        (tst_QGraphicsWebView::microFocusCoordinates):
+        * tests/qwebview/tst_qwebview.cpp:
+        (tst_QWebView::microFocusCoordinates):
+-04-21  No'am Rosenthal  <noam.rosenthal@nokia.com>
+        Reviewed by Simon Fraser.
+        [Qt] Fix or remove the runtime flag for accelerated compositing.
+        https://bugs.webkit.org/show_bug.cgi?id=37313
+        This lets the QWebPageClient "veto" the settings value for accelerated compositing.
+        In this case we allow accelerated compositing only on QGraphicsWebView.
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::allowsAcceleratedCompositing):
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::allowsAcceleratedCompositing):
+        * WebCoreSupport/ChromeClientQt.h:
+-04-22  Robert Hogan  <robert@webkit.org>
+        Reviewed by Simon Hausmann.
+        [Qt] Fix createPlugin() tests in tst_qwebpage to match behaviour of Qt plugins
+             when PluginsEnabled is false.
+        tst_qwebpage should have been updated as part of r56662.
+        (See https://bugs.webkit.org/show_bug.cgi?id=32196)
+        Updated documentation of QWebPage::createPlugin and QWebSetting::pluginsEnabled
+            to match the new behaviour.
+        * Api/qwebpage.cpp: Update docs.
+        * Api/qwebsettings.cpp: Update docs.
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (createPlugin):
+        (tst_QWebPage::createPluginWithPluginsEnabled):
+        (tst_QWebPage::createPluginWithPluginsDisabled):
+-04-09  Antonio Gomes  <tonikitoo@webkit.org>
+        Reviewed by Kenneth Christiansen and Tor Arne VestbÃž.
+        REGRESSION(r56552): Broken scrollbars size
+        https://bugs.webkit.org/show_bug.cgi?id=36853
+        The regression was caused by r56552, which introduced a fix to bug
+        webkit.org/b/21300. The bug solved an issue with the resize handle on mac,
+        but did it in a way that affected all Qt platforms and thus broke the behavior
+        on non-mac platforms.
+        This patch makes the mac specific change ifdef'ed and only applied for the mac
+        platform.
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::windowResizerRect):
+-04-19  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Fix compilation against namespaced Qt.
+        * WebCoreSupport/ChromeClientQt.h:
+        * WebCoreSupport/QtFallbackWebPopup.h:
+-04-14  Luiz Agostini  <luiz.agostini@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        Changing view mode names due to specification changes
+        https://bugs.webkit.org/show_bug.cgi?id=37615
+        test: fast/media/media-feature-wgt-view-mode.html
+        specification: http://dev.w3.org/2006/waf/widgets-vmmf/
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::isWindowed):
+        (WebCore::ChromeClientQt::isFullscreen):
+        (WebCore::ChromeClientQt::isMaximized):
+        (WebCore::ChromeClientQt::isMinimized):
+        * WebCoreSupport/ChromeClientQt.h:
+-04-14  Andreas Kling  <andreas.kling@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Rendering artifacts on Qt plugins when scrolling the page
+        https://bugs.webkit.org/show_bug.cgi?id=37152
+        Because we no longer repaint the entire viewport on scroll,
+        we must trigger a repaint of QtPluginWidgets when their geometry changes.
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+-04-09  Yi Shen  <yi.4.shen@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] tst_QWebFrame::popupFocus() fails
+        https://bugs.webkit.org/show_bug.cgi?id=37320
+        The QWebPopup class has been moved & renamed, so tst_QWebFrame::popupFocus() should use
+        the class name "QComboBox", rather than "WebCore::QWebPopup" to find the popup menu.
+        * tests/qwebframe/tst_qwebframe.cpp:
+-04-15  Bruno Schmidt  <bruno.schmidt@gmail.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Null QObjects properties cause Segmentation Fault
+        https://bugs.webkit.org/show_bug.cgi?id=34730
+        QObjects exported to the QWebkit javascript with properties that are
+        a null "QObject*" cause Segmentation Fault.
+        If an QObject is added to the javascript context and it contains
+        properties of the type QObject* with NULL value, calling the property
+        causes Segmentation Fault.
+        Follow the tests for the corrections done over WebCore.
+        * tests/qwebframe/tst_qwebframe.cpp:
+        (MyQObject::MyQObject): init the field m_objectStar
+        (MyQObject::objectStarProperty): read the Object* prop
+        (MyQObject::setObjectStarProperty): write the Object* prop
+        (tst_QWebFrame::getSetStaticProperty): new tests for the new prop
+-04-15  Kent Hansen  <kent.hansen@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Mark QWebFrame::overloadedSlots autotest as expected failure
+        https://bugs.webkit.org/show_bug.cgi?id=37319
+        * tests/qwebframe/tst_qwebframe.cpp:
+-04-09  Tasuku Suzuki  <tasuku.suzuki@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Fix compile error with QT_NO_ACTION
+        https://bugs.webkit.org/show_bug.cgi?id=36529
+        Make sure QT_NO_ACTION is not defined to use QAction
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::pageAction):
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::updateAction):
+        (QWebPage::updatePositionDependentActions):
+        * Api/qwebpage.h:
+        * Api/qwebview.cpp:
+        * Api/qwebview.h:
+-04-09  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Lars Knoll.
+        [Qt] tests/qgraphicswebview fails
+        https://bugs.webkit.org/show_bug.cgi?id=37317
+        * Api/qwebpage.cpp:
+        (QWebPage::userAgentForUrl): Don't crash if the ownerWidget is null.
+-04-08  Benjamin Poulain  <benjamin.poulain@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Warnings when compiling InspectorClientQt.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=37266
+        Add a default: for the switch()-case to avoid
+        warnings.
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::variantToSetting):
+-04-08  Joe Ligman  <joseph.ligman@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] WebKit crashes while input text through input method.
+        The formatted text underline painting crashes when painting with invalid indexes.
+        https://bugs.webkit.org/show_bug.cgi?id=36870
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::inputMethodEvent):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethodsTextFormat_data):
+        (tst_QWebPage::inputMethodsTextFormat):
+-04-01  Antonio Gomes  <tonikitoo@webkit.org>
+        Reviewed by David Hyatt.
+        [Qt] REGRESSION:(r50665) QWebFrame::setScrollBarPolicy(Qt::Vertical,Qt::ScrollBarAlwaysOff) has no effect.
+        https://bugs.webkit.org/show_bug.cgi?id=29431
+        Make use of the new lock parameter of set{Vertical,Horizontal}ScrollbarMode.
+        Always added a qt auto test for set scrollbar policy feature.
+        * Api/qwebframe.cpp:
+        (QWebFrame::setScrollBarPolicy):
+        * tests/qwebframe/tst_qwebframe.cpp:
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (FrameLoaderClientQt::transitionToCommittedForNewPage):
 -04-08  Joe Ligman  <joseph.ligman@nokia.com>
 …
         (qtwebkit_webframe_scrollRecursively):
+-03-24  Viatcheslav Ostapenko  <ostapenko.viatcheslav@nokia.com>
+        Reviewed by Laszlo Gombos.
+        Auto-uppercase and predictive text need to be disabled for S60 (as for maemo)
+        https://bugs.webkit.org/show_bug.cgi?id=33176
+        * WebCoreSupport/EditorClientQt.cpp:
+-03-22  Jakub Wieczorek  <jwieczorek@webkit.org>
+        Reviewed by Simon Hausmann.
+        [Qt] Don't construct a QLineEdit every time when painting a text field
+        https://bugs.webkit.org/show_bug.cgi?id=36373
+        Add a simple benchmark covering this area.
+        * tests/benchmarks/painting/tst_painting.cpp:
+        (tst_Painting::textAreas):
+-03-22  Yi Shen  <shenyi2006@gmail.com>
+        Reviewed by Simon Hausmann.
+        https://bugs.webkit.org/show_bug.cgi?id=35933
+        [Qt] [Symbian] Can not backward select (highlight) text using virtual keyboard
+        Make sure the selection start index is smaller than the selection end index.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::inputMethodEvent):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+-04-07  Andreas Kling  <andreas.kling@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] When providing a widget for the PDF mime type it will cause a crash
+        m_pluginView may actually be a Widget (for embedded Qt widgets),
+        so always check isPluginView() before calling PluginView specific methods.
+        https://bugs.webkit.org/show_bug.cgi?id=29450
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::finishedLoading):
+        (WebCore::FrameLoaderClientQt::setMainDocumentError):
+        (WebCore::FrameLoaderClientQt::committedLoad):
+-04-07  Dawit Alemayehu  <adawit@kde.org>
+        Reviewed by Simon Hausmann.
+        https://bugs.webkit.org/show_bug.cgi?id=36827
+        Updated the WebCore::shouldTreatAsAttachement function call with the
+        new more generic replacement WebCore::contentDispositionType.
+        See comments 39-42 in https://bugs.webkit.org/show_bug.cgi?id=36395
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForMIMEType):
+-04-02  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] [Symbian] Rebaseline Symbian def file
+        https://bugs.webkit.org/show_bug.cgi?id=37038
+        Switch the ordinal numbers for qtwebkit_webframe_scrollRecursively
+        and QWebInspector::closeEvent to match QtWebkit 4.6 branch
+        Fix the signature for qt_drt_setFrameFlatteningEnabled
+        after r56718.
+        Add new QtWebKit API symbols introduced not listed in the file yet.
+        * symbian/eabi/QtWebKitu.def:
+-04-06  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+        Reviewed by Simon Hausmann.
+        [Qt] Add mechanism to detect QtWebKit 2.0 via the preprocessor
+        https://bugs.webkit.org/show_bug.cgi?id=36538
+        * Api/qwebkitglobal.h:
+-04-02  Luiz Agostini  <luiz.agostini@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Maemo5 theme - customized popup for <select multiple> elements
+        https://bugs.webkit.org/show_bug.cgi?id=36368
+        Using QtMaemoWebPopup instead of QtFallbackWebPopup for Maemo.
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::createSelectPopup):
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::show):
+        (WebCore::QtFallbackWebPopup::populate):
+-04-01  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add Single and Multiple Selection Popup for Maemo 5.
+        [Qt] Maemo5 theme - popup dialogs
+        https://bugs.webkit.org/show_bug.cgi?id=36789
+        * WebCoreSupport/QtMaemoWebPopup.cpp:
+        (WebCore::Maemo5Popup::populateList):
+        (WebCore::Maemo5Popup::onItemSelected):
+        (WebCore::QtMaemoWebPopup::createSingleSelectionPopup):
+        (WebCore::QtMaemoWebPopup::createMultipleSelectionPopup):
+        (WebCore::Maemo5SingleSelectionPopup::Maemo5SingleSelectionPopup):
+        (WebCore::MultipleItemListDelegate::MultipleItemListDelegate):
+        (WebCore::MultipleItemListDelegate::paint):
+        (WebCore::Maemo5MultipleSelectionPopup::Maemo5MultipleSelectionPopup):
+        * WebCoreSupport/QtMaemoWebPopup.h:
+-03-30  Luiz Agostini  <luiz.agostini@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Maemo5 theme - QtMaemoWebPopup class
+        https://bugs.webkit.org/show_bug.cgi?id=36790
+        A new QtAbstractWebPopup descendant class to be used for maemo menu lists.
+        This is the first step. The next step will be the dialogs implementation that
+        will come in bug 36789 and finally to use QtMaemoWebPopup instead of QtFallbackWebPopup
+        that will come in bug 36368.
+        * WebCoreSupport/QtMaemoWebPopup.cpp: Added.
+        (WebCore::QtMaemoWebPopup::QtMaemoWebPopup):
+        (WebCore::QtMaemoWebPopup::~QtMaemoWebPopup):
+        (WebCore::QtMaemoWebPopup::createSingleSelectionPopup):
+        (WebCore::QtMaemoWebPopup::createMultipleSelectionPopup):
+        (WebCore::QtMaemoWebPopup::createPopup):
+        (WebCore::QtMaemoWebPopup::show):
+        (WebCore::QtMaemoWebPopup::hide):
+        (WebCore::QtMaemoWebPopup::popupClosed):
+        (WebCore::QtMaemoWebPopup::itemClicked):
+        * WebCoreSupport/QtMaemoWebPopup.h: Added.
+        (WebCore::Maemo5Popup::Maemo5Popup):
+-03-31  Antti Koivisto  <koivisto@iki.fi>
+        Reviewed by Kenneth Rohde Christiansen.
+        https://bugs.webkit.org/show_bug.cgi?id=36446
+        [Qt] QWebSettings::TiledBackingStoreEnabled attribute lacks documentation and default value
+        * Api/qgraphicswebview.cpp:
+        * Api/qwebsettings.cpp:
+        (QWebSettings::QWebSettings):
+-03-26  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Antti Koivisto.
+        Change due to renaming of frame flattening setting.
+        * Api/qwebpage.cpp:
+        (qt_drt_setFrameFlatteningEnabled):
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        * symbian/eabi/QtWebKitu.def:
+-03-29  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Antti Koivisto.
+        Use 'Mobile Safari' instead of 'Safari' on mobile Qt platforms.
+        * Api/qwebpage.cpp:
+        (QWebPage::userAgentForUrl):
+-03-22  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Simon Fraser.
+        Add support for Widgets 1.0: View Mode Media Feature
+        https://bugs.webkit.org/show_bug.cgi?id=35446
+        Add an internal Qt API for changing the view mode media feature
+        (http://www.w3.org/TR/widgets-vmmf/).
+        * Api/qwebpage.cpp:
+        (qt_wrt_setViewMode):
+        (QWebPagePrivate::priv):
+        * Api/qwebpage_p.h:
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::isDocked):
+        (WebCore::ChromeClientQt::isFloating):
+        (WebCore::ChromeClientQt::isApplication):
+        (WebCore::ChromeClientQt::isFullscreen):
+        * WebCoreSupport/ChromeClientQt.h:
+-03-29  Dawit Alemayehu  <adawit@kde.org>
+        Reviewed by Simon Hausmann.
+        [Qt] Added support for handling the HTTP "Content-Disposition" header.
+        https://bugs.webkit.org/show_bug.cgi?id=36395
+        Whenever a server response contains a "Content-Disposition: attachment..." header,
+        treat the request as a download and emit the unsupportedContent signal.
+        * Api/qwebpage.cpp:
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::download):
+        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForMIMEType):
+-03-29  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Tor Arne VestbÃž.
+        [Qt] unit tests don't compile inside of Qt
+        https://bugs.webkit.org/show_bug.cgi?id=36756
+        * tests/tests.pri: Don't do the target substitution inside Qt and find the sources
+        through VPATH instead of relying on the location of the .pro file exclusively.
 -03-25  Yael Aharon  <yael.aharon@nokia.com>
 …
         * Api/qgraphicswebview.h:
+-03-26  Olivier Goffart  <ogoffart@trolltech.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Compile with QT_USE_FAST_OPERATOR_PLUS
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::populateSetting):
+        (WebCore::InspectorClientQt::storeSetting):
+-03-26  David Boddie  <dboddie@trolltech.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Doc: Simplified Commercial Editions for Qt 4.7.
+        * docs/qtwebkit.qdoc:
+-03-25  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Eric Seidel.
+        Make QWebPage not depend on view() but use the client->ownerWidget()
+        instead. Also, handle the case where there is not page client.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::createContextMenu):
+        (QWebPagePrivate::keyPressEvent):
+        (QWebPage::javaScriptAlert):
+        (QWebPage::javaScriptConfirm):
+        (QWebPage::javaScriptPrompt):
+        (QWebPage::shouldInterruptJavaScript):
+        (QWebPage::createWindow):
+        (QWebPage::action):
+        (QWebPage::extension):
+        (QWebPage::chooseFile):
+        (QWebPage::userAgentForUrl):
+-03-23  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Simon Hausmann.
+        Calling setView(0) on a QWebPage being shown by a QGraphicsWebView,
+        would uninstall the page client, deleting the QGraphicsWebViewPrivate
+        instance. If called with an argument, it would do a wrong static_cast
+        and crash.
+        * Api/qwebpage.cpp:
+        (QWebPageWidgetClient::QWebPageWidgetClient):
+        (QWebPageWidgetClient::isQWidgetClient):
+        (QWebPageWidgetClient::screenNumber):
+        (QWebPage::QWebPage):
+        (QWebPage::setView):
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::unsetPageIfExists):
+        (QGraphicsWebView::setPage):
+        * Api/qwebpage.cpp:
+        (QWebPageWidgetClient::isQWidgetClient):
+        (QWebPageWidgetClient::screenNumber):
+        (QWebPage::QWebPage):
+        (QWebPage::setView):
+        * Api/qwebpage.h:
+        * Api/qwebview.cpp:
+        (QWebViewPrivate::unsetPageIfExists):
+        (QWebView::setPage):
+-03-25  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Implement ChromeClient::windowResizerRect()
+        https://bugs.webkit.org/show_bug.cgi?id=21300
+        We assume the resize corner to be in the lower right corner of
+        the window and having the width and height of the scrollbars.
+        The helper function geometryRelativeToOwnerWidget() in the page
+        client is used to clip the resize rect to the actual size of the
+        viewport, not the size of the QGraphicsView.
+        * Api/qgraphicswebview.cpp:
+        * Api/qwebpage.cpp:
+        * WebCoreSupport/ChromeClientQt.cpp:
+-03-24  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        Add the FrameFlatteningEnabled WebAttribute to QWebSettings.
+        [Qt] Missing QWebSettings for Frame Flattening
+        https://bugs.webkit.org/show_bug.cgi?id=36553
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        (QWebSettings::QWebSettings):
+        * Api/qwebsettings.h:
+-03-26  Simon Hausmann  <simon.hausmann@nokia.com>
+        Symbian build fix.
+        [Qt] Updated the def file with new exports used by QtLauncher.
+        * symbian/eabi/QtWebKitu.def:
+-03-24  Kent Tamura  <tkent@chromium.org>
+        Reviewed by Darin Adler.
+        Make Icon::createIconForFiles() optional.
+        https://bugs.webkit.org/show_bug.cgi?id=35072
+        - Rename iconForFiles() to chooseIconForFiles().
+        - Call Icon::createIconForFiles() from chooseIconForFiles().
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::chooseIconForFiles):
+        * WebCoreSupport/ChromeClientQt.h:
+-03-23  Luiz Agostini  <luiz.agostini@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        QGraphicsWebView crash when calling setView on the QWebPage...
+        https://bugs.webkit.org/show_bug.cgi?id=36436
+        Checking for pageClient existance before showing popups.
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::show):
+-03-23  Anders Bakken <anders.bakken@nokia.com>, Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        Check if q->scene() is available before actually using it
+        on QGraphicsWebViewPrivate.
+        QGraphicsWebView crash
+        https://bugs.webkit.org/show_bug.cgi?id=32670
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::screenNumber):
+        (QGraphicsWebViewPrivate::ownerWidget):
 -03-23  David Leong  <david.leong@nokia.com>
 …
         * symbian/eabi/QtWebKitu.def:
+-03-23  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Remove support for Qt v4.4
+        https://bugs.webkit.org/show_bug.cgi?id=36389
+        * Api/qwebelement.cpp:
+        (QWebElement::classes):
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::editorActionForKeyEvent):
+        (QWebPage::userAgentForUrl):
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::handleKeyboardEvent):
+        * tests/tests.pro:
+-03-22  Kent Hansen  <kent.hansen@nokia.com>
+        Reviewed by Laszlo Gombos.
+        [Qt] Fix qdoc warnings
+        https://bugs.webkit.org/show_bug.cgi?id=36447
+        * Api/qgraphicswebview.cpp: Add missing ().
+        * Api/qwebframe.cpp: Remove reference to non-existent parameter "url".
+        * Api/qwebsettings.cpp:  Document parameter "location".
+-03-22  Jakub Wieczorek  <jwieczorek@webkit.org>
+        Reviewed by Simon Hausmann.
+        [Qt] Don't construct a QLineEdit every time when painting a text field
+        https://bugs.webkit.org/show_bug.cgi?id=36373
+        Add a simple benchmark covering this area.
+        * tests/benchmarks/painting/tst_painting.cpp:
+        (tst_Painting::textAreas):
+-03-22  Yi Shen  <shenyi2006@gmail.com>
+        Reviewed by Simon Hausmann.
+        https://bugs.webkit.org/show_bug.cgi?id=35933
+        [Qt] [Symbian] Can not backward select (highlight) text using virtual keyboard
+        Make sure the selection start index is smaller than the selection end index.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::inputMethodEvent):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+-03-21  Kristian Amlie  <kristian.amlie@nokia.com>
+        Reviewed by Simon Hausmann.
+        Fixed updating the VKB display when inputting into QGraphicsWebView.
+        https://bugs.webkit.org/show_bug.cgi?id=36292
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::_q_updateMicroFocus):
+        (QGraphicsWebView::setPage):
+        * Api/qgraphicswebview.h:
+-03-19  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Unreviewed.
+        Buildfix for Qt v4.5.
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewOverlay::q):
+-03-18  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Darin Adler.
+        Make it possible for the Qt DRT to set the media type from
+        the LayoutTestController.
+        * Api/qwebframe.cpp:
+        (qt_drt_setMediaType):
 -03-18  Joe Ligman  <joseph.ligman@nokia.com>
 …
         * tests/qwebframe/tst_qwebframe.cpp:
 -12-18  Joe Ligman  <joseph.ligman@nokia.com>
+-03-18  Antti Koivisto  <koivisto@iki.fi>
         Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Add new API to QWebFrame to scrollRecursively starting with any css overflow
+        then checking current frame and then ancestors
+        https://bugs.webkit.org/show_bug.cgi?id=32668
+        * Api/qwebframe.cpp:
+        (QWebFramePrivate::scrollOverflow):
+        (QWebFrame::scrollRecursively):
+        https://bugs.webkit.org/show_bug.cgi?id=36102
+        [Qt] Scaling control API for tiled backing store
+        The scale is set by passing the QGraphicsWebView scale to the backing store. The
+        only new API is the tiledBackingStoreFrozen property which allows disabling
+        all updates (for example during zoom animation).
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::_q_scaleChanged):
+        (QGraphicsWebViewPrivate::updateTiledBackingStoreScale):
+        (QGraphicsWebView::QGraphicsWebView):
+        (QGraphicsWebView::isTiledBackingStoreFrozen):
+        (QGraphicsWebView::setTiledBackingStoreFrozen):
+        * Api/qgraphicswebview.h:
+        * Api/qwebframe.cpp:
+        * Api/qwebframe_p.h:
+-03-17  Antti Koivisto  <koivisto@iki.fi>
+        Reviewed by Tor Arne VestbÃž.
+        Fix Qt build with tiled backing store disabled.
+        * Api/qwebframe.cpp:
+        * Api/qwebframe_p.h:
+-03-17  Chang Shu  <chang.shu@nokia.com>
+        Reviewed by Laszlo Gombos.
+        https://bugs.webkit.org/show_bug.cgi?id=36139
+        [Qt] Clean up cache while setting cache quota. This behavior matches other platforms,
+        such as mac and gtk.
+         * Api/qwebsettings.cpp:
+        (QWebSettings::setOfflineWebApplicationCacheQuota):
+-03-17  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Enable accelerated compositing by default
+        https://bugs.webkit.org/show_bug.cgi?id=35866
+        * Api/qwebsettings.cpp:
+        (QWebSettings::QWebSettings):
+-03-15  Antti Koivisto  <koivisto@iki.fi>
+        Reviewed by Simon Hausmann.
+        https://bugs.webkit.org/show_bug.cgi?id=36121
+        [Qt] Make WebKit scrollbars work with tiling
+        - Use the scrollbar overlay (implemented for accelerated compositing) when in tiled mode.
+        - Make overlay compile unconditionally, enable on demand. This removes bunch of unneeded ifdefs.
+        - Update the scroll position to the backing store as needed.
+        - Renamed some methods.
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::):
+        (QGraphicsWebViewPrivate::createOrDeleteOverlay):
+        (QGraphicsWebViewPrivate::setRootGraphicsLayer):
+        (QGraphicsWebViewPrivate::updateCompositingScrollPosition):
+        (QGraphicsWebViewPrivate::scroll):
+        (QGraphicsWebViewPrivate::update):
+        (QGraphicsWebViewPrivate::graphicsItemVisibleRect):
+        (QGraphicsWebView::paint):
+        (QGraphicsWebView::setPage):
+        (QGraphicsWebView::updateGeometry):
+        (QGraphicsWebView::setGeometry):
+        * Api/qwebframe.cpp:
+        (QWebFramePrivate::renderFromTiledBackingStore):
+        * Api/qwebframe_p.h:
+-03-15  Robert Hogan  <robert@webkit.org>
+        Reviewed by Simon Hausmann.
+        [Qt] Fix crash in QWebView::setPage()
+        tst_qwebpage was crashing on setPage(0)
+        https://bugs.webkit.org/show_bug.cgi?id=36137
+        * Api/qwebview.cpp:
+        (QWebView::setPage):
+-03-16  Yury Semikhatsky <yurys@chromium.org>
+        Reviewed by Pavel Feldman.
+        Introduce InspectorFrontendClient that provides InspectorFrontend with an interface to the embedder. InspectorClient now serves as a delegate for InspectorController and does not contain methods for managing inspector frontend window. That allows to create remote InspectorFrontendHost.
+        Introduce InspectorFrontendClient that would provide InspectorFrontend with an interface to the embedder
+        https://bugs.webkit.org/show_bug.cgi?id=35036
+        * Api/qwebinspector.cpp:
+        (QWebInspector::hideEvent):
+        (QWebInspector::closeEvent):
+        * Api/qwebinspector.h:
+        * Api/qwebpage.h:
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::openInspectorFrontend):
+        (WebCore::InspectorFrontendClientQt::InspectorFrontendClientQt):
+        (WebCore::InspectorFrontendClientQt::frontendLoaded):
+        (WebCore::InspectorFrontendClientQt::localizedStringsURL):
+        (WebCore::InspectorFrontendClientQt::hiddenPanels):
+        (WebCore::InspectorFrontendClientQt::bringToFront):
+        (WebCore::InspectorFrontendClientQt::closeWindow):
+        (WebCore::InspectorFrontendClientQt::attachWindow):
+        (WebCore::InspectorFrontendClientQt::detachWindow):
+        (WebCore::InspectorFrontendClientQt::setAttachedWindowHeight):
+        (WebCore::InspectorFrontendClientQt::inspectedURLChanged):
+        (WebCore::InspectorFrontendClientQt::updateWindowTitle):
+        * WebCoreSupport/InspectorClientQt.h:
+-03-15  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Unreviewed.
+        [Qt] Build fix if TILED_BACKING_STORE is disabled.
+        * Api/qwebframe.cpp:
+        (QWebFramePrivate::renderContentsLayerAbsoluteCoords):
+-03-14  Chang Shu  <chang.shu@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] [Symbian] Use Symbian native dialog providers for combo pupups.
+        https://bugs.webkit.org/show_bug.cgi?id=35919
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::show):
+        (WebCore::ResetAndDestroy):
+        (WebCore::QtFallbackWebPopup::showS60BrowserDialog):
+        * WebCoreSupport/QtFallbackWebPopup.h:
+-03-14  Antti Koivisto  <koivisto@iki.fi>
+        Reviewed by Simon Hausmann.
+        https://bugs.webkit.org/show_bug.cgi?id=35146
+        Support tiled backing store
+        Implements a basic tiled backing store mechanism. Tiles are created and
+        deleted on demand. The page content is cached to the tiles. Tile content
+        is kept in sync with the document. Since the backing store covers area
+        larger than the currently visible viewport, the document can be scrolled
+        quickly without having to enter rendering tree painting.
+        The tile management code is platform independent. This patch has simple QPixmap
+        based tile implementation for Qt.
+        The feature is behind ENABLE_TILED_BACKING_STORE flag.
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::visibleRect):
+        (QGraphicsWebView::paint):
+        * Api/qwebframe.cpp:
+        (QWebFramePrivate::renderContentsLayerAbsoluteCoords):
         * Api/qwebframe.h:
+        * Api/qwebframe_p.h:
+        * tests/qwebframe/qwebframe.qrc:
+        * tests/qwebframe/testiframe.html: Added.
+        * tests/qwebframe/testiframe2.html: Added.
+        * tests/qwebframe/tst_qwebframe.cpp:
+-03-21  Kristian Amlie  <kristian.amlie@nokia.com>
+        Reviewed by Simon Hausmann.
+        Fixed updating the VKB display when inputting into QGraphicsWebView.
+        https://bugs.webkit.org/show_bug.cgi?id=36292
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::_q_updateMicroFocus):
+        (QGraphicsWebView::setPage):
+        * Api/qgraphicswebview.h:
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        * Api/qwebsettings.h:
+-03-13  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
+        [Qt] Enable accelerated compositing by default
+        https://bugs.webkit.org/show_bug.cgi?id=35866
+        Unreviewed. Roll-out r55955, because it broke 3 tests:
+        - animations/fill-mode-transform.html
+        - animations/play-state.html
+        - animations/simultaneous-start-left.html
+        * Api/qwebsettings.cpp:
+        (QWebSettings::QWebSettings):
+-03-13  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Enable accelerated compositing by default
+        https://bugs.webkit.org/show_bug.cgi?id=35866
+        * Api/qwebsettings.cpp:
+        (QWebSettings::QWebSettings):
+-03-11  Anders Carlsson  <andersca@apple.com>
+        Reviewed by David Hyatt.
+        Remove invalidateContents, it isn't used and it never makes sense to only invalidate the contents.
+        * WebCoreSupport/ChromeClientQt.cpp:
+        * WebCoreSupport/ChromeClientQt.h:
+-03-10  Robert Hogan  <robert@webkit.org>
+        Reviewed by Simon Hausmann.
+        [Qt] Add Support for WebKitEnableCaretBrowsing to Qt DRT
+        Unskip test fast/events/multiline-link-arrow-navigation.html
+        Fix typo (superfluous space) in QWebSettings docs.
+        https://bugs.webkit.org/show_bug.cgi?id=35593
+        * Api/qwebpage.cpp:
+        (qt_drt_enableCaretBrowsing):
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply): fix typo in docs
+-03-02  Adam Treat  <atreat@rim.com>
+        Reviewed by Dave Hyatt.
+        Adapt the qt port to the refactoring of repaint methods.
+        https://bugs.webkit.org/show_bug.cgi?id=34214
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::invalidateContents):
+        (WebCore::ChromeClientQt::invalidateWindow):
+        (WebCore::ChromeClientQt::invalidateContentsAndWindow):
+        (WebCore::ChromeClientQt::invalidateContentsForSlowScroll):
+        * WebCoreSupport/ChromeClientQt.h:
+-03-08  Eric Uhrhane  <ericu@chromium.org>
+        Reviewed by David Levin.
+        Remove the now-redundant Settings fields for the Database
+        https://bugs.webkit.org/show_bug.cgi?id=35763
+        No new tests; this code isn't called.
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply): Remove the call into Settings.
+-03-08  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Laszlo Gombos.
+        [Qt] Binary incompatibility between Qt 4.6's WebKit and trunk in QWebSettings
+        https://bugs.webkit.org/show_bug.cgi?id=35858
+        Moved the enum value added in r54873 to the end of the enum, to preserve
+        binary compatibility. DnsPrefetchEnabled was in the last release and needs
+        to remain after LocalContentCanAccessRemoteUrls.
+        * Api/qwebsettings.h:
+-03-06  Mark Rowe  <mrowe@apple.com>
+        Rubber-stamped by Sam Weinig.
+        Remove unnecessary includes of wtf/Platform.h.  This is already pulled in by the prefix header.
+        * WebCoreSupport/EditCommandQt.cpp:
+-03-02  Antonio Gomes  <tonikitoo@webkit.org>
+        Reviewed by Simon Hausmann.
+        Patch by Antonio Gomes <tonikitoo@webkit.org>
+        [Qt] QWebSettings attribute for toggle Spatial Navigation on/off
+        https://bugs.webkit.org/show_bug.cgi?id=33714 (Qt API part)
+        Added 'SpatialNavigationEnabled' attribute to QWebSettings.
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        * Api/qwebsettings.h:
 -03-04  Simon Hausmann  <simon.hausmann@nokia.com>
 …
         * Api/qwebelement.h:
+-01-28  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Simon Hausmann.
+        Do not set the combobox font on Maemo5 and S60; use the
+        default instead.
+-03-04  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Tor Arne VestbÃž.
+        [Qt] Make the OUTPUT_DIR variable in qmake projects independent of build-webkit's logic.
+        This also allows shadow builds relying only on qmake to work properly.
+        * tests/benchmarks/loading/loading.pro:
+        * tests/benchmarks/painting/painting.pro:
+        * tests/hybridPixmap/hybridPixmap.pro:
+        * tests/qgraphicswebview/qgraphicswebview.pro:
+        * tests/qwebelement/qwebelement.pro:
+        * tests/qwebframe/qwebframe.pro:
+        * tests/qwebhistory/qwebhistory.pro:
+        * tests/qwebhistoryinterface/qwebhistoryinterface.pro:
+        * tests/qwebinspector/qwebinspector.pro:
+        * tests/qwebpage/qwebpage.pro:
+        * tests/qwebplugindatabase/qwebplugindatabase.pro:
+-03-02  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Fix generation of forwarding headers
+        The dependencies were a bit wrong, so we ended up not generating
+        forwarding headers for qwebkitversion.h and qwebkitglobal.h
+        The forwarding headers are now the only targets depending on the
+        real headers. All other targets either depend on the generated
+        class headers, or the forwarding headers.
+        * Api/DerivedSources.pro:
+-03-02  Eric Uhrhane  <ericu@chromium.org>
+        Reviewed by David Levin.
+        Move database enable bit fully out of settings
+        This is stage one of a three-stage commit [webkit, then chromium, then
+        webkit again].  In this change I'm adding calls to
+        Database::setIsAvailable inside Settings::setDatabaseEnabled and
+        anywhere else that called it, and switching webkit fully over to using
+        that flag [added in a previous checkin].  Phase two will remove
+        Chromium's use of Settings for the Database, and phase three will remove
+        the Setting for the Database enable entirely, leaving only
+        Database::isAvailable/setIsAvailable.
+        No new tests; tested by existing storage tests.
+        https://bugs.webkit.org/show_bug.cgi?id=35310
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):  Add a call to Database::setIsAvailable
+-03-02  Simon Hausmann  <simon.hausmann@nokia.com>
+        Symbian build fix.
+        [Qt] Updated the def file with one new export, to fix
+        QtLauncher linkage.
+        * symbian/eabi/QtWebKitu.def:
+-03-01  Jakob Petsovits  <jpetsovits@rim.com>
+        Reviewed by Adam Barth.
+        Adapt to the new ZoomMode enum.
+        https://bugs.webkit.org/show_bug.cgi?id=35347
+        * Api/qwebframe.cpp:
+        (QWebFrame::setTextSizeMultiplier):
+        (QWebFrame::setZoomFactor):
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+-02-26  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+        Reviewed by Simon Hausmann.
+        Fix documentation of QWebSettings::setUserStyleSheetUrl method
+        The base 64 data in the exemple shows a not valid code.
+        REGRESSION: QWebSettings::setUserStyleSheetUrl is not working with a data URL (Base64)
+        https://bugs.webkit.org/show_bug.cgi?id=34802
+        * Api/qwebsettings.cpp:
+-02-26  Jamey Hicks  <jamey.hicks@nokia.com>
+        Reviewed by Laszlo Gombos.
+        [Qt] added QWebSettings::setInspectorUrl() and QWebSettings::inspectorUrl()
+        Enables the use of alternate Web Inspector frontends by changing
+        the location of the frontend.
+        This is required so that the Web Inspector may be run from an
+        external process or an external tool such as Eclipse or Aptana may
+        be used instead of the in-process Web Inspector UI.
+        https://bugs.webkit.org/show_bug.cgi?id=35340
+        * Api/qwebsettings.cpp:
+        (QWebSettings::QWebSettings):
+        (QWebSettings::setInspectorUrl):
+        (QWebSettings::inspectorUrl):
+        * Api/qwebsettings.h:
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::createPage):
+-02-25  Jarkko Sakkinen  <jarkko.sakkinen@tieto.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        Qt WebGL support
+        Adds enabling and disabling of WebGL support to QWebSettings.
+        https://bugs.webkit.org/show_bug.cgi?id=35153
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        (QWebSettings::QWebSettings):
+        * Api/qwebsettings.h:
+-02-19  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Remove QGVLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=35292
+        * QGVLauncher/QGVLauncher.pro: Removed.
+        * QGVLauncher/main.cpp: Removed.
+-02-23  Steve Block  <steveblock@google.com>
+        Reviewed by Darin Adler.
+        Adds ChromeClient::cancelGeolocationPermissionRequestForFrame
+        https://bugs.webkit.org/show_bug.cgi?id=34962
+        This method is required so that a Geolocation object can cancel an
+        asynchronous permission request. This allows the chrome client to cancel
+        any UI it is showing for the permission request.
+        * WebCoreSupport/ChromeClientQt.h:
+        (WebCore::ChromeClientQt::cancelGeolocationPermissionRequestForFrame):
+-02-22  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Unreviewed Symbian build fix.
+        [Qt] Updated the def file with new exports to enable
+        building DumpRenderTree.
+        * symbian/eabi/QtWebKitu.def:
+-02-18  Noam Rosenthal  <noam.rosenthal@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Minor improvement to hybrid QPixmap
+        https://bugs.webkit.org/show_bug.cgi?id=34507
+        * tests/hybridPixmap/test.html: use assignToHTMLImageElement on an
+        existing element instead of toHTMLImageElement which creates a new one
+-02-17  Dmitry Titov  <dimich@chromium.org>
+        Reviewed by David Levin, Darin Fisher, Simon Hausmann.
+        When a live iframe element is moved between pages, it still depends on the old page.
+        https://bugs.webkit.org/show_bug.cgi?id=34382
+        * Api/qwebframe_p.h:
+        (QWebFramePrivate::setPage): Added.
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::didTransferChildFrameToNewDocument):
+        The QWebFrame caches a QWebPage which should be replaced when Frame is re-parented.
+        Also, the QWebFrame is a child (in QT terms) of QWebPage - so update that relationship as well.
+        Emit a signal that QWebFrame moved to a different QWebPage.
+        * WebCoreSupport/FrameLoaderClientQt.h:
+-02-17  Kent Tamura  <tkent@chromium.org>
+        Reviewed by Eric Seidel.
+        Introduces new Icon loading interface in order to support
+        asynchronous loading.
+        https://bugs.webkit.org/show_bug.cgi?id=32054
+        Add an empty implementation of ChromeClient::iconForFiles().
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::iconForFiles):
+        * WebCoreSupport/ChromeClientQt.h:
+-02-17  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+        Reviewed by Ariya Hidayat.
+        Make possible Qt DRT to get total number of pages to be printed
+        LayoutTests:
+            printing/numberOfPages.html
+        [Qt] DRT: Get total number of pages to be printed
+        https://bugs.webkit.org/show_bug.cgi?id=34955
+        * Api/qwebframe.cpp:
+        (qt_drt_numberOfPages):
+        (qt_drt_evaluateScriptInIsolatedWorld):
+-02-16  Ariya Hidayat  <ariya.hidayat@gmail.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Allow scrolling to an anchor programmatically.
+        https://bugs.webkit.org/show_bug.cgi?id=29856
+        * Api/qwebframe.cpp:
+        (QWebFrame::scrollToAnchor): New API function.
+        * Api/qwebframe.h:
+        * tests/qwebframe/tst_qwebframe.cpp: New tests for scrollToAnchor().
+-02-16  Ariya Hidayat  <ariya.hidayat@gmail.com>
+        Reviewed by Laszlo Gombos.
+        Fix building with Qt < 4.6.
+        https://bugs.webkit.org/show_bug.cgi?id=34885
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::updateResizesToContentsForPage):
+-02-16  Simon Hausmann  <simon.hausmann@nokia.com>
+        Unreviewed Symbian build fix.
+        Updated the def file with two new exports used by QtLauncher.
+        * symbian/eabi/QtWebKitu.def:
+-02-16  Ismail Donmez  <ismail@namtrac.org>
+        Reviewed by Pavel Feldman.
+        Fix compilation with inspector disabled.
+        https://bugs.webkit.org/show_bug.cgi?id=32724
+        * Api/qwebpage.cpp:
+        (qt_drt_webinspector_executeScript):
+        (qt_drt_webinspector_close):
+        (qt_drt_webinspector_show):
+        (qt_drt_setTimelineProfilingEnabled):
+-02-16  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Simon Hausman.
+        [Qt] Fix include paths for forwarding headers in standalone builds.
+        * Api/DerivedSources.pro: Use relative paths for package builds and added some
+        documentation.
+-02-15  Noam Rosenthal  <noam.rosenthal@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] QtWebkit bridge: enable passing a QWebElement to a signal/slot/property
+        Add Q_DECLARE_METATYPE to QWebElement, add relevant tests to
+        tst_qwebframe
+        https://bugs.webkit.org/show_bug.cgi?id=34901
+        * Api/qwebelement.h: declare metatype
+        * tests/qwebframe/tst_qwebframe.cpp:
+        (MyQObject::webElementProperty): new test for QWebElement
+        (MyQObject::setWebElementProperty): new test for QWebElement
+        (MyQObject::myOverloadedSlot): new test for QWebElement
+-02-15  Robert Hogan  <robert@roberthogan.net>, Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] DRT: Support evaluateInWebInspector(), setTimelineProfilingEnabled().
+        Support LayoutTestController.evaluateInWebInspector(), setTimelineProfilingEnabled() in Qt DRT.
+        https://bugs.webkit.org/show_bug.cgi?id=33096
+        This allows the following tests to pass:
+        inspector/console-format-collections.html
+        inspector/styles-iframe.html
+        inspector/syntax-highlight-css.html
+        inspector/syntax-highlight-javascript.html
+        inspector/timeline-enum-stability.html
+        inspector/timeline-layout.html
+        inspector/timeline-mark-timeline.html
+        inspector/timeline-paint.html
+        inspector/timeline-parse-html.html
+        inspector/timeline-recalculate-styles.html
+        inspector/timeline-script-tag-1.html
+        inspector/timeline-script-tag-2.html
+        inspector/timeline-trivial.html
+        inspector/cookie-resource-match.html
+        inspector/elements-img-tooltip.html
+        inspector/elements-panel-selection-on-refresh.html
+        inspector/inspected-objects-not-overriden.html
+        inspector/timeline-event-dispatch.html
+        inspector/timeline-network-resource.html
+        inspector/elements-panel-rewrite-href.html
+        inspector/console-dir.html
+        inspector/console-dirxml.html
+        inspector/console-format.html
+        inspector/console-tests.html
+        inspector/elements-panel-structure.html
+        inspector/evaluate-in-frontend.html
+        inspector/console-clear.html
+        * Api/qwebpage.cpp:
+        (qt_drt_webinspector_executeScript):
+        (qt_drt_webinspector_close):
+        (qt_drt_webinspector_show):
+        (qt_drt_setTimelineProfilingEnabled):
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (InspectorClientQt::createPage)
+-02-12  Antti Koivisto  <koivisto@iki.fi>
+        Reviewed by Kenneth Rohde Christiansen and Simon Hausmann.
+        https://bugs.webkit.org/show_bug.cgi?id=34885
+        Add a QGraphicsWebView mode that makes it automatically resize itself to the size of the content.
+        This is useful for cases where the client wants to implement page panning and zooming by manipulating
+        the graphics item.
+        Add a option to QGVLauncher to test this mode.
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::QGraphicsWebViewPrivate):
+        (QGraphicsWebViewPrivate::updateResizesToContentsForPage):
+        (QGraphicsWebViewPrivate::_q_contentsSizeChanged):
+        (QGraphicsWebView::setPage):
+        (QGraphicsWebView::setResizesToContents):
+        (QGraphicsWebView::resizesToContents):
+        * Api/qgraphicswebview.h:
+        * QGVLauncher/main.cpp:
+        (WebView::WebView):
+        (MainView::MainView):
+        (MainView::setMainWidget):
+        (MainView::resizeEvent):
+        (main):
+-02-12  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        Qt DRT now dump the frame loader callbacks when LayoutTestController()
+        method is called.
+        LayoutTests:
+            http/tests/security/mixedContent/data-url-script-in-iframe.html
+            http/tests/security/mixedContent/empty-url-plugin-in-frame.html
+            http/tests/security/mixedContent/insecure-css-in-iframe.html
+            http/tests/security/mixedContent/insecure-iframe-in-iframe.html
+            http/tests/security/mixedContent/insecure-image-in-iframe.html
+            http/tests/security/mixedContent/insecure-plugin-in-iframe.html
+            http/tests/security/mixedContent/insecure-script-in-iframe.html
+            http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe.html
+            http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe.html
+        [Qt] Make possible Qt DRT dump frame load callbacks
+        https://bugs.webkit.org/show_bug.cgi?id=34702
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::didDisplayInsecureContent):
+        (WebCore::FrameLoaderClientQt::didRunInsecureContent):
+-02-10  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Tor Arne VestbÃž.
+        [Qt] Make qtlauncher and qgvlauncher use the generated headers
+        path to make sure they are correctly generated.
+        * tests/tests.pri:
+-02-10  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Tor Arne VestbÃž.
+        [Qt] Ensure relative paths in generated .pri files to ensure that
+        a source package with pre-generated derived sources can be compiled.
+        - Re-add a separate headers.pri file for WEBKIT_API_HEADERS
+        - Rename the generated headers.pri to classheaders.pri to avoid
+        confusion with the one generated by synqt since they don't have the
+        same content.
+        - Remove private headers list variable from classheaders.pri
+        - Use $$PWD in classheaders.pri
+        - Remove classheaders.pri from the installed files
+        * Api/DerivedSources.pro:
+-02-10  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Tor Arne VestbÃž.
+        [Qt] Minor fixes on QtWebKit headers generation.
+        - Adds QtWebKit to the generated headers destination path
+        - Improve compatibility with MinGW
+        * Api/DerivedSources.pro:
+-02-09  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by nobody, build fix.
+        [Qt] Fix standalone build with MinGW.
+        * tests/qwebelement/tst_qwebelement.cpp:
+        * tests/tests.pri:
+-02-10  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        Implement pageNumberForElementById() method in Qt DRT LayoutTestController,
+        to make Qt DRT able to get page number.
+        LayoutTests:
+            printing/page-break-always.html
+            printing/pageNumerForElementById.html
+            printing/css2.1/page-break-before-000.html
+            printing/css2.1/page-break-after-000.html
+            printing/css2.1/page-break-after-004.html
+            printing/css2.1/page-break-before-001.html
+            printing/css2.1/page-break-after-001.html
+            printing/css2.1/page-break-after-002.html
+            printing/css2.1/page-break-before-002.html
+            printing/css2.1/page-break-inside-000.html
+        [Qt] Make possible Qt DRT get a page number for element by ID
+        https://bugs.webkit.org/show_bug.cgi?id=34777
+        * Api/qwebframe.cpp:
+        (qt_drt_pageNumberForElementById):
+-02-09  Yael Aharon  <yael.aharon@nokia.com>
+        Reviewed by Adam Barth.
+        [Qt] Unit test for window.runModalDialog
+        https://bugs.webkit.org/show_bug.cgi?id=34755
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (TestModalPage::TestModalPage):
+        (TestModalPage::createWindow):
+        (tst_QWebPage::showModalDialog):
+-02-09  Andreas Kling  <andreas.kling@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Sync with API changes in Maemo 5 kinetic scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=34747
+        This is a forward-port of http://qt.gitorious.org/+qt-developers/qt/x11-maemo/commit/08497561
+        * Api/qwebview.cpp:
+        (qt_sendSpontaneousEvent):
+        (QWebViewKineticScroller::QWebViewKineticScroller):
+        (QWebViewKineticScroller::setWidget):
+        (QWebViewKineticScroller::eventFilter):
+        (QWebViewKineticScroller::cancelLeftMouseButtonPress):
+        (QWebViewKineticScroller::currentFrame):
+        (QWebViewKineticScroller::scrollingFrameAt):
+        (QWebViewKineticScroller::maximumScrollPosition):
+        (QWebViewKineticScroller::scrollPosition):
+        (QWebViewKineticScroller::viewportSize):
+        (QWebViewKineticScroller::setScrollPosition):
+        (QWebViewKineticScroller::sendEvent):
+        (QWebView::QWebView):
+-02-09  Yael Aharon  <yael.aharon@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Webkit in Qt does not have window.showModalDialog
+        https://bugs.webkit.org/show_bug.cgi?id=25585
+        Create a new eventloop when runModal() is called.
+        Added comemnt in QWebPage::createWindow that the application is responsible
+        for setting the modality of the appropriate window.
+        * Api/qwebpage.cpp:
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::ChromeClientQt):
+        (WebCore::ChromeClientQt::~ChromeClientQt):
+        (WebCore::ChromeClientQt::canRunModal):
+        (WebCore::ChromeClientQt::runModal):
+        * WebCoreSupport/ChromeClientQt.h:
+-01-19  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Dave Hyatt.
+        Implement flattening of framesets
+        https://bugs.webkit.org/show_bug.cgi?id=32717
+        Privately export the setFrameSetFlatteningEnabled setting for
+        use with the Qt DRT.
+        * Api/qwebpage.cpp:
+        (qt_drt_setFrameSetFlatteningEnabled):
+        (QWebPagePrivate::core):
+        * Api/qwebpage_p.h:
+-02-05  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
+        [Qt] Fix build on Windows
+        Reviewed by Kenneth Rohde Christiansen.
+        DerivedSources for our API headers failed on Windows,
+        due to Windows not accepting ; as a command separator,
+        not needing quotes for echo, and needing < and > escaped.
+        We now detect Windows and set these quote markers and
+        escape markers accordingly, as well as use && for separating
+        individual commands.
+        * Api/DerivedSources.pro:
+-02-05  Yury Semikhatsky  <yurys@chromium.org>
+        Reviewed by Pavel Feldman.
+        Remove unused inmport of ScriptFunctionCall.h
+        https://bugs.webkit.org/show_bug.cgi?id=33592
+        * Api/qwebelement.cpp:
+-02-05  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Generate convenience headers (QWebView, etc) using qmake
+        In Qt this is done using syncqt, but we use a pro-file instead
+        that generates makefile-rules for each of the extra headers.
+        These extra headers are installed alongside the normal headers.
+        * Api/DerivedSources.pro: Added. List of headers + pro file magic
+        * Api/headers.pri: Removed, list of headers is now in the above file
+-02-04  No'am Rosenthal  <noam.rosenthal@nokia.com>
+        Reviewed by Ariya Hidayat.
+        [Qt] Tuning and optimizations to GraphicsLayerQt. Mainly reduced usage
+        of QTimer::singleShot, and moved syncLayers() from paint() to update()
+        https://bugs.webkit.org/show_bug.cgi?id=34062
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::update): Moved the sync operation to update
+        (QGraphicsWebView::paint): Moved the sync operation to update
+-02-03  Andras Becsi  <abecsi@webkit.org>
+        Unreviewed build fix.
+        [Qt] Roll-out r54281 because it broke the build on the Qt Release bot.
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::QGraphicsWebViewPrivate):
+        (QGraphicsWebViewPrivate::markForSync):
+        (QGraphicsWebViewPrivate::update):
+        (QGraphicsWebView::paint):
+-02-02  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Ariya Hidayat.
+        Do not use a proxy widget for the QComboBox on Maemo 5, as it
+        is not working properly and it is not needed at all, as the
+        comboboxes comes up in their full width on the screen and
+        do not depend on view.
         * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::populate):
+        (WebCore::QtFallbackWebPopup::show):
+-02-02  Jessie Berlin  <jberlin@webkit.org>
+        Rubber Stamped by Holger Freyther.
+        [Qt] Fix style issue identified in bug:
+        https://bugs.webkit.org/show_bug.cgi?id=34329
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientWebPage::InspectorClientWebPage):
+        Fix indentation.
+-02-01  Jessie Berlin  <jberlin@webkit.org>
+        Reviewed by Holger Freyther.
+        [Qt] Enable inspecting the Web Inspector in QtLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=34329
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientWebPage::InspectorClientWebPage):
+        Allow the DeveloperExtrasEnabled setting to default to true for the page containing the Web Inspector.
+-02-02  Andreas Kling  <andreas.kling@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Display HTML tags verbatim in JS alert/confirm/prompt boxes
+        https://bugs.webkit.org/show_bug.cgi?id=34429
+        * Api/qwebpage.cpp:
+        (QWebPage::javaScriptAlert):
+        (QWebPage::javaScriptConfirm):
+        (QWebPage::javaScriptPrompt):
+-02-02  Noam Rosenthal  <noam.rosenthal@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Enable a way to measure FPS in QGVLauncher
+        run QGVLauncher with --show-fps to see ongoing fps measurements
+        This is not meant as accurate FPS, but rather as a way to find
+        improvements/regressions
+        https://bugs.webkit.org/show_bug.cgi?id=34450
+        * QGVLauncher/main.cpp:
+        (MainView::MainView): initialize FPS values
+        (MainView::paintEvent): count a painted frame here
+        (MainView::printFps): we print the fps with qDebug every 5 seconds.
+-01-29  Ben Murdoch  <benm@google.com>
+        Reviewed by Dimitri Glazkov.
+        [Android] Android needs functionality in the ChromeClient to be informed when touch events are and are not needed by the webpage.
+        https://bugs.webkit.org/show_bug.cgi?id=34215
+        Add needTouchEvents() to the ChromeClient which is called when the page decides it needs or no longer needs to be informed of touch events.
+        * WebCoreSupport/ChromeClientQt.h:
+        (WebCore::ChromeClientQt::needTouchEvents): Add an empty implementation.
+-01-29  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Simon Hausmann
+        Disable auto-uppercase and predictive text on Maemo5, just like the
+        build-in MicroB Browser.
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::setInputMethodState):
 -01-28  Andreas Kling  <andreas.kling@nokia.com>
 …
         (QWebView::QWebView):
 -01-29  Kenneth Rohde Christiansen  <kenneth@webkit.org>
         Reviewed by Simon Hausmann
         Disable auto-uppercase and predictive text on Maemo5, just like the
         build-in MicroB Browser.
         * WebCoreSupport/EditorClientQt.cpp:
         (WebCore::EditorClientQt::setInputMethodState):
+-01-28  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Simon Hausmann.
+        Do not set the combobox font on Maemo5 and S60; use the
+        default instead.
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::populate):
 -01-28  Trond KjernÃ¥sen <trond@trolltech.com>
 …
         * Api/qwebframe.cpp:
         (QWebFrame::print):
+-01-27  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] DRT Provide worker thread ability to track counters
+        https://bugs.webkit.org/show_bug.cgi?id=34221
+        Implement workerThreadCount() in LayoutTestController of Qt DRT
+        Tests:
+        fast/workers/dedicated-worker-lifecycle.html
+        fast/workers/shared-worker-frame-lifecycle.html
+        fast/workers/shared-worker-lifecycle.html
+        fast/workers/worker-lifecycle.html
+        * Api/qwebpage.cpp:
+        (qt_drt_workerThreadCount):
+-01-27  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Laszlo Gombos.
+        [Qt] Update the .def files with exported symbols
+        * symbian/eabi/QtWebKitu.def: Add two mangled missing new symbols for arm eabi.
+-01-27  Kent Hansen  <kent.hansen@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Meta-methods can't be introspected using ES5 API
+        https://bugs.webkit.org/show_bug.cgi?id=34087
+        Test that Object.getOwnPropertyDescriptor and
+        Object.getOwnPropertyNames work with meta-methods.
+        * tests/qwebframe/tst_qwebframe.cpp:
 -01-26  Simon Hausmann  <simon.hausmann@nokia.com>
 …
         * WebCoreSupport/QtFallbackWebPopup.cpp:
         (WebCore::QtFallbackWebPopup::show):
+-01-26  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
+        Reviewed by Simon Hausmann.
+        First steps of the QtScript API.
+        Two new classes were created; QScriptEngine and QScriptValue.
+        The first should encapsulate a javascript context and the second a script
+        value.
+        This API is still in development, so it isn't compiled by default.
+        To trigger compilation, pass --qmakearg="CONFIG+=build-qtscript" to
+        build-webkit.
+        https://bugs.webkit.org/show_bug.cgi?id=32565
+        * docs/qtwebkit.qdocconf:
 -01-26  Holger Hans Peter Freyther  <zecke@selfish.org>
 …
         (tst_QWebPage::testJSPrompt):
+-01-25  Simon Hausmann  <hausmann@webkit.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] In RenderThemeQt determine the QStyle from the page client instead of the page's view
+        https://bugs.webkit.org/show_bug.cgi?id=34053
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::style): Implement QWebPageClient::style() and return the graphics
+        widget's style.
+        * Api/qwebpage.cpp:
+        (QWebPageWidgetClient::style): Implement QWebPageClient::style() and return the widget's style.
 -01-25  Janne Koskinen  <janne.p.koskinen@digia.com>
 …
         * symbian/backup_registration.xml: Added.
 -11-19  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+-01-23  Girish Ramakrishnan  <girish@forwardbias.in>
         Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Fix QWebInspector destruction problem.
+        https://bugs.webkit.org/show_bug.cgi?id=31664
+        * Api/qwebpage.cpp:
+        (QWebPage::~QWebPage):
+        [Qt] Fix positioning of ComboBox popup in QGraphicsWebView.
+        Wrap the popup in a QGraphicsProxyWidget, so that the popup
+        transforms with the item.
+        https://bugs.webkit.org/show_bug.cgi?id=33887
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopupCombo::hidePopup):
+        (WebCore::QtFallbackWebPopup::QtFallbackWebPopup):
+        (WebCore::QtFallbackWebPopup::~QtFallbackWebPopup):
+        (WebCore::QtFallbackWebPopup::show):
+        * WebCoreSupport/QtFallbackWebPopup.h:
+-01-22  Peter Kasting  <pkasting@google.com>
+        Not reviewed, backout.
+        Back out r52673, which caused several regressions.
+        https://bugs.webkit.org/show_bug.cgi?id=32533
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopupCombo::hidePopup):
+-01-22  Girish Ramakrishnan  <girish@forwardbias.in>
+        Reviewed by Simon Hausmann.
+        [Qt] Save the QWebPageClient instead of the ownerWidget in QtAbstractWebPopup
+        The QWebPageClient is required for the QtFallbackWebPopup. QtFallbackWebPopup will
+        need it to create a QGraphicsProxyWidget (in a future commit) for the
+        QGraphicsWebView's web popup.
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::show):
+-01-22  Girish Ramakrishnan  <girish@forwardbias.in>
+        Reviewed by Kenneth Rohde Christiansen.
+        QState::polished() was renamed to QState::propertiesAssigned() when
+        Qt 4.6.0 was released.
+        * QGVLauncher/main.cpp:
+        (MainWindow::init):
+-01-21  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] add setDomainRelaxationForbiddenForURLScheme in Qt DRT
+        https://bugs.webkit.org/show_bug.cgi?id=33945
+        * Api/qwebsecurityorigin.cpp:
+        (qt_drt_setDomainRelaxationForbiddenForURLScheme):
+-01-21  No'am Rosenthal  <noam.rosenthal@nokia.com>
+        Reviewed by Antti Koivisto.
+        [Qt] Implement GraphicsLayer for accelerated layer compositing
+        https://bugs.webkit.org/show_bug.cgi?id=33514
+        Here we have the QGraphicsWebView support for accelerated compositing
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewOverlay::q): access to container object
+        (QGraphicsWebViewOverlay::boundingRect): overlay has same rect as the
+        webview
+        (QGraphicsWebViewOverlay::paint): paint everything but the contents
+        (QGraphicsWebViewPrivate::QGraphicsWebViewPrivate): some vars needed
+        for accelerated compositing
+        (QGraphicsWebViewPrivate::):
+        (QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate):
+        (QGraphicsWebViewPrivate::setRootGraphicsLayer): make sure we have a
+        scrollbar overlay, and that the new graphics layer is parented by the
+        web-view
+        (QGraphicsWebViewPrivate::markForSync): flush changes at earliest
+        convenience or during the next draw
+        (QGraphicsWebViewPrivate::updateCompositingScrollPosition): sync the
+        position of the compositing layer with the scroll position
+        (QGraphicsWebViewPrivate::syncLayers): flush changes now
+        (QGraphicsWebViewPrivate::scroll): make sure we also move the
+        compositing layer
+        (QGraphicsWebViewPrivate::update): also update the overlay if needed
+        (QGraphicsWebView::QGraphicsWebView): initialize overlay with 0
+        (QGraphicsWebView::paint): paint only contents if we have an overlay,
+        sync the compositing layers now if needed
+        (QGraphicsWebView::setPage): also clean up the compositing
+        (QGraphicsWebView::updateGeometry): also update overlay geo
+        (QGraphicsWebView::setGeometry): also update overlay geo
+        * Api/qgraphicswebview.h: reimp compositing stuff from QWebPageClient
+        * Api/qwebsettings.cpp: init new settings flag for compositing as
+        false
+        (QWebSettingsPrivate::apply): apply new settings flag for compositing
+        (QWebSettings::QWebSettings):
+        * Api/qwebsettings.h: new settings flag for compositing
+        * Api/qwebview.cpp:
+        (QWebView::setPage): qwebview doesn't support compositing: always false
+        * QGVLauncher/main.cpp:
+        (WebView::WebView): some more cmdline arguments + compositing
+        (MainWindow::init): some more cmdline arguments
+        (main): ditto
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::attachRootGraphicsLayer): reimp for
+        accel-compositing
+        (WebCore::ChromeClientQt::setNeedsOneShotDrawingSynchronization):
+        reimp for accel compositing
+        (WebCore::ChromeClientQt::scheduleCompositingLayerSync): reimp for
+        accel compositing
+        * WebCoreSupport/ChromeClientQt.h: reimps for accel compositing
+-01-21  Benjamin Poulain  <benjamin.poulain@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Improve the autotests of QtWebkit
+        https://bugs.webkit.org/show_bug.cgi?id=32216
+        Remove qWait() of the test when possible.
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::loadFinished):
+        (tst_QWebPage::database):
+        (tst_QWebPage::testEnablePersistentStorage):
+        (tst_QWebPage::errorPageExtension):
+        (tst_QWebPage::screenshot):
+-01-21  Simon Hausmann  <simon.hausmann@nokia.com>
+        Prospective build fix for the Qt build.
+        Fix compilation against Qt without WebKit support by not including QtWebKit/QWebView
+        but widget.h instead and instantiating QWebView through a typedef, to ensure we're using
+        our locally built WebKit.
+        * tests/hybridPixmap/widget.h:
+        * tests/hybridPixmap/widget.ui:
+-01-21  No'am Rosenthal  <noam.rosenthal@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Adding QPixmap/QImage support for the Qt hybrid layer
+        https://bugs.webkit.org/show_bug.cgi?id=32461
+        * tests/hybridPixmap: Added.
+        * tests/hybridPixmap/hybridPixmap.pro: Added.
+        * tests/hybridPixmap/resources.qrc: Added.
+        * tests/hybridPixmap/test.html: Added.
+        * tests/hybridPixmap/tst_hybridPixmap.cpp: Added.
+        (tst_hybridPixmap::tst_hybridPixmap): tests most of the use cases for
+        hybrid pixmap/image manipulation
+        (tst_hybridPixmap::init): QTestLib initialization
+        (tst_hybridPixmap::cleanup): QTestLib cleanup
+        (tst_hybridPixmap::hybridPixmap): run the html file
+        * tests/hybridPixmap/widget.cpp: Added.
+        (Widget::Widget):
+        (Widget::refreshJS):
+        (Widget::start):
+        (Widget::completeTest):
+        (Widget::setPixmap):
+        (Widget::pixmap):
+        (Widget::setImage):
+        (Widget::image):
+        (Widget::~Widget):
+        (Widget::changeEvent):
+        (Widget::compare):
+        (Widget::imageSlot):
+        (Widget::pixmapSlot):
+        (Widget::randomSlot):
+        * tests/hybridPixmap/widget.h: Added.
+        * tests/hybridPixmap/widget.ui: Added.
+        * tests/tests.pro:
+-01-21  Luiz Agostini  <luiz.agostini@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Custom select popups.
+        https://bugs.webkit.org/show_bug.cgi?id=33418
+        Adjusting QtFallbackWebPopupCombo to the changes in WebCore layer.
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::createSelectPopup):
+        * WebCoreSupport/ChromeClientQt.h:
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopupCombo::QtFallbackWebPopupCombo):
+        (WebCore::QtFallbackWebPopupCombo::showPopup):
+        (WebCore::QtFallbackWebPopupCombo::hidePopup):
+        (WebCore::QtFallbackWebPopup::QtFallbackWebPopup):
+        (WebCore::QtFallbackWebPopup::~QtFallbackWebPopup):
+        (WebCore::QtFallbackWebPopup::show):
+        (WebCore::QtFallbackWebPopup::hide):
+        (WebCore::QtFallbackWebPopup::populate):
+        * WebCoreSupport/QtFallbackWebPopup.h:
+-01-19  Steve Block  <steveblock@google.com>
+        Reviewed by Adam Barth.
+        Renames WebCore/bridge/runtime.[cpp|h] to WebCore/bridge/Bridge.[cpp|h]
+        https://bugs.webkit.org/show_bug.cgi?id=33801
+        * Api/qwebframe.cpp:
+-01-14  Brian Weinstein  <bweinstein@apple.com>
+        Reviewed by Adam Roben.
+        Drag and Drop source/destination code needs cleanup.
+        <https://bugs.webkit.org/show_bug.cgi?id=33691>.
+        Update to new way of calling sourceOperation.
+        * WebCoreSupport/DragClientQt.cpp:
+        (WebCore::DragClientQt::startDrag):
+-01-14  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Tor Arne VestbÃž.
+        [Qt] Symbian build fixes.
+        * tests/qwebpage/tst_qwebpage.cpp: Include util.h
+        * tests/tests.pri: Don't define TESTS_SOURCE_DIR, it doesn't work.
+        * tests/util.h: Define TESTS_SOURCE_DIR here, just like it's done in Qt.
 -01-14  Simon Hausmann  <simon.hausmann@nokia.com>
 …
         * symbian/bwins/QtWebKitu.def:
         * symbian/eabi/QtWebKitu.def:
+-01-13  Darin Adler  <darin@apple.com>
+        Reviewed by Dan Bernstein.
+        Move more of the selection and caret painting code from Frame to SelectionController.
+        https://bugs.webkit.org/show_bug.cgi?id=33619
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::inputMethodEvent): Seems possibly wrong to be directly invoking this
+        setCaretVisible here, but I updated it to call it in its new location.
+-01-11  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Holger Freyther.
+        [Qt] Add private API for QWebFrame scrolling, to maintain binary compatibility with Qt 4.6.
+        This is just a temporary addition until we have introduced #ifdefs to allow
+        safely removing the private API again.
+        * Api/qwebframe.cpp:
+        (qtwebkit_webframe_scrollRecursively):
+-01-10  Robert Hogan  <robert@roberthogan.net>
+        Reviewed by Adam Barth.
+        [Qt] Add enableXSSAuditor support to QWebSettings and DRT.
+        https://bugs.webkit.org/show_bug.cgi?id=33419
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        * Api/qwebsettings.h:
+-01-09  Daniel Bates  <dbates@webkit.org>
+        No review, rolling out r53044.
+        http://trac.webkit.org/changeset/53044
+        https://bugs.webkit.org/show_bug.cgi?id=33419
+        We need to look into this some more because the Qt
+        bot is failing the XSSAuditor tests. See bug #33419
+        for more details.
+        * Api/qwebsettings.cpp:
+        * Api/qwebsettings.h:
+-01-09  Daniel Bates  <dbates@webkit.org>
+        Reviewed by Adam Barth.
+        https://bugs.webkit.org/show_bug.cgi?id=33419
+        Adds support for the XSSAuditor to the Qt DRT.
+        * Api/qwebsettings.cpp: Updated comment to reflect added key XSSAuditorEnabled.
+        * Api/qwebsettings.h: Adds settings key XSSAuditorEnabled.
+-01-08  Luiz Agostini  <luiz.agostini@openbossa.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Delegation client
+        https://bugs.webkit.org/show_bug.cgi?id=32826
+        Added method createPopup to ChromeClientQt used to create popups.
+        QtFallbackWebPopup moved from WebCore/platform/qt to
+        WebKit/qt/WebCoreSupport.
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::createPopup):
+        * WebCoreSupport/ChromeClientQt.h:
+        * WebCoreSupport/QtFallbackWebPopup.cpp: Added.
+        (WebCore::QtFallbackWebPopup::QtFallbackWebPopup):
+        (WebCore::QtFallbackWebPopup::show):
+        (WebCore::QtFallbackWebPopup::populate):
+        (WebCore::QtFallbackWebPopup::showPopup):
+        (WebCore::QtFallbackWebPopup::hidePopup):
+        (WebCore::QtFallbackWebPopup::activeChanged):
+        (WebCore::QtFallbackWebPopup::setParent):
+        * WebCoreSupport/QtFallbackWebPopup.h: Added.
+        (WebCore::QtFallbackWebPopup::hide):
+-01-07  Yael Aharon  <yael.aharon@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Allow the application to override online/offline network status
+        https://bugs.webkit.org/show_bug.cgi?id=32684
+        Add a setting so that applications can overide the network status.
+        Applications that use this setting still need to block network access
+        through QNAM.
+        * Api/qwebsettings.cpp:
+        (qt_networkAccessAllowed):
+-01-07  Yongjun Zhang  <yongjun.zhang@nokia.com>, Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] need an API to suspend and resume active Javascript DOM objects.
+        https://bugs.webkit.org/show_bug.cgi?id=31673
+        Add suspend and resume DOM objects private API to QWebFrame.
+        * Api/qwebframe.cpp:
+        (qt_suspendActiveDOMObjects):
+        (qt_resumeActiveDOMObjects):
+-01-06  Andreas Kling  <andreas.kling@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Return an invalid Qt::ImMicroFocus if queried while the view needs to layout.
+        https://bugs.webkit.org/show_bug.cgi?id=33204
+        * Api/qwebpage.cpp:
+        (QWebPage::inputMethodQuery):
+-01-05  Yael Aharon  <yael.aharon@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        Drag & drop layout tests fail even when run manually
+        https://bugs.webkit.org/show_bug.cgi?id=33055
+        No new tests. Fix 3 layout tests when run manually.
+        fast/events/drag-and-drop.html
+        fast/events/drag-and-drop-dataTransfer-types-nocrash.html
+        fast/events/drag-and-drop-fire-drag-dragover.html
+        Running these tests in DRT will be fixed in 31332.
+        * Api/qwebpage.cpp:
+        (dropActionToDragOp):
+        (dragOpToDropAction):
+        (QWebPagePrivate::dragEnterEvent):
+        (QWebPagePrivate::dragMoveEvent):
+        (QWebPagePrivate::dropEvent):
+        Accept drag events even if they are not over a drop target.
+        This is to ensure that drag events will continue to be delivered.
+        * Api/qwebpage_p.h:
+        * WebCoreSupport/DragClientQt.cpp:
+        (WebCore::dragOperationToDropActions):
+        (WebCore::dropActionToDragOperation):
+        (WebCore::DragClientQt::startDrag):
+        Send dragEnd event.
+-01-04  Daniel Bates  <dbates@webkit.org>
+        Reviewed by Eric Seidel.
+        https://bugs.webkit.org/show_bug.cgi?id=33097
+        Cleans up the File menu to better conform to the File menu in Safari
+        both in terms of options and keyboard shortcuts. Adds a "Quit" menu
+        options to close all open windows.
+        * QGVLauncher/main.cpp:
+        (MainWindow::buildUI):
+-12-31  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Enable all HTML5 persistent features for QGVLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=33086
+        * QGVLauncher/main.cpp: Call enablePersistentStorage()
+        (main):
+-12-30  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] It should be possible to disable inspector
+        https://bugs.webkit.org/show_bug.cgi?id=32724
+        This change fixes the build break. Some QtWebKit interfaces
+        will not be fully functional (most notable QWebInspector) if
+        INSPECTOR is disabled.
+        * Api/qwebinspector.cpp:
+        (QWebInspector::showEvent):
+        (QWebInspector::closeEvent):
+        * Api/qwebpage.cpp:
+        (webActionForContextMenuAction):
+        (QWebPagePrivate::getOrCreateInspector):
+        (QWebPagePrivate::inspectorController):
+        (QWebPage::triggerAction):
+        (QWebPage::updatePositionDependentActions):
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::showWindow):
+        (WebCore::InspectorClientQt::closeWindow):
+-12-30  Janne Koskinen  <janne.p.koskinen@digia.com>
+        Reviewed by Simon Hausmann.
+        Upstream Symbian def files from Qt 4.6.
+        These files define the ABI of QtWebKit on Symbian.
+        * symbian/bwins/QtWebKitu.def: Added.
+        * symbian/eabi/QtWebKitu.def: Added.
+-12-29  Daniel Bates  <dbates@webkit.org>
+        Reviewed by Ariya Hidayat.
+        https://bugs.webkit.org/show_bug.cgi?id=32925
+        Adds an Open File dialog to make it convenient to open a file
+        to view in the browser.
+        * QGVLauncher/main.cpp:
+        (MainWindow::load): Modified to call loadURL.
+        (MainWindow::openFile): Added.
+        (MainWindow::loadURL): Added.
+        (MainWindow::buildUI): Added menu item Open File.
+-12-29  Robert Hogan  <robert@roberthogan.net>
+        Reviewed by Eric Seidel.
+        [Qt] Fix crash on LayoutTests/fast/loader/empty-embed-src-attribute.html
+        Related to https://bugs.webkit.org/show_bug.cgi?id=23806
+        If an embedded document is loaded within a page and it has an empty
+        URL, use a blank URL for the load request.
+        https://bugs.webkit.org/show_bug.cgi?id=33017
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createFrame):
+-12-29  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Rubber-stamped by Simon Hausmann and Holger Freyther.
+        [Qt] Remove WebKit/qt/WebKitPart empty directory
+        The content of the directory has been removed by r34888.
+        * WebKitPart: Removed.
+-12-29  Jakub Wieczorek  <faw217@gmail.com>
+        Reviewed by Eric Seidel.
+        [Qt] DRT: Frame loader callbacks differ from the Mac port
+        https://bugs.webkit.org/show_bug.cgi?id=32989
+        Remove messages from the callbacks that should not dump them to match
+        the expected results for the http/loading tests.
+        Unskip some http/loading tests which succeed now.
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchDidPopStateWithinPage):
+        (WebCore::FrameLoaderClientQt::dispatchWillClose):
+        (WebCore::FrameLoaderClientQt::dispatchDidReceiveIcon):
+        (WebCore::FrameLoaderClientQt::dispatchDidClearWindowObjectInWorld):
+-12-29  Robert Hogan  <robert@roberthogan.net>
+        Reviewed by Eric Seidel.
+        [Qt] fix fast/dom/Window/window-onFocus.html
+        Add support for layouttestcontroller.windowIsKey to Qt DRT and fix issue where
+        window.onblur was getting dispatched twice from QtWebKit.
+        https://bugs.webkit.org/show_bug.cgi?id=32990
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::focusOutEvent):
+-12-24  Girish Ramakrishnan  <girish@forwardbias.in>
+        Reviewed by Gustavo Noronha.
+        Doc : QGraphicsWebView::zoomFactor was introduced in 4.6.
+        * Api/qgraphicswebview.cpp:
+-12-22  Simon Hausmann  <simon.hausmann@nokia.com>
+        Rubber-stamped by Holger Freyther.
+        Moved QtLauncher to WebKitTools/
+        * QtLauncher: Removed.
+        * QtLauncher/QtLauncher.pro: Removed.
+        * QtLauncher/main.cpp: Removed.
+-12-21  David Boddie  <dboddie@trolltech.com>
+        Reviewed by Simon Hausmann.
+        Doc: Minor fixes to language.
+        * Api/qwebpage.cpp:
+-12-21  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Clean up the WebKit layer unit-tests
+            - Use tests.pri for common options
+            - Standardize file naming
+            - Move all resources to 'resources' subdir
+            - Standardize how TESTS_SOURCE_DIR is used
+            - Get rid of UID3 for symbian (autogenerated)
+            - Don't build app bundles on Mac OS X
+        * tests/benchmarks/loading/loading.pro: Added.
+        * tests/benchmarks/loading/tst_loading.pro: Removed.
+        * tests/benchmarks/painting/painting.pro: Added.
+        * tests/benchmarks/painting/tst_painting.pro: Removed.
+        * tests/qgraphicswebview/qgraphicswebview.pro:
+        * tests/qwebelement/qwebelement.pro:
+        * tests/qwebelement/qwebelement.qrc: Removed.
+        * tests/qwebelement/resources/image.png: Renamed from WebKit/qt/tests/qwebelement/image.png.
+        * tests/qwebelement/resources/style.css: Renamed from WebKit/qt/tests/qwebelement/style.css.
+        * tests/qwebelement/resources/style2.css: Renamed from WebKit/qt/tests/qwebelement/style2.css.
+        * tests/qwebelement/tst_qwebelement.qrc: Added.
+        * tests/qwebframe/qwebframe.pro:
+        * tests/qwebframe/qwebframe.qrc: Removed.
+        * tests/qwebframe/resources/image.png: Renamed from WebKit/qt/tests/qwebframe/image.png.
+        * tests/qwebframe/resources/style.css: Renamed from WebKit/qt/tests/qwebframe/style.css.
+        * tests/qwebframe/resources/test1.html: Renamed from WebKit/qt/tests/qwebframe/test1.html.
+        * tests/qwebframe/resources/test2.html: Renamed from WebKit/qt/tests/qwebframe/test2.html.
+        * tests/qwebframe/resources/testiframe.html: Renamed from WebKit/qt/tests/qwebframe/testiframe.html.
+        * tests/qwebframe/resources/testiframe2.html: Renamed from WebKit/qt/tests/qwebframe/testiframe2.html.
+        * tests/qwebframe/tst_qwebframe.cpp:
+        * tests/qwebframe/tst_qwebframe.qrc: Added.
+        * tests/qwebhistory/qwebhistory.pro:
+        * tests/qwebhistory/resources/page1.html: Renamed from WebKit/qt/tests/qwebhistory/data/page1.html.
+        * tests/qwebhistory/resources/page2.html: Renamed from WebKit/qt/tests/qwebhistory/data/page2.html.
+        * tests/qwebhistory/resources/page3.html: Renamed from WebKit/qt/tests/qwebhistory/data/page3.html.
+        * tests/qwebhistory/resources/page4.html: Renamed from WebKit/qt/tests/qwebhistory/data/page4.html.
+        * tests/qwebhistory/resources/page5.html: Renamed from WebKit/qt/tests/qwebhistory/data/page5.html.
+        * tests/qwebhistory/resources/page6.html: Renamed from WebKit/qt/tests/qwebhistory/data/page6.html.
+        * tests/qwebhistory/tst_qwebhistory.cpp:
+        (tst_QWebHistory::):
+        * tests/qwebhistory/tst_qwebhistory.qrc:
+        * tests/qwebhistoryinterface/qwebhistoryinterface.pro:
+        * tests/qwebinspector/qwebinspector.pro:
+        * tests/qwebpage/qwebpage.pro:
+        * tests/qwebpage/resources/frame_a.html: Renamed from WebKit/qt/tests/qwebpage/frametest/frame_a.html.
+        * tests/qwebpage/resources/iframe.html: Renamed from WebKit/qt/tests/qwebpage/frametest/iframe.html.
+        * tests/qwebpage/resources/iframe2.html: Renamed from WebKit/qt/tests/qwebpage/frametest/iframe2.html.
+        * tests/qwebpage/resources/iframe3.html: Renamed from WebKit/qt/tests/qwebpage/frametest/iframe3.html.
+        * tests/qwebpage/resources/index.html: Renamed from WebKit/qt/tests/qwebpage/frametest/index.html.
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::backActionUpdate):
+        (tst_QWebPage::frameAt):
+        (tst_QWebPage::errorPageExtensionInFrameset):
+        (tst_QWebPage::screenshot):
+        * tests/qwebpage/tst_qwebpage.qrc:
+        * tests/qwebplugindatabase/qwebplugindatabase.pro:
+        * tests/qwebview/qwebview.pro:
+        * tests/qwebview/resources/frame_a.html: Renamed from WebKit/qt/tests/qwebview/data/frame_a.html.
+        * tests/qwebview/resources/index.html: Renamed from WebKit/qt/tests/qwebview/data/index.html.
+        * tests/qwebview/tst_qwebview.cpp:
+        (tst_QWebView::reusePage):
+        (tst_QWebView::crashTests):
+        * tests/qwebview/tst_qwebview.qrc:
+        * tests/resources/image2.png: Renamed from WebKit/qt/tests/qwebframe/resources/image2.png.
+        * tests/tests.pri: Added.
+        * tests/tests.pro:
+-12-18  Ariya Hidayat  <ariya.hidayat@gmail.com>
+        Build fix, not reviewed.
+        * QtLauncher/main.cpp:
+        (MainWindow::setTouchMocking): Leave setTouchMocking as an empty
+        function for Qt < 4.6 so that moc still creates a slot for that.
+        Otherwise, it would have generated a linker error.
+-12-18  Adam Roben  <aroben@apple.com>
+        Qt build fix
+        * Api/qwebpage.cpp: Added #include.
+-12-18  Adam Roben  <aroben@apple.com>
+        Qt build fix
+        * Api/qwebpage.cpp:
+        Added #includes.
 -12-18  Joe Ligman  <joseph.ligman@nokia.com>
 …
         * tests/qwebframe/tst_qwebframe.cpp:
+-01-07  Yael Aharon  <yael.aharon@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Allow the application to override online/offline network status
+        https://bugs.webkit.org/show_bug.cgi?id=32684
+        Add a setting so that applications can overide the network status.
+        Applications that use this setting still need to block network access
+        through QNAM.
+        * Api/qwebsettings.cpp:
+        (qt_networkAccessAllowed):
+-01-07  Yongjun Zhang  <yongjun.zhang@nokia.com>, Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] need an API to suspend and resume active Javascript DOM objects.
+        https://bugs.webkit.org/show_bug.cgi?id=31673
+        Add suspend and resume DOM objects private API to QWebFrame.
+        * Api/qwebframe.cpp:
+        (qt_suspendActiveDOMObjects):
+        (qt_resumeActiveDOMObjects):
+-12-30  Janne Koskinen  <janne.p.koskinen@digia.com>
+        Reviewed by Simon Hausmann.
+        Upstream Symbian def files from Qt 4.6.
+        These files define the ABI of QtWebKit on Symbian.
+        * symbian/bwins/QtWebKitu.def: Added.
+        * symbian/eabi/QtWebKitu.def: Added.
+-12-18  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed by Tor Arne VestbÃž.
+        [Qt] Fix infinite recursion in touch mocking.
+        Don't send the fake touch events to the view, as that'll trigger the
+        event filter again.
+        * QtLauncher/main.cpp:
+        (MainWindow::sendTouchEvent):
+-12-17  Benjamin Poulain  <benjamin.poulain@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Add support for mocking touch events with Q(GV)Launcher
+        https://bugs.webkit.org/show_bug.cgi?id=32434
+        The event delivery should go through QCoreApplication::sendEvent()
+        * QtLauncher/main.cpp:
+        (MainWindow::sendTouchEvent):
+-12-17  Kim GrÃ¶nholm  <kim.gronholm@nomovok.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Add support for touch events in QWebView and QGraphicsWebView
+        https://bugs.webkit.org/show_bug.cgi?id=32432
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::QGraphicsWebView):
+        (QGraphicsWebView::sceneEvent):
+        * Api/qwebview.cpp:
+        (QWebView::QWebView):
+        (QWebView::event):
+-12-17  Kim GrÃ¶nholm  <kim.gronholm@nomovok.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Add support for mocking touch events with QtLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=32434
+        * QtLauncher/main.cpp:
+        (MainWindow::MainWindow):
+        (MainWindow::sendTouchEvent):
+        (MainWindow::eventFilter):
+        (MainWindow::setTouchMocking):
+        (MainWindow::setupUI):
 -12-14  Holger Hans Peter Freyther  <zecke@selfish.org>
 …
         (WebCore::ChromeClientQt::runJavaScriptPrompt): Fixup null QString
+-12-21  David Boddie  <dboddie@trolltech.com>
+        Reviewed by Simon Hausmann.
+        Doc: Minor fixes to language.
+        * Api/qwebpage.cpp:
+-12-15  Holger Hans Peter Freyther  <zecke@selfish.org>
+        Reviewed by NOBODY (OOPS!).
+-11-24  Holger Hans Peter Freyther  <zecke@selfish.org>
+        Reviewed by Simon Hausmann.
         [Qt] Do not disable the inspector on show and hide
 …
         * Api/qwebinspector.cpp:
-        (QWebInspector::event):
         (QWebInspector::hideEvent):
+        (QWebInspector::closeEvent):
+        * Api/qwebinspector.h:
+-12-14  Benjamin Poulain  <benjamin.poulain@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Improve the autotests of QtWebkit
+        https://bugs.webkit.org/show_bug.cgi?id=32216
+        Refactor tst_qwebelement to remove the qWait()
+        * tests/qwebelement/tst_qwebelement.cpp:
+        (tst_QWebElement::style):
+-12-14  Andreas Kling  <andreas.kling@nokia.com>
+        Reviewed by Simon Hausmann.
+        Fix the QWebPage inputMethods() autotest after r51758
+        to compare the Qt::ImFont property's family against an explicitly
+        previously configured family.
+        https://bugs.webkit.org/show_bug.cgi?id=32491
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+-12-13  Sam Weinig  <sam@webkit.org>
+        Reviewed by Dan Bernstein.
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=32499
+        Add client based Geolocation provider
+        Add first cut of a client based Geolocation provider. This is guarded by
+        ENABLE(CLIENT_BASED_GEOLOCATION) and is off by default for now. This adds a
+        GeolocationControllerClient interface that no-one currently implements,
+        but will in a subsequent patch.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::QWebPagePrivate):
+-12-13  Benjamin Poulain  <benjamin.poulain@nokia.com>
+        Reviewed by Simon Hausmann.
+        Add a test in Qt for https://bugs.webkit.org/show_bug.cgi?id=29005
+        https://bugs.webkit.org/show_bug.cgi?id=29008
+        * tests/qwebframe/tst_qwebframe.cpp:
 -12-13  Simon Hausmann  <hausmann@webkit.org>
 …
         * Api/qwebview.h:
+-12-11  Yael Aharon  <yael.aharon@nokia.com>
+        Unreviewed build fix for Qt versions < 4.6.
+        * tests/qwebframe/tst_qwebframe.cpp:
+        * tests/qwebview/tst_qwebview.cpp:
+        (tst_QWebView::reusePage):
+-12-11  Girish Ramakrishnan  <girish@forwardbias.in>
+        Reviewed by Tor Arne VestbÃž.
+        [Qt] Updated QWebElement documentation
+        findAll() returns a QWebElementCollection, not QList<QWebElement>.
+        * docs/webkitsnippets/webelement/main.cpp:
+        (findAll):
+-12-11  Simon Hausmann  <hausmann@webkit.org>, Kim GrÃ¶nholm  <kim.gronholm@nomovok.com>
+        Reviewed by Antti Koivisto.
+        Forward Qt touch events to the event handler as platform touch events.
+        https://bugs.webkit.org/show_bug.cgi?id=32114
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::touchEvent):
+        (QWebPage::event):
+        * Api/qwebpage_p.h:
+-12-07  Benjamin Poulain  <benjamin.poulain@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Improve the autotests of QtWebkit
+        https://bugs.webkit.org/show_bug.cgi?id=32216
+        Remove the calls to qWait() of the autotest of QWebView
+        * tests/qwebview/tst_qwebview.cpp:
+        (tst_QWebView::reusePage):
+-12-07  Benjamin Poulain  <benjamin.poulain@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Improve the autotests of QtWebkit
+        https://bugs.webkit.org/show_bug.cgi?id=32216
+        Refactor tst_qwebframe to remove qWait() and use
+        the function waitForSignal() from util.h
+        * tests/qwebframe/tst_qwebframe.cpp:
+-12-07  Benjamin Poulain  <benjamin.poulain@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Improve the autotests of QtWebkit
+        https://bugs.webkit.org/show_bug.cgi?id=32216
+        Refactor the test of QGraphicsWebView:
+        -make waitForSignal() available to all the tests.
+        -remove QTest::qWait()
+        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+        (tst_QGraphicsWebView::crashOnViewlessWebPages):
+        * tests/util.h:
+        (waitForSignal):
+-12-07  Girish Ramakrishnan  <girish@forwardbias.in>
+        Reviewed by Simon Hausmann.
+        [Qt] Plugins: Force windowless mode when there is no native window handle
+        Inject wmode=opaque while instantiating the plugin for the case when the
+        webpage is not backed by a native window handle.
+        https://bugs.webkit.org/show_bug.cgi?id=32059
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createPlugin):
+-12-04  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Corrects QtLauncher style
+        * QtLauncher/main.cpp:
+        (WebPage::acceptNavigationRequest):
+        (MainWindow::MainWindow):
+        (MainWindow::webPage):
+        (MainWindow::webView):
+        (MainWindow::changeLocation):
+        (MainWindow::loadFinished):
+        (MainWindow::showLinkHover):
+        (MainWindow::zoomIn):
+        (MainWindow::zoomOut):
+        (MainWindow::print):
+        (MainWindow::setEditable):
+        (MainWindow::dumpHtml):
+        (MainWindow::selectElements):
+        (MainWindow::newWindow):
+        (MainWindow::setupUI):
+        (WebPage::createWindow):
+        (WebPage::createPlugin):
+        (main):
+-12-04  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] QtLauncher: add a menu to show or hide the web inspector.
+        https://bugs.webkit.org/show_bug.cgi?id=32149
+        * QtLauncher/main.cpp:
+        (WebInspector::WebInspector):
+        (WebInspector::showEvent):
+        (WebInspector::hideEvent):
+        (MainWindow::MainWindow):
+        (MainWindow::setupUI):
+-12-04  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Reviewed by Antti Koivisto.
+        Split out the renderPrivate in two methods, one for working on
+        relative coordinates (relative to the viewport) and one for
+        working on absolute coordinates. The latter is more effecient
+        for implementing tiling, as you don't need translate the coords,
+        and because it avoid clipping to the viewport.
+        No behaviour changes, so no new tests.
+        * Api/qwebframe.cpp:
+        (QWebFramePrivate::renderContentsLayerAbsoluteCoords):
+        (QWebFramePrivate::renderRelativeCoords):
+        (QWebFrame::render):
+        * Api/qwebframe_p.h:
+-12-04  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Allow removing 'qrc' as a local security origin scheme
+        * tests/qwebpage/tst_qwebpage.cpp:
+-12-04  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Clean up argument parsing in the QtLauncher
+        * QtLauncher/main.cpp:
+-12-04  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Prevent the inspector from closing its wrapping widget.
+        This is not necessary anymore since we now hide the embedded
+        close button.
+        https://bugs.webkit.org/show_bug.cgi?id=32149
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::showWindow):
+        (WebCore::InspectorClientQt::closeWindow):
+-12-03  Ä°smail DÃ¶nmez  <ismail@namtrac.org>
+        Reviewed by Eric Seidel.
+        Fix compilation when SVG is disabled.
+        * Api/qwebframe.cpp:
+        (qt_drt_pauseSVGAnimation):
+-12-03  Brady Eidson  <beidson@apple.com>
+        Reviewed by Sam Weinig.
+        <rdar://problem/7214236> and http://webkit.org/b/32052 - Implement HTML5 state object history API
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchDidPushStateWithinPage):
+        (WebCore::FrameLoaderClientQt::dispatchDidReplaceStateWithinPage):
+        (WebCore::FrameLoaderClientQt::dispatchDidPopStateWithinPage):
+        * WebCoreSupport/FrameLoaderClientQt.h:
+-12-03  Pavel Feldman  <pfeldman@dhcp-172-28-174-220.spb.corp.google.com>
+        Reviewed by Timothy Hatcher.
+        Web Inspector: Simplify the settings support in inspector controller.
+        https://bugs.webkit.org/show_bug.cgi?id=32076
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::populateSetting):
+        (WebCore::InspectorClientQt::storeSetting):
+        (WebCore::variantToSetting):
+        (WebCore::settingToVariant):
+        * WebCoreSupport/InspectorClientQt.h:
+-12-03  Ben Murdoch  <benm@google.com>
+        Reviewed by Brady Eidson.
+        [Android] The FrameLoaderClient is unaware of BackForwardList changes.
+        https://bugs.webkit.org/show_bug.cgi?id=31914
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchDidAddBackForwardItem): Add an empty implementation. Method added to FrameLoaderClient by Android (see bug).
+        (WebCore::FrameLoaderClientQt::dispatchDidRemoveBackForwardItem): ditto.
+        (WebCore::FrameLoaderClientQt::dispatchDidChangeBackForwardIndex): ditto.
+        * WebCoreSupport/FrameLoaderClientQt.h:
+-12-01  Nikolas Zimmermann  <nzimmermann@rim.com>
+        Not reviewed. Try to fix Qt build.
+        * Api/qwebframe.cpp:
+        (qt_drt_pauseSVGAnimation):
+-12-01  Nikolas Zimmermann  <nzimmermann@rim.com>
+        Reviewed by Simon Fraser.
+        Add SVG animation test framework with 'snapshot' functionality
+        https://bugs.webkit.org/show_bug.cgi?id=31897
+        Add API used by the new 'sampleSVGAnimationForElementAtTime' DRT method,
+        forwarding the call to SVGDocumentExtensions, if SVG is enabled.
+        Implemented just like the existing pauseAnimation* methods for CSS animations.
+        * Api/qwebframe.cpp:
+        (qt_drt_pauseSVGAnimation):
+-12-01  Daniel Bates  <dbates@webkit.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        https://bugs.webkit.org/show_bug.cgi?id=31898
+        Makes QtLauncher default to the http scheme for URLs.
+        * QtLauncher/main.cpp:
+        (MainWindow::MainWindow):
+        (MainWindow::changeLocation):
+        (main):
 -11-30  Abhinav Mithal  <abhinav.mithal@nokia.com>
 …
         * Api/qwebpage.cpp:
         (QWebPage::userAgentForUrl):
+-11-30  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Fix minor waning in QtWebKit
+        https://bugs.webkit.org/show_bug.cgi?id=31963
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (ErrorPage::extension): Remove info wariable as it is
+        not used.
 -11-28  Simon Hausmann  <simon.hausmann@nokia.com>
 …
         * tests/qwebpage/tst_qwebpage.cpp:
         (tst_QWebPage::inputMethods):
+-11-26  Simon Hausmann  <simon.hausmann@nokia.com>
+        Rubber-stamped by Holger Freyther.
+        Removed unused ICO image plugin handler.
+        * Plugins/ICOHandler.cpp: Removed.
+        * Plugins/ICOHandler.h: Removed.
+        * Plugins/Plugins.pro: Removed.
+-11-12  Holger Hans Peter Freyther  <zecke@selfish.org>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Do not show the QWidget when the WebCore::Widget is hidden
+        https://bugs.webkit.org/show_bug.cgi?id=31203
+        The clipping code was making a QWidget visible even if the
+        WebCore::Widget was hidden. Fix the bug by calling setVisible
+        only if the WebCore::Widget Widget::isSelfVisible.
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::QtPluginWidget::show): Override WebCore::Widget::show to call handleVisibility
+        (WebCore::QtPluginWidget::handleVisibility): New method to call setVisible when we are visible
+        (FrameLoaderClientQt::createPlugin): Hide the QWidget by default
 -11-23  David Boddie  <dboddie@trolltech.com>
 …
         * tests/qwebframe/tst_qwebframe.cpp:
+-11-19  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Add instantiation tests for QWebInspector.
+        * tests/qwebinspector/qwebinspector.pro: Added.
+        * tests/qwebinspector/tst_qwebinspector.cpp: Added.
+        (tst_QWebInspector::attachAndDestroy):
+        * tests/tests.pro:
+-11-19  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Fix QWebInspector destruction problem.
+        https://bugs.webkit.org/show_bug.cgi?id=31664
+        * Api/qwebpage.cpp:
+        (QWebPage::~QWebPage):
 -11-19  Olivier Goffart  <ogoffart@trolltech.com>
 …
         (tst_QWebPage::database):
+-11-18  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Remove support for Qt v4.3 or older versions
+        https://bugs.webkit.org/show_bug.cgi?id=29469
+        * Api/qcookiejar.cpp: Removed.
+        * Api/qcookiejar.h: Removed.
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::event):
+        * Api/qwebframe.cpp:
+        (QWebFrame::load):
+        * Api/qwebframe.h:
+        * Api/qwebkitglobal.h:
+        * Api/qwebnetworkinterface.cpp: Removed.
+        * Api/qwebnetworkinterface.h: Removed.
+        * Api/qwebnetworkinterface_p.h: Removed.
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::QWebPagePrivate):
+        (QWebPagePrivate::acceptNavigationRequest):
+        (QWebPage::acceptNavigationRequest):
+        (QWebPage::action):
+        (QWebPage::userAgentForUrl):
+        * Api/qwebpage.h:
+        * Api/qwebpage_p.h:
+        * Api/qwebview.cpp:
+        (QWebView::load):
+        (QWebView::event):
+        * Api/qwebview.h:
+        * QtLauncher/main.cpp:
+        (MainWindow::print):
+        (MainWindow::setupUI):
+        (main):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::download):
+        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNewWindowAction):
+        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction):
+        (WebCore::FrameLoaderClientQt::startDownload):
+        (WebCore::FrameLoaderClientQt::createPlugin):
+-11-18  Shu Chang  <Chang.Shu@nokia.com>
+        Reviewed by Eric Seidel.
+        [Qt] Add support for displaying deleteButton.
+        https://bugs.webkit.org/show_bug.cgi?id=31560
+        Test: LayoutTests/editing/deleting/5408255.html
+        * Api/qwebsettings.cpp:
+        (graphics):
+        * Api/qwebsettings.h:
 -11-18  Paul Olav Tvete  <paul.tvete@nokia.com>
 …
         * docs/qtwebkit.qdoc:
+-11-18  Simon Hausmann  <simon.hausmann@nokia.com>
+        Reviewed and suggested by Tor Arne VestbÃž.
+        Fix the autotest after commit ecbb2c0dd21bfc197e1f7b53150ec9b1a1d8cb8f
+        to compare the Qt::ImFont property's family against an explicitly
+        previously configured family.
+-11-18  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
+        Reviewed by Simon Hausmann.
+        [Qt] Add QtLauncher support for opening links in the default browser
+        This can be triggered by either the context menu or by clicking a link
+        while holding down the Alt key. Opening a link in a new windows is
+        triggered by holding down Shift.
+        * QtLauncher/main.cpp:
+-11-17  Yael Aharon  <yael.aharon@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] QGLLauncher does not support drag&drop of local files
+        https://bugs.webkit.org/show_bug.cgi?id=31057
+        Enable accepting files in QGraphicsWebView.
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::QGraphicsWebView):
+        (QGraphicsWebView::dragEnterEvent):
+-11-17  Antonio Gomes  <tonikitoo@webkit.org>
+        Reviewed by Kenneth Christiansen.
+        [Qt] better test coverage for ErrorPageExtension
+        https://bugs.webkit.org/show_bug.cgi?id=31583
+        Improved the coverage of current ErrorPageExtension tests by
+        adding autotests involving frameset and iframes.
         * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+        (ErrorPage::extension): Make the ErrorPageExtension
+        to work for all frames, not only the main frame.
+        (tst_QWebPage::errorPageExtension): Stop using
+        the 'frameset.html' resouce in this method since
+        an autotest specific for frameset's is being added.
+        (tst_QWebPage::errorPageExtensionInIFrames): Added.
+        (tst_QWebPage::errorPageExtensionInFrameset): Added.
 -11-16  Simon Hausmann  <simon.hausmann@nokia.com>
 …
         (tst_QWebPage::errorPageExtension):
+-11-16  Holger Hans Peter Freyther  <zecke@selfish.org>
+        Reviewed by NOBODY (OOPS!).
+        [Qt] Do not show the QWidget when the WebCore::Widget is hidden
+        https://bugs.webkit.org/show_bug.cgi?id=31203
+        The clipping code was making a QWidget visible even if the
+        WebCore::Widget was hidden. Fix the bug by calling setVisible
+        only if the WebCore::Widget is shown.
+-11-13  Adam Roben  <aroben@apple.com>
+        Update for changes to FrameLoaderClient
+        Fixes <http://webkit.org/b/31124> Tell the WebFrameLoadDelegate when
+        window objects in isolated worlds are cleared
+        Reviewed by Dave Hyatt.
         * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::QtPluginWidget::show): Override WebCore::Widget
+        (WebCore::QtPluginWidget::hide): Override WebCore::Widget
+        (WebCore::QtPluginWidget::handleVisibility): New method to call setVisible when we are visible
+        (FrameLoaderClientQt::createPlugin): Hide the QWidget by default
+-11-09  Benjamin Poulain  <benjamin.poulain@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        https://bugs.webkit.org/show_bug.cgi?id=30628
+        Add an API to get all the attributes from a QWebElement.
+        * Api/qwebelement.cpp:
+        (QWebElement::attributesName):
+        * Api/qwebelement.h:
+        * tests/qwebelement/tst_qwebelement.cpp:
+        (tst_QWebElement::listAttributes):
+        (WebCore::FrameLoaderClientQt::dispatchDidClearWindowObjectInWorld):
+        * WebCoreSupport/FrameLoaderClientQt.h:
+        Replaced windowObjectCleared with this function. Does nothing if the
+        passed-in world is not the mainThreadNormalWorld().
 -11-13  Andras Becsi  <becsi.andras@stud.u-szeged.hu>
 …
         (QWebSettings::setMaximumPagesInCache):
+-11-13  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Fix initial QWebView focus behavior.
+        focusController->setFocused(true) was not always called.
+        https://bugs.webkit.org/show_bug.cgi?id=31466
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::focusInEvent):
 -11-13  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
 …
         * docs/docs.pri:
+-11-12  Shinichiro Hamaji  <hamaji@chromium.org>
+        Reviewed by Darin Adler.
+        externalRepresentation should take Frame as the argument
+        https://bugs.webkit.org/show_bug.cgi?id=31393
+        No new tests as this is just a refactoring.
+        * Api/qwebframe.cpp:
+        (QWebFrame::renderTreeDump):
 -11-12  Antonio Gomes  <tonikitoo@webkit.org>
 …
         * Api/qwebpage.cpp:
--11-11  Antonio Gomes  <tonikitoo@webkit.org>
-        Reviewed by Kenneth Christiansen.
-        [Qt] Various doc fixes
-        https://bugs.webkit.org/show_bug.cgi?id=31358
-        Fixed wrong documentation: item's dimensions do fit to Web page
-        content by default.
-        Kenneth agreed to land this as a followup patch to the
-        just landed documentation patch.
-        * Api/qgraphicswebview.cpp:
--11-11  David Boddie  <dboddie@trolltech.com>
-        Reviewed by Kenneth Christiansen.
-        [Qt] Various doc fixes
-        https://bugs.webkit.org/show_bug.cgi?id=31323
-        Fixed and synchronized QWebView related documentation.
-        * Api/qgraphicswebview.cpp:
-        * Api/qwebview.cpp:
--11-09  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
-        Reviewed by Kenneth Rohde Christiansen.
-        [Qt] Few classes have virtual functions but non-virtual destructor
-        https://bugs.webkit.org/show_bug.cgi?id=31269
-        * Api/qgraphicswebview.cpp:
-        (QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate): Add virtual
-        destructor.
--10-30  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
-        Reviewed by NOBODY (OOPS!).
-        [Qt] Use the default timeout interval for JS as the HTML tokenizer delay for setHtml()
-        This ensures that long-running JavaScript (for example due to a modal alert() dialog),
-        will not trigger a deferred load after only 500ms (the default tokenizer delay) while
-        still giving a reasonable timeout (10 seconds) to prevent deadlock.
-        https://bugs.webkit.org/show_bug.cgi?id=29381
-        * Api/qwebframe.cpp: Document the behaviour
-        * WebCoreSupport/FrameLoaderClientQt.cpp: set the custom tokenizer delay for substitute loads
-        * tests/qwebframe/tst_qwebframe.cpp: Add test
--11-13  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
-        Reviewed by Kenneth Rohde Christiansen.
-        [Qt] Fix initial QWebView focus behavior.
-        focusController->setFocused(true) was not always called.
-        https://bugs.webkit.org/show_bug.cgi?id=31466
-        * Api/qwebpage.cpp:
-        (QWebPagePrivate::focusInEvent):
 -11-12  Benjamin Poulain  <benjamin.poulain@nokia.com>
 …
         * Api/qwebsettings.h:
+-11-11  Antonio Gomes  <tonikitoo@webkit.org>
+        Reviewed by Kenneth Christiansen.
+        [Qt] Various doc fixes
+        https://bugs.webkit.org/show_bug.cgi?id=31358
+        Fixed wrong documentation: item's dimensions do fit to Web page
+        content by default.
+        Kenneth agreed to land this as a followup patch to the
+        just landed documentation patch.
+        * Api/qgraphicswebview.cpp:
+-11-11  David Boddie  <dboddie@trolltech.com>
+        Reviewed by Kenneth Christiansen.
+        [Qt] Various doc fixes
+        https://bugs.webkit.org/show_bug.cgi?id=31323
+        Fixed and synchronized QWebView related documentation.
+        * Api/qgraphicswebview.cpp:
+        * Api/qwebview.cpp:
+-11-11  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Unreviewed buildbot fix.
+        Export a method to the DRT to know if the document has a
+        document element.
+        * Api/qwebframe.cpp:
+        (qt_drt_hasDocumentElement):
 -11-11  Liang QI  <liang.qi@nokia.com>
-        Update documentation for the Qt API
-        * Api/qgraphicswebview.cpp:
-        * Api/qwebelement.cpp:
-        * Api/qwebframe.cpp:
-        * Api/qwebsettings.cpp:
-        * Api/qwebview.cpp:
--11-13  Tor Arne VestbÃž  <tor.arne.vestbo@nokia.com>
-        Reviewed by Simon Hausmann.
         [Qt] Fix tst_qwebpage and tst_qwebframe compilation on Symbian.
 …
         * Api/qwebview.cpp:
+-11-10  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Unreviewed documentation fixes.
+        Added a few improvements from Jocelyn Turcotte to the
+        createWindow docs.
+        * Api/qwebview.cpp:
+-11-10  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Unreviewed documentation fix.
+        [Qt] Make qwebpage's createWindow not qwebview dependent.
+        https://bugs.webkit.org/show_bug.cgi?id=30771
+        Update documentation to make it clear that a reimplementation
+        of the createWindow method of the associated QWebPage can
+        result in the QWebView::createWindow method to never be called.
+        * Api/qwebview.cpp:
+-11-11  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        https://bugs.webkit.org/show_bug.cgi?id=31323
+        Fix a few compiler warnings
+        * tests/qwebframe/tst_qwebframe.cpp: Add extra brackets
+        to make it explicit where the else case belongs
 -11-11  Simon Hausmann  <simon.hausmann@nokia.com>
 …
         (tst_QWebPage::inputMethods): Modify the test to verify that SIPR
         events are dispatched when activating focusable content.
+-11-10  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Unreviewed documentation fixes.
+        Added a few improvements from Jocelyn Turcotte to the
+        createWindow docs.
+        * Api/qwebview.cpp:
+-11-10  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+        Unreviewed documentation fix.
+        [Qt] Make qwebpage's createWindow not qwebview dependent.
+        https://bugs.webkit.org/show_bug.cgi?id=30771
+        Update documentation to make it clear that a reimplementation
+        of the createWindow method of the associated QWebPage can
+        result in the QWebView::createWindow method to never be called.
+        * Api/qwebview.cpp:
+-11-09  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        [Qt] Few classes have virtual functions but non-virtual destructor
+        https://bugs.webkit.org/show_bug.cgi?id=31269
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate): Add virtual
+        destructor.
+-11-09  Benjamin Poulain  <benjamin.poulain@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        https://bugs.webkit.org/show_bug.cgi?id=30628
+        Add an API to get all the attributes from a QWebElement.
+        * Api/qwebelement.cpp:
+        (QWebElement::attributesName):
+        * Api/qwebelement.h:
+        * tests/qwebelement/tst_qwebelement.cpp:
+        (tst_QWebElement::listAttributes):
+-11-09  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Kenneth Rohde Christiansen.
+        Use explicit parentheses to silence gcc 4.4 -Wparentheses warnings
+        https://bugs.webkit.org/show_bug.cgi?id=31040
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::handleScrolling):
+-11-09  Mark Mentovai  <mark@chromium.org>
+        Reviewed by Dan Bernstein.
+        Track "can have scrollbar" state within FrameView independently of the
+        individual scrollbar states in ScrollView.
+        rdar://problem/7215132, https://bugs.webkit.org/show_bug.cgi?id=29167
+        REGRESSION (r48064): mint.com loses scrollbars after coming out of
+        edit mode.
+        rdar://problem/7314421, https://bugs.webkit.org/show_bug.cgi?id=30517
+        REGRESSION (r48064): Extra scroll bars in GarageBand Lesson Store.
+        Test: fast/overflow/scrollbar-restored.html
+        * Api/qwebframe.cpp:
+        (QWebFrame::setScrollBarPolicy):
 -11-09  Benjamin Poulain  <benjamin.poulain@nokia.com>
 …
         * Api/qgraphicswebview.h:
+-11-05  Shu Chang  <Chang.Shu@nokia.com>
+        Reviewed by Tor Arne VestbÃž.
+        Add support for Shift-PageUp and Shift-PageDown key events.
+        https://bugs.webkit.org/show_bug.cgi?id=31166
+        Test: LayoutTests/editing/selection/shrink-selection-after-shift-pagedown.html
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::handleKeyboardEvent):
 -11-05  Simon Hausmann  <hausmann@webkit.org>
 …
         (WebViewCrashTest::loading):
         (tst_QWebView::crashTests):
+-11-01  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+        Reviewed by Eric Seidel.
+        Turn on warnings for QtWebKit for gcc
+        https://bugs.webkit.org/show_bug.cgi?id=30958
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::QWebPagePrivate): Reorder initialization list
+        to fix compiler warnings.
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::FrameLoaderClientQt): Ditto.
+-10-30  Evan Stade  <estade@chromium.org>
+        Reviewed by David Levin.
+        Notify the chrome when the focused node has changed.
+        https://bugs.webkit.org/show_bug.cgi?id=30832
+        Added stub implementation for new ChromeClient function.
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::focusedNodeChanged):
+        * WebCoreSupport/ChromeClientQt.h:
 -10-30  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>

trunk/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

-              r651
+              r846
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "config.h"
 #include "ChromeClientQt.h"
 …
 #include "FrameView.h"
 #include "HitTestResult.h"
+#include "Icon.h"
 #include "NotImplemented.h"
+#include "ScrollbarTheme.h"
 #include "WindowFeatures.h"
 #include "DatabaseTracker.h"
+#if defined(Q_WS_MAEMO_5)
+#include "QtMaemoWebPopup.h"
+#else
+#include "QtFallbackWebPopup.h"
+#endif
+#include "QWebPageClient.h"
 #include "SecurityOrigin.h"
+#include "QWebPageClient.h"
+#include <qdebug.h>
+#include <qeventloop.h>
+#include <qtextdocument.h>
+#include <qtooltip.h>
 #include "qwebpage.h"
 …
 #include "qwebview.h"
+#include <qtooltip.h>
+#include <qtextdocument.h>
+namespace WebCore
+{
+#if USE(ACCELERATED_COMPOSITING)
+#include "GraphicsLayerQt.h"
+#endif
+namespace WebCore {
 ChromeClientQt::ChromeClientQt(QWebPage* webPage)
     : m_webPage(webPage)
+    , m_eventLoop(0)
+{
     toolBarsVisible = statusBarVisible = menuBarVisible = true;
 …
 ChromeClientQt::~ChromeClientQt()
+{
+    if (m_eventLoop)
+        m_eventLoop->exit();
+}
 …
+void ChromeClientQt::focusedNodeChanged(WebCore::Node*)
+{
+}
 Page* ChromeClientQt::createWindow(Frame*, const FrameLoadRequest& request, const WindowFeatures& features)
+{
 …
     if (!newPage)
         return 0;
+    newPage->mainFrame()->load(request.resourceRequest().url());
+    // A call to QWebPage::mainFrame() implicitly creates the main frame.
+    // Make sure it exists, as WebCore expects it when returning from this call.
+    QWebFrame* mainFrame = newPage->mainFrame();
+    if (!request.isEmpty())
+        mainFrame->load(request.resourceRequest().url());
     return newPage->d->page;
+}
 …
 bool ChromeClientQt::canRunModal()
+{
+    notImplemented();
+    return false;
+    return true;
+}
 …
 void ChromeClientQt::runModal()
+{
+    notImplemented();
+    m_eventLoop = new QEventLoop();
+    QEventLoop* eventLoop = m_eventLoop;
+    m_eventLoop->exec();
+    delete eventLoop;
+}
 …
 IntRect ChromeClientQt::windowResizerRect() const
+{
+#if defined(Q_WS_MAC)
+    if (!m_webPage)
+        return IntRect();
+    QWebPageClient* pageClient = platformPageClient();
+    if (!pageClient)
+        return IntRect();
+    QWidget* ownerWidget = pageClient->ownerWidget();
+    if (!ownerWidget)
+        return IntRect();
+    QWidget* topLevelWidget = ownerWidget->topLevelWidget();
+    QRect topLevelGeometry(topLevelWidget->geometry());
+    // There's no API in Qt to query for the size of the resizer, so we assume
+    // it has the same width and height as the scrollbar thickness.
+    int scollbarThickness = ScrollbarTheme::nativeTheme()->scrollbarThickness();
+    // There's no API in Qt to query for the position of the resizer. Sometimes
+    // it's drawn by the system, and sometimes it's a QSizeGrip. For RTL locales
+    // it might even be on the lower left side of the window, but in WebKit we
+    // always draw scrollbars on the right hand side, so we assume this to be the
+    // location when computing the resize rect to reserve for WebKit.
+    QPoint resizeCornerTopLeft = ownerWidget->mapFrom(topLevelWidget,
+            QPoint(topLevelGeometry.width(), topLevelGeometry.height())
+            - QPoint(scollbarThickness, scollbarThickness));
+    QRect resizeCornerRect = QRect(resizeCornerTopLeft, QSize(scollbarThickness, scollbarThickness));
+    return resizeCornerRect.intersected(pageClient->geometryRelativeToOwnerWidget());
+#else
     return IntRect();
+}
+void ChromeClientQt::repaint(const IntRect& windowRect, bool contentChanged, bool, bool)
+#endif
+}
+void ChromeClientQt::invalidateWindow(const IntRect&, bool)
+{
+    notImplemented();
+}
+void ChromeClientQt::invalidateContentsAndWindow(const IntRect& windowRect, bool immediate)
+{
     // No double buffer, so only update the QWidget if content changed.
+    if (contentChanged) {
+        if (platformPageClient()) {
+            QRect rect(windowRect);
+            rect = rect.intersected(QRect(QPoint(0, 0), m_webPage->viewportSize()));
+            if (!rect.isEmpty())
+                platformPageClient()->update(rect);
+        }
+        emit m_webPage->repaintRequested(windowRect);
+    if (platformPageClient()) {
+        QRect rect(windowRect);
+        rect = rect.intersected(QRect(QPoint(0, 0), m_webPage->viewportSize()));
+        if (!rect.isEmpty())
+            platformPageClient()->update(rect);
+    }
+    emit m_webPage->repaintRequested(windowRect);
     // FIXME: There is no "immediate" support for window painting.  This should be done always whenever the flag
     // is set.
+}
+void ChromeClientQt::invalidateContentsForSlowScroll(const IntRect& windowRect, bool immediate)
+{
+    invalidateContentsAndWindow(windowRect, immediate);
+}
 …
+}
+void ChromeClientQt::chooseIconForFiles(const Vector<String>& filenames, PassRefPtr<FileChooser> chooser)
+{
+    chooser->iconLoaded(Icon::createIconForFiles(filenames));
+}
 bool ChromeClientQt::setCursor(PlatformCursorHandle)
+{
 …
+}
+}
+#if USE(ACCELERATED_COMPOSITING)
+void ChromeClientQt::attachRootGraphicsLayer(Frame* frame, GraphicsLayer* graphicsLayer)
+{
+    if (platformPageClient())
+        platformPageClient()->setRootGraphicsLayer(graphicsLayer ? graphicsLayer->nativeLayer() : 0);
+}
+void ChromeClientQt::setNeedsOneShotDrawingSynchronization()
+{
+    // we want the layers to synchronize next time we update the screen anyway
+    if (platformPageClient())
+        platformPageClient()->markForSync(false);
+}
+void ChromeClientQt::scheduleCompositingLayerSync()
+{
+    // we want the layers to synchronize ASAP
+    if (platformPageClient())
+        platformPageClient()->markForSync(true);
+}
+bool ChromeClientQt::allowsAcceleratedCompositing() const
+{
+    return (platformPageClient() && platformPageClient()->allowsAcceleratedCompositing());
+}
+#endif
+#if ENABLE(TILED_BACKING_STORE)
+IntRect ChromeClientQt::visibleRectForTiledBackingStore() const
+{
+    if (!platformPageClient() || !m_webPage)
+        return IntRect();
+    if (!platformPageClient()->viewResizesToContentsEnabled())
+        return QRect(m_webPage->mainFrame()->scrollPosition(), m_webPage->mainFrame()->geometry().size());
+    return enclosingIntRect(FloatRect(platformPageClient()->graphicsItemVisibleRect()));
+}
+#endif
+QtAbstractWebPopup* ChromeClientQt::createSelectPopup()
+{
+#if defined(Q_WS_MAEMO_5)
+    return new QtMaemoWebPopup;
+#elif !defined(QT_NO_COMBOBOX)
+    return new QtFallbackWebPopup;
+#else
+    return 0;
+#endif
+}
+#if ENABLE(WIDGETS_10_SUPPORT)
+bool ChromeClientQt::isWindowed()
+{
+    return m_webPage->d->viewMode == "windowed";
+}
+bool ChromeClientQt::isFloating()
+{
+    return m_webPage->d->viewMode == "floating";
+}
+bool ChromeClientQt::isFullscreen()
+{
+    return m_webPage->d->viewMode == "fullscreen";
+}
+bool ChromeClientQt::isMaximized()
+{
+    return m_webPage->d->viewMode == "maximized";
+}
+bool ChromeClientQt::isMinimized()
+{
+    return m_webPage->d->viewMode == "minimized";
+}
+#endif
+}

trunk/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h

-              r561
+              r846
 #include "PlatformString.h"
+QT_BEGIN_NAMESPACE
+class QEventLoop;
+QT_END_NAMESPACE
 class QWebPage;
 …
     class Page;
     struct FrameLoadRequest;
+    class QtAbstractWebPopup;
     class ChromeClientQt : public ChromeClient
 …
         virtual bool canTakeFocus(FocusDirection);
         virtual void takeFocus(FocusDirection);
+        virtual void focusedNodeChanged(Node*);
         virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&);
 …
         virtual IntRect windowResizerRect() const;
+        virtual void repaint(const IntRect&, bool contentChanged, bool immediate = false, bool repaintContentOnly = false);
+        virtual void invalidateWindow(const IntRect&, bool);
+        virtual void invalidateContentsAndWindow(const IntRect&, bool);
+        virtual void invalidateContentsForSlowScroll(const IntRect&, bool);
         virtual void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
         virtual IntPoint screenToWindow(const IntPoint&) const;
         virtual IntRect windowToScreen(const IntRect&) const;
 …
         virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
 #endif
+#if USE(ACCELERATED_COMPOSITING)
+        // see ChromeClient.h
+        // this is a hook for WebCore to tell us what we need to do with the GraphicsLayers
+        virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*);
+        virtual void setNeedsOneShotDrawingSynchronization();
+        virtual void scheduleCompositingLayerSync();
+        virtual bool allowsAcceleratedCompositing() const;
+#endif
+#if ENABLE(TILED_BACKING_STORE)
+        virtual IntRect visibleRectForTiledBackingStore() const;
+#endif
+#if ENABLE(TOUCH_EVENTS)
+        virtual void needTouchEvents(bool) { }
+#endif
         virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
+        virtual void chooseIconForFiles(const Vector<String>&, PassRefPtr<FileChooser>);
         virtual void formStateDidChange(const Node*) { }
 …
         virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*);
+        virtual void cancelGeolocationPermissionRequestForFrame(Frame*) { }
+#if ENABLE(WIDGETS_10_SUPPORT)
+        virtual bool isWindowed();
+        virtual bool isFloating();
+        virtual bool isFullscreen();
+        virtual bool isMaximized();
+        virtual bool isMinimized();
+#endif
+        QtAbstractWebPopup* createSelectPopup();
         QWebPage* m_webPage;
 …
         bool statusBarVisible;
         bool menuBarVisible;
+        QEventLoop* m_eventLoop;
     };
+}

trunk/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/DragClientQt.cpp

-              r561
+              r846
 #include "ClipboardQt.h"
+#include "Frame.h"
+#include "PlatformMouseEvent.h"
 #include "qwebpage.h"
 …
 namespace WebCore {
+static inline Qt::DropActions dragOperationsToDropActions(unsigned op)
+{
+    Qt::DropActions result = Qt::IgnoreAction;
+    if (op & DragOperationCopy)
+        result = Qt::CopyAction;
+    if (op & DragOperationMove)
+        result |= Qt::MoveAction;
+    if (op & DragOperationGeneric)
+        result |= Qt::MoveAction;
+    if (op & DragOperationLink)
+        result |= Qt::LinkAction;
+    return result;
+}
+static inline DragOperation dropActionToDragOperation(Qt::DropActions action)
+{
+    DragOperation result = DragOperationNone;
+    if (action & Qt::CopyAction)
+        result = DragOperationCopy;
+    if (action & Qt::LinkAction)
+        result = DragOperationLink;
+    if (action & Qt::MoveAction)
+        result = DragOperationMove;
+    return result;
+}
 DragDestinationAction DragClientQt::actionMaskForDrag(DragData*)
 …
+}
 void DragClientQt::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard* clipboard, Frame*, bool)
+void DragClientQt::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard* clipboard, Frame* frame, bool)
+{
 #ifndef QT_NO_DRAGANDDROP
 …
     if (view) {
         QDrag *drag = new QDrag(view);
         if (clipboardData->hasImage())
+        if (clipboardData && clipboardData->hasImage())
             drag->setPixmap(qvariant_cast<QPixmap>(clipboardData->imageData()));
+        DragOperation dragOperationMask = clipboard->sourceOperation();
         drag->setMimeData(clipboardData);
+        drag->start();
+        Qt::DropAction actualDropAction = drag->exec(dragOperationsToDropActions(dragOperationMask));
+        // Send dragEnd event
+        PlatformMouseEvent me(m_webPage->view()->mapFromGlobal(QCursor::pos()), QCursor::pos(), LeftButton, MouseEventMoved, 0, false, false, false, false, 0);
+        frame->eventHandler()->dragSourceEndedAt(me, dropActionToDragOperation(actualDropAction));
+    }
 #endif

trunk/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/EditCommandQt.cpp

r561	r846
19	19
20	20	#include "config.h"
21		~~#include <wtf/Platform.h>~~
22	21	#include "EditCommandQt.h"
23	22

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

-              r769
+              r846
 #endif // QT_NO_SHORTCUT
         switch (kevent->windowsVirtualKeyCode()) {
-#if QT_VERSION < 0x040500
-            case VK_RETURN:
-#ifdef QT_WS_MAC
-                if (kevent->shiftKey() || kevent->metaKey())
-#else
-                if (kevent->shiftKey())
-#endif
-                    frame->editor()->command("InsertLineBreak").execute();
-                else
-                    frame->editor()->command("InsertNewline").execute();
-                break;
-#endif
             case VK_BACK:
                 frame->editor()->deleteWithDirection(SelectionController::BACKWARD,
 …
                 if (kevent->shiftKey())
                     frame->editor()->command("MoveLeftAndModifySelection").execute();
+                else frame->editor()->command("MoveLeft").execute();
+                else
+                    frame->editor()->command("MoveLeft").execute();
                 break;
             case VK_RIGHT:
                 if (kevent->shiftKey())
                     frame->editor()->command("MoveRightAndModifySelection").execute();
+                else frame->editor()->command("MoveRight").execute();
+                else
+                    frame->editor()->command("MoveRight").execute();
                 break;
             case VK_UP:
                 if (kevent->shiftKey())
                     frame->editor()->command("MoveUpAndModifySelection").execute();
+                else frame->editor()->command("MoveUp").execute();
+                else
+                    frame->editor()->command("MoveUp").execute();
                 break;
             case VK_DOWN:
                 if (kevent->shiftKey())
                     frame->editor()->command("MoveDownAndModifySelection").execute();
+                else frame->editor()->command("MoveDown").execute();
+                else
+                    frame->editor()->command("MoveDown").execute();
                 break;
             case VK_PRIOR:  // PageUp
+                frame->editor()->command("MovePageUp").execute();
+                if (kevent->shiftKey())
+                    frame->editor()->command("MovePageUpAndModifySelection").execute();
+                else
+                    frame->editor()->command("MovePageUp").execute();
                 break;
             case VK_NEXT:  // PageDown
+                frame->editor()->command("MovePageDown").execute();
+                if (kevent->shiftKey())
+                    frame->editor()->command("MovePageDownAndModifySelection").execute();
+                else
+                    frame->editor()->command("MovePageDown").execute();
                 break;
             case VK_TAB:
 …
     if (webPageClient) {
 #if QT_VERSION >= 0x040600
+        bool isPasswordField = false;
+        if (!active) {
+        // Make sure to reset input method hint
+        webPageClient->setInputMethodHint(Qt::ImhDialableCharactersOnly, false);
+        webPageClient->setInputMethodHint(Qt::ImhDigitsOnly, false);
+        webPageClient->setInputMethodHint(Qt::ImhEmailCharactersOnly, false);
+        webPageClient->setInputMethodHint(Qt::ImhUrlCharactersOnly, false);
+        webPageClient->setInputMethodHint(Qt::ImhHiddenText, false);
+        HTMLInputElement* inputElement = 0;
+        Frame* frame = m_page->d->page->focusController()->focusedOrMainFrame();
+        if (frame && frame->document() && frame->document()->focusedNode())
+            if (frame->document()->focusedNode()->hasTagName(HTMLNames::inputTag))
+                inputElement = static_cast<HTMLInputElement*>(frame->document()->focusedNode());
+        if (inputElement) {
+            // Set input method hints for "number", "tel", "email", "url" and "password" input elements.
+            webPageClient->setInputMethodHint(Qt::ImhDialableCharactersOnly, inputElement->isTelephoneField());
+            webPageClient->setInputMethodHint(Qt::ImhDigitsOnly, inputElement->isNumberField());
+            webPageClient->setInputMethodHint(Qt::ImhEmailCharactersOnly, inputElement->isEmailField());
+            webPageClient->setInputMethodHint(Qt::ImhUrlCharactersOnly, inputElement->isUrlField());
             // Setting the Qt::WA_InputMethodEnabled attribute true and Qt::ImhHiddenText flag
             // for password fields. The Qt platform is responsible for determining which widget
             // will receive input method events for password fields.
+            Frame* frame = m_page->d->page->focusController()->focusedOrMainFrame();
+            if (frame && frame->document() && frame->document()->focusedNode()) {
+                if (frame->document()->focusedNode()->hasTagName(HTMLNames::inputTag)) {
+                    HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(frame->document()->focusedNode());
+                    active = isPasswordField = inputElement->isPasswordField();
+              }
+            }
+            bool isPasswordField = inputElement->isPasswordField();
+            webPageClient->setInputMethodHint(Qt::ImhHiddenText, isPasswordField);
+            if (isPasswordField)
+                active = true;
+        }
+        webPageClient->setInputMethodHint(Qt::ImhHiddenText, isPasswordField);
 #if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
         // disables auto-uppercase and predictive text for mobile devices

trunk/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

-              r561
+              r846
  * Copyright (C) 2006 Zack Rusin <zack@kde.org>
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Collabora Ltd. All rights reserved.
  * Coypright (C) 2008 Holger Hans Peter Freyther
+ * Coypright (C) 2009, 2010 Girish Ramakrishnan <girish@forwardbias.in>
+ *
  * All rights reserved.
 …
 #include "HTMLFormElement.h"
 #include "HTMLPlugInElement.h"
+#include "HTTPParsers.h"
 #include "NotImplemented.h"
 #include "QNetworkReplyHandler.h"
 #include "ResourceHandleInternal.h"
 #include "ResourceHandle.h"
+#include "ScriptController.h"
+#include "ScriptString.h"
 #include "Settings.h"
-#include "ScriptString.h"
 #include "QWebPageClient.h"
 …
 #include <QCoreApplication>
 #include <QDebug>
-#if QT_VERSION >= 0x040400
 #include <QGraphicsScene>
 #include <QGraphicsWidget>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#else
-#include "qwebnetworkinterface_p.h"
-#endif
 #include "qwebhistory_p.h"
 …
+{
+bool FrameLoaderClientQt::deferMainResourceDataLoad = true;
 FrameLoaderClientQt::FrameLoaderClientQt()
     : m_frame(0)
     , m_webFrame(0)
+    , m_firstData(false)
     , m_pluginView(0)
     , m_hasSentResponseToPlugin(false)
-    , m_firstData(false)
     , m_loadError (ResourceError())
+{
 …
     const QSize preferredLayoutSize = page->preferredContentsSize();
+    ScrollbarMode hScrollbar = (ScrollbarMode) m_webFrame->scrollBarPolicy(Qt::Horizontal);
+    ScrollbarMode vScrollbar = (ScrollbarMode) m_webFrame->scrollBarPolicy(Qt::Vertical);
+    bool hLock = hScrollbar != ScrollbarAuto;
+    bool vLock = vScrollbar != ScrollbarAuto;
     m_frame->createView(m_webFrame->page()->viewportSize(),
                         backgroundColor, !backgroundColor.alpha(),
                         preferredLayoutSize.isValid() ? IntSize(preferredLayoutSize) : IntSize(),
                         preferredLayoutSize.isValid(),
                         (ScrollbarMode)m_webFrame->scrollBarPolicy(Qt::Horizontal),
                         (ScrollbarMode)m_webFrame->scrollBarPolicy(Qt::Vertical));
+                        hScrollbar, hLock,
+                        vScrollbar, vLock);
+}
 …
+}
+void FrameLoaderClientQt::dispatchDidPushStateWithinPage()
+{
+    if (dumpFrameLoaderCallbacks)
+        printf("%s - dispatchDidPushStateWithinPage\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
+    notImplemented();
+}
+void FrameLoaderClientQt::dispatchDidReplaceStateWithinPage()
+{
+    if (dumpFrameLoaderCallbacks)
+        printf("%s - dispatchDidReplaceStateWithinPage\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
+    notImplemented();
+}
+void FrameLoaderClientQt::dispatchDidPopStateWithinPage()
+{
+    if (dumpFrameLoaderCallbacks)
+        printf("%s - dispatchDidPopStateWithinPage\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
+    notImplemented();
+}
 void FrameLoaderClientQt::dispatchWillClose()
+{
-    if (dumpFrameLoaderCallbacks)
-        printf("%s - willCloseFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
+}
 …
 void FrameLoaderClientQt::dispatchDidFirstLayout()
+{
+    notImplemented();
+}
+void FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout()
+{
     if (m_webFrame)
         emit m_webFrame->initialLayoutCompleted();
+}
-void FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout()
+{
-    notImplemented();
+}
 …
+    }
     else {
+        m_pluginView->didFinishLoading();
+        if (m_pluginView->isPluginView())
+            m_pluginView->didFinishLoading();
         m_pluginView = 0;
         m_hasSentResponseToPlugin = false;
 …
 void FrameLoaderClientQt::dispatchDidReceiveIcon()
+{
-    if (dumpFrameLoaderCallbacks)
-        printf("%s - didReceiveIconForFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
     if (m_webFrame) {
         emit m_webFrame->iconChanged();
 …
+}
 void FrameLoaderClientQt::windowObjectCleared()
+{
     if (dumpFrameLoaderCallbacks)
         printf("%s - didClearWindowObjectForFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
+void FrameLoaderClientQt::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world)
+{
+    if (world != mainThreadNormalWorld())
+        return;
     if (m_webFrame)
 …
+}
+void FrameLoaderClientQt::dispatchDidAddBackForwardItem(WebCore::HistoryItem*) const
+{
+}
+void FrameLoaderClientQt::dispatchDidRemoveBackForwardItem(WebCore::HistoryItem*) const
+{
+}
+void FrameLoaderClientQt::dispatchDidChangeBackForwardIndex() const
+{
+}
 void FrameLoaderClientQt::didDisplayInsecureContent()
+{
+    if (dumpFrameLoaderCallbacks)
+        printf("didDisplayInsecureContent\n");
     notImplemented();
+}
 …
 void FrameLoaderClientQt::didRunInsecureContent(WebCore::SecurityOrigin*)
+{
+    if (dumpFrameLoaderCallbacks)
+        printf("didRunInsecureContent\n");
     notImplemented();
+}
 …
+        }
     } else {
+        m_pluginView->didFail(error);
+        if (m_pluginView->isPluginView())
+            m_pluginView->didFail(error);
         m_pluginView = 0;
         m_hasSentResponseToPlugin = false;
 …
     // We re-check here as the plugin can have been created
     if (m_pluginView) {
+    if (m_pluginView && m_pluginView->isPluginView()) {
         if (!m_hasSentResponseToPlugin) {
             m_pluginView->didReceiveResponse(loader->response());
 …
+{
     RefPtr<DocumentLoader> loader = DocumentLoader::create(request, substituteData);
     if (substituteData.isValid()) {
+    if (!deferMainResourceDataLoad || substituteData.isValid()) {
         loader->setDeferMainResourceDataLoad(false);
         // Use the default timeout interval for JS as the HTML tokenizer delay. This ensures
 …
         double delay = JSDOMWindowBase::commonJSGlobalData()->timeoutChecker.timeoutInterval() / 1000.0f;
         m_frame->page()->setCustomHTMLTokenizerTimeDelay(delay);
     } else {
+    } else
         m_frame->page()->setCustomHTMLTokenizerTimeDelay(-1);
+    }
     return loader.release();
+}
 …
 void FrameLoaderClientQt::download(WebCore::ResourceHandle* handle, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&)
+{
-#if QT_VERSION >= 0x040400
     if (!m_webFrame)
         return;
 …
         QWebPage *page = m_webFrame->page();
         if (page->forwardUnsupportedContent())
             emit m_webFrame->page()->unsupportedContent(reply);
+            emit page->unsupportedContent(reply);
         else
             reply->abort();
+    }
-#endif
+}
 …
+{
     // we need to call directly here
+    if (canShowMIMEType(MIMEType))
+    const ResourceResponse& response = m_frame->loader()->activeDocumentLoader()->response();
+    if (WebCore::contentDispositionType(response.httpHeaderField("Content-Disposition")) == WebCore::ContentDispositionAttachment)
+        callPolicyFunction(function, PolicyDownload);
+    else if (canShowMIMEType(MIMEType))
         callPolicyFunction(function, PolicyUse);
     else
 …
+{
     Q_ASSERT(m_webFrame);
-#if QT_VERSION < 0x040400
-    QWebNetworkRequest r(request);
-#else
     QNetworkRequest r(request.toNetworkRequest(m_webFrame));
-#endif
     QWebPage* page = m_webFrame->page();
 …
+{
     Q_ASSERT(m_webFrame);
-#if QT_VERSION < 0x040400
-    QWebNetworkRequest r(request);
-#else
     QNetworkRequest r(request.toNetworkRequest(m_webFrame));
-#endif
     QWebPage*page = m_webFrame->page();
 …
 void FrameLoaderClientQt::startDownload(const WebCore::ResourceRequest& request)
+{
-#if QT_VERSION >= 0x040400
     if (!m_webFrame)
         return;
     emit m_webFrame->page()->downloadRequested(request.toNetworkRequest(m_webFrame));
-#endif
+}
 …
     QWebFrameData frameData(m_frame->page(), m_frame, ownerElement, name);
+    frameData.url = url;
+    if (url.isEmpty())
+        frameData.url = blankURL();
+    else
+        frameData.url = url;
     frameData.referrer = referrer;
     frameData.allowsScrolling = allowsScrolling;
 …
     return frameData.frame.release();
+}
+void FrameLoaderClientQt::didTransferChildFrameToNewDocument()
+{
+    ASSERT(m_frame->ownerElement());
+    if (!m_webFrame)
+        return;
+    Frame* parentFrame = m_webFrame->d->frame->tree()->parent();
+    ASSERT(parentFrame);
+    if (QWebFrame* parent = QWebFramePrivate::kit(parentFrame)) {
+        m_webFrame->d->setPage(parent->page());
+        if (m_webFrame->parent() != qobject_cast<QObject*>(parent))
+            m_webFrame->setParent(parent);
+    }
+}
 …
+{
 public:
+    QtPluginWidget(QWidget* w = 0)
+        : Widget(w)
+        , m_visible(false)
+    {}
+    QtPluginWidget(QWidget* w = 0): Widget(w) {}
     ~QtPluginWidget()
+    {
 …
         handleVisibility();
+    }
+    virtual void hide()
+    {
+        m_visible = false;
+        Widget::hide();
+        platformWidget()->update();
+    }
     virtual void show()
+    {
+        m_visible = true;
+        if (!platformWidget())
+            return;
+        handleVisibility();
+        Widget::show();
+        handleVisibility();
+    }
 …
     void handleVisibility()
+    {
         if (!m_visible)
+        if (!isVisible())
             return;
 …
         platformWidget()->setVisible(!mask.isEmpty());
+    }
-    bool m_visible;
 };
 …
+    }
-#if QT_VERSION >= 0x040400
         if (!object) {
             QWebPluginFactory* factory = m_webFrame->page()->pluginFactory();
 …
                 object = factory->create(mimeType, qurl, params, values);
+        }
-#endif
         if (object) {
 …
             delete object;
     } else { // NPAPI Plugins
+        Vector<String> params = paramNames;
+        Vector<String> values = paramValues;
+        if (mimeType == "application/x-shockwave-flash") {
+            QWebPageClient* client = m_webFrame->page()->d->client;
+            const bool isQWebView = client && qobject_cast<QWidget*>(client->pluginParent());
+#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
+            size_t wmodeIndex = params.find("wmode");
+            if (wmodeIndex == -1) {
+                // Disable XEmbed mode and force it to opaque mode
+                params.append("wmode");
+                values.append("opaque");
+            } else if (!isQWebView) {
+                // Disable transparency if client is not a QWebView
+                values[wmodeIndex] = "opaque";
+            }
+#else
+            if (!isQWebView) {
+                // inject wmode=opaque when there is no client or the client is not a QWebView
+                size_t wmodeIndex = params.find("wmode");
+                if (wmodeIndex == -1) {
+                    params.append("wmode");
+                    values.append("opaque");
+                } else
+                    values[wmodeIndex] = "opaque";
+            }
+#endif
+        }
         RefPtr<PluginView> pluginView = PluginView::create(m_frame, pluginSize, element, url,
             paramNames, paramValues, mimeType, loadManually);
+            params, values, mimeType, loadManually);
         return pluginView;
+    }

trunk/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h

-              r561
+              r846
         virtual void dispatchWillPerformClientRedirect(const KURL&, double interval, double fireDate);
         virtual void dispatchDidChangeLocationWithinPage();
+        virtual void dispatchDidPushStateWithinPage();
+        virtual void dispatchDidReplaceStateWithinPage();
+        virtual void dispatchDidPopStateWithinPage();
         virtual void dispatchWillClose();
         virtual void dispatchDidReceiveIcon();
 …
         virtual void updateGlobalHistoryRedirectLinks();
         virtual bool shouldGoToHistoryItem(HistoryItem*) const;
+        virtual void dispatchDidAddBackForwardItem(HistoryItem*) const;
+        virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const;
+        virtual void dispatchDidChangeBackForwardIndex() const;
         virtual void didDisplayInsecureContent();
         virtual void didRunInsecureContent(SecurityOrigin*);
 …
         virtual PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
                                    const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) ;
+        virtual void didTransferChildFrameToNewDocument();
         virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool);
         virtual void redirectDataToPlugin(Widget* pluginWidget);
 …
         virtual String overrideMediaType() const;
         virtual void windowObjectCleared();
+        virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*);
         virtual void documentElementAvailable();
         virtual void didPerformFirstNavigation() const;
 …
         QString chooseFile(const QString& oldFile);
+        static bool deferMainResourceDataLoad;
     private:

trunk/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp

-              r561
+              r846
 static const QLatin1String settingStorageTypeSuffix(".type");
 static InspectorController::Setting variantToSetting(const QVariant& qvariant);
 static QVariant settingToVariant(const InspectorController::Setting& icSetting);
+static String variantToSetting(const QVariant& qvariant);
+static QVariant settingToVariant(const String& value);
 class InspectorClientWebPage : public QWebPage {
 …
 public:
     InspectorClientWebPage(QObject* parent = 0)
     : QWebPage(parent)
+        : QWebPage(parent)
+    {
-        settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, false);
+    }
 …
+}
+Page* InspectorClientQt::createPage()
+void InspectorClientQt::openInspectorFrontend(WebCore::InspectorController*)
+{
     QWebView* inspectorView = new QWebView;
     InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView);
     inspectorView->setPage(inspectorPage);
+    m_inspectorView.set(inspectorView);
+    inspectorPage->mainFrame()->load(QString::fromLatin1("qrc:/webkit/inspector/inspector.html"));
+    QWebInspector* inspector = m_inspectedWebPage->d->getOrCreateInspector();
+    // This is a known hook that allows changing the default URL for the
+    // Web inspector. This is used for SDK purposes. Please keep this hook
+    // around and don't remove it.
+    // https://bugs.webkit.org/show_bug.cgi?id=35340
+    QUrl inspectorUrl;
+#ifndef QT_NO_PROPERTIES
+    inspectorUrl = inspector->property("_q_inspectorUrl").toUrl();
+#endif
+    if (!inspectorUrl.isValid())
+        inspectorUrl = QUrl("qrc:/webkit/inspector/inspector.html");
+    inspectorView->page()->mainFrame()->load(inspectorUrl);
     m_inspectedWebPage->d->inspectorFrontend = inspectorView;
+    m_inspectedWebPage->d->getOrCreateInspector()->d->setFrontend(inspectorView);
+    return m_inspectorView->page()->d->page;
+}
+String InspectorClientQt::localizedStringsURL()
+{
+    notImplemented();
+    return String();
+}
+String InspectorClientQt::hiddenPanels()
+{
+    notImplemented();
+    return String();
+}
+void InspectorClientQt::showWindow()
+{
+    updateWindowTitle();
+    m_inspectedWebPage->d->inspectorController()->setWindowVisible(true, true);
+    // We don't allow the inspector to ask for widget visibility itself because showWindow is
+    // not always called when we want.
+    // Inspecting an element or calling QWebInspector::show() should already have made the
+    // widget visible.
+}
+void InspectorClientQt::closeWindow()
+{
+    if (m_inspectedWebPage->d->inspector)
+        m_inspectedWebPage->d->inspector->close();
+}
+void InspectorClientQt::attachWindow()
+{
+    notImplemented();
+}
+void InspectorClientQt::detachWindow()
+{
+    notImplemented();
+}
+void InspectorClientQt::setAttachedWindowHeight(unsigned)
+{
+    notImplemented();
+    inspector->d->setFrontend(inspectorView);
+    inspectorView->page()->d->page->inspectorController()->setInspectorFrontendClient(new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView));
+}
 …
+}
+void InspectorClientQt::inspectedURLChanged(const String& newURL)
+{
+    m_inspectedURL = newURL;
+    updateWindowTitle();
+}
+void InspectorClientQt::inspectorWindowObjectCleared()
+{
+    notImplemented();
+}
+void InspectorClientQt::updateWindowTitle()
+{
+    if (m_inspectedWebPage->d->inspector) {
+        QString caption = QCoreApplication::translate("QWebPage", "Web Inspector - %2").arg(m_inspectedURL);
+        m_inspectedWebPage->d->inspector->setWindowTitle(caption);
+    }
+}
+void InspectorClientQt::populateSetting(const String& key, InspectorController::Setting& setting)
+{
+void InspectorClientQt::populateSetting(const String& key, String* setting)
+{
+#ifdef QT_NO_SETTINGS
+    Q_UNUSED(key)
+    Q_UNUSED(setting)
+    qWarning("QWebInspector: QSettings is not supported by Qt.");
+#else
     QSettings qsettings;
     if (qsettings.status() == QSettings::AccessError) {
 …
+    }
     QString settingKey(settingStoragePrefix + key);
+    QString settingKey(settingStoragePrefix + QString(key));
     QString storedValueType = qsettings.value(settingKey + settingStorageTypeSuffix).toString();
     QVariant storedValue = qsettings.value(settingKey);
     storedValue.convert(QVariant::nameToType(storedValueType.toAscii().data()));
+    setting = variantToSetting(storedValue);
+}
+void InspectorClientQt::storeSetting(const String& key, const InspectorController::Setting& setting)
+{
+    *setting = variantToSetting(storedValue);
+#endif // QT_NO_SETTINGS
+}
+void InspectorClientQt::storeSetting(const String& key, const String& setting)
+{
+#ifdef QT_NO_SETTINGS
+    Q_UNUSED(key)
+    Q_UNUSED(setting)
+    qWarning("QWebInspector: QSettings is not supported by Qt.");
+#else
     QSettings qsettings;
     if (qsettings.status() == QSettings::AccessError) {
 …
     QVariant valueToStore = settingToVariant(setting);
     QString settingKey(settingStoragePrefix + key);
+    QString settingKey(settingStoragePrefix + QString(key));
     qsettings.setValue(settingKey, valueToStore);
     qsettings.setValue(settingKey + settingStorageTypeSuffix, QVariant::typeToName(valueToStore.type()));
+}
+void InspectorClientQt::removeSetting(const String&)
+{
+    notImplemented();
+}
+static InspectorController::Setting variantToSetting(const QVariant& qvariant)
+{
+    InspectorController::Setting retVal;
+#endif // QT_NO_SETTINGS
+}
+static String variantToSetting(const QVariant& qvariant)
+{
+    String retVal;
     switch (qvariant.type()) {
     case QVariant::Bool:
+        retVal.set(qvariant.toBool());
+        retVal = qvariant.toBool() ? "true" : "false";
+    case QVariant::String:
+        retVal = qvariant.toString();
+    default:
         break;
-    case QVariant::Double:
-        retVal.set(qvariant.toDouble());
-        break;
-    case QVariant::Int:
-        retVal.set((long)qvariant.toInt());
-        break;
-    case QVariant::String:
-        retVal.set(qvariant.toString());
-        break;
-    case QVariant::StringList: {
-        QStringList qsList = qvariant.toStringList();
-        int listCount = qsList.count();
-        Vector<String> vector(listCount);
-        for (int i = 0; i < listCount; ++i)
-            vector[i] = qsList[i];
-        retVal.set(vector);
-        break;
+    }
+    }
 …
+}
 static QVariant settingToVariant(const InspectorController::Setting& icSetting)
+static QVariant settingToVariant(const String& setting)
+{
     QVariant retVal;
+    switch (icSetting.type()) {
+    case InspectorController::Setting::StringType:
+        retVal.setValue(static_cast<QString>(icSetting.string()));
+        break;
+    case InspectorController::Setting::StringVectorType: {
+        const Vector<String>& vector = icSetting.stringVector();
+        Vector<String>::const_iterator iter;
+        QStringList qsList;
+        for (iter = vector.begin(); iter != vector.end(); ++iter)
+            qsList << *iter;
+        retVal.setValue(qsList);
+        break;
+    }
+    case InspectorController::Setting::DoubleType:
+        retVal.setValue(icSetting.doubleValue());
+        break;
+    case InspectorController::Setting::IntegerType:
+        retVal.setValue((int)icSetting.integerValue());
+        break;
+    case InspectorController::Setting::BooleanType:
+        retVal.setValue(icSetting.booleanValue());
+        break;
+    }
+    retVal.setValue(static_cast<QString>(setting));
     return retVal;
+}
+InspectorFrontendClientQt::InspectorFrontendClientQt(QWebPage* inspectedWebPage, PassOwnPtr<QWebView> inspectorView)
+    : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page)
+    , m_inspectedWebPage(inspectedWebPage)
+    , m_inspectorView(inspectorView)
+    , m_destroyingInspectorView(false)
+{
+}
+void InspectorFrontendClientQt::frontendLoaded()
+{
+    InspectorFrontendClientLocal::frontendLoaded();
+    setAttachedWindow(true);
+}
+String InspectorFrontendClientQt::localizedStringsURL()
+{
+    notImplemented();
+    return String();
+}
+String InspectorFrontendClientQt::hiddenPanels()
+{
+    notImplemented();
+    return String();
+}
+void InspectorFrontendClientQt::bringToFront()
+{
+    updateWindowTitle();
+}
+void InspectorFrontendClientQt::closeWindow()
+{
+    if (m_destroyingInspectorView)
+        return;
+    m_destroyingInspectorView = true;
+    // Clear reference from QWebInspector to the frontend view.
+    m_inspectedWebPage->d->getOrCreateInspector()->d->setFrontend(0);
+#if ENABLE(INSPECTOR)
+    m_inspectedWebPage->d->inspectorController()->disconnectFrontend();
+#endif
+    // Clear pointer before deleting WebView to avoid recursive calls to its destructor.
+    delete m_inspectorView.release();
+}
+void InspectorFrontendClientQt::attachWindow()
+{
+    notImplemented();
+}
+void InspectorFrontendClientQt::detachWindow()
+{
+    notImplemented();
+}
+void InspectorFrontendClientQt::setAttachedWindowHeight(unsigned)
+{
+    notImplemented();
+}
+void InspectorFrontendClientQt::inspectedURLChanged(const String& newURL)
+{
+    m_inspectedURL = newURL;
+    updateWindowTitle();
+}
+void InspectorFrontendClientQt::updateWindowTitle()
+{
+    if (m_inspectedWebPage->d->inspector) {
+        QString caption = QCoreApplication::translate("QWebPage", "Web Inspector - %2").arg(m_inspectedURL);
+        m_inspectedWebPage->d->inspector->setWindowTitle(caption);
+    }
+}
+}

trunk/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.h

-              r561
+              r846
 #include "InspectorClient.h"
+#include "InspectorFrontendClientLocal.h"
 #include "OwnPtr.h"
+#include "PassOwnPtr.h"
 #include <QtCore/QString>
 …
 namespace WebCore {
     class Node;
     class Page;
     class String;
+class Node;
+class Page;
+class String;
     class InspectorClientQt : public InspectorClient {
     public:
         InspectorClientQt(QWebPage*);
+class InspectorClientQt : public InspectorClient {
+public:
+    InspectorClientQt(QWebPage*);
         virtual void inspectorDestroyed();
+    virtual void inspectorDestroyed();
         virtual Page* createPage();
+    virtual void openInspectorFrontend(WebCore::InspectorController*);
+        virtual String localizedStringsURL();
+    virtual void highlight(Node*);
+    virtual void hideHighlight();
+        virtual String hiddenPanels();
+    virtual void populateSetting(const String& key, String* value);
+    virtual void storeSetting(const String& key, const String& value);
+        virtual void showWindow();
+        virtual void closeWindow();
+private:
+    QWebPage* m_inspectedWebPage;
+};
+        virtual void attachWindow();
+        virtual void detachWindow();
+class InspectorFrontendClientQt : public InspectorFrontendClientLocal {
+public:
+    InspectorFrontendClientQt(QWebPage* inspectedWebPage, PassOwnPtr<QWebView> inspectorView);
         virtual void setAttachedWindowHeight(unsigned height);
+    virtual void frontendLoaded();
+        virtual void highlight(Node*);
+        virtual void hideHighlight();
+        virtual void inspectedURLChanged(const String& newURL);
+    virtual String localizedStringsURL();
+        virtual void populateSetting(const String& key, InspectorController::Setting&);
+        virtual void storeSetting(const String& key, const InspectorController::Setting&);
+        virtual void removeSetting(const String& key);
+    virtual String hiddenPanels();
+        virtual void inspectorWindowObjectCleared();
+    virtual void bringToFront();
+    virtual void closeWindow();
+    private:
+        void updateWindowTitle();
+        QWebPage* m_inspectedWebPage;
+        OwnPtr<QWebView> m_inspectorView;
+        QString m_inspectedURL;
+    };
+    virtual void attachWindow();
+    virtual void detachWindow();
+    virtual void setAttachedWindowHeight(unsigned height);
+    virtual void inspectedURLChanged(const String& newURL);
+private:
+    void updateWindowTitle();
+    QWebPage* m_inspectedWebPage;
+    OwnPtr<QWebView> m_inspectorView;
+    QString m_inspectedURL;
+    bool m_destroyingInspectorView;
+};
+}

trunk/src/3rdparty/webkit/WebKit/qt/docs/docs.pri

r561	r846
4	4	QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/bin/qdoc3
5	5	} else {
6		QDOC = $$(QTDIR)\~~bin~~\qdoc3.exe
	6	QDOC = $$(QTDIR)\\bin\\qdoc3.exe
7	7	}
8	8

trunk/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc

-              r561
+              r846
 /*!
     \module QtWebKit
     \title QtWebKit Module
+    \title WebKit in Qt
     \contentspage All Qt Modules
     \previouspage QtSvg
     \nextpage QtXml
     \ingroup modules
+    \ingroup technology-apis
     \brief The QtWebKit module provides a web browser engine as well as
     classes to render and interact with web content.
+    QtWebKit provides a Web browser engine that makes it easy to embed content
+    from the World Wide Web into your Qt application. At the same time Web
+    content can be enhanced with native controls.
+    QtWebKit provides facilities for rendering of HyperText Markup Language
+    (HTML), Extensible HyperText Markup Language (XHTML) and Scalable Vector
+    Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and
+    scripted with JavaScript.
+    A bridge between the JavaScript execution environment and the Qt object
+    model makes it possible for custom QObjects to be scripted. For detailed
+    documentation see \l{The QtWebkit Bridge}.
+    Integration with the Qt networking module enables Web pages to be transparently loaded
+    from Web servers, the local file system or even the Qt resource system.
+    In addition to providing pure rendering features, HTML documents can be
+    made fully editable to the user through the use of the \c{contenteditable}
+    attribute on HTML elements.
+    QtWebKit is based on the Open Source WebKit engine. More information about
+    WebKit itself can be found on the \l{WebKit Open Source Project} Web site.
+    \section1 Including In Your Project
     To include the definitions of the module's classes, use the
 …
     \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 0
+    \section1 License Information
+    This is a snapshot of the Qt port of WebKit. The exact version information
+    can be found in the \c{src/3rdparty/webkit/VERSION} file supplied with Qt.
+    Qt Commercial Edition licensees that wish to distribute applications that
+    use the QtWebKit module need to be aware of their obligations under the
+    GNU Library General Public License (LGPL).
+    Developers using the Open Source Edition can choose to redistribute
+    the module under the appropriate version of the GNU LGPL.
+    \legalese
+    WebKit is licensed under the GNU Library General Public License.
+    Individual contributor names and copyright dates can be found
+    inline in the code.
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+    \endlegalese
+*/
+/*!
+    \page webintegration.html
+    \title Integrating Web Content with QtWebKit
+    \since 4.4
+    \ingroup frameworks-technologies
+    \keyword Browser
+    \keyword Web Browser
+    QtWebKit provides a Web browser engine that makes it easy to embed content
+    from the World Wide Web into your Qt application. At the same time Web
+    content can be enhanced with native controls.
+    QtWebKit provides facilities for rendering of HyperText Markup Language
+    (HTML), Extensible HyperText Markup Language (XHTML) and Scalable Vector
+    Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and
+    scripted with JavaScript.
+    A bridge between the JavaScript execution environment and the Qt object
+    model makes it possible for custom QObjects to be scripted. Integration
+    with the Qt networking module enables Web pages to be transparently loaded
+    from Web servers, the local file system or even the Qt resource system.
+    In addition to providing pure rendering features, HTML documents can be
+    made fully editable to the user through the use of the \c{contenteditable}
+    attribute on HTML elements.
+    QtWebKit is based on the Open Source WebKit engine. More information about
+    WebKit itself can be found on the \l{WebKit Open Source Project} Web site.
+    The QtWebKit module is part of the \l{Qt Full Framework Edition}, and the
+    \l{Open Source Versions of Qt}.
+    \section1 Notes
     \note Building the QtWebKit module with debugging symbols is problematic
 …
     Embedded Linux systems. See the \l{Qt for Embedded Linux Requirements}
     document for more information.
-    Topics:
-    \tableofcontents
     \section1 Architecture
 …
     \endlist
     \endtable
+    \section1 License Information
+    This is a snapshot of the Qt port of WebKit. The exact version information
+    can be found in the \c{src/3rdparty/webkit/VERSION} file supplied with Qt.
+    Qt Commercial Edition licensees that wish to distribute applications that
+    use the QtWebKit module need to be aware of their obligations under the
+    GNU Library General Public License (LGPL).
+    Developers using the Open Source Edition can choose to redistribute
+    the module under the appropriate version of the GNU LGPL.
+    \legalese
+    WebKit is licensed under the GNU Library General Public License.
+    Individual contributor names and copyright dates can be found
+    inline in the code.
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+    \endlegalese
 */

trunk/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf

-              r561
+              r846
 description = "Qt WebKit API Documentation"
 headerdirs = $SRCDIR/WebKit/qt/Api
 sourcedirs = $SRCDIR/WebKit/qt/Api $SRCDIR/WebKit/qt/docs
+headerdirs = $SRCDIR/WebKit/qt/Api $SRCDIR/WebKit/qt/declarative
+sourcedirs = $SRCDIR/WebKit/qt/Api $SRCDIR/WebKit/qt/docs $SRCDIR/JavaScriptCore/qt/api $SRCDIR/WebKit/qt/declarative
 outputdir = $OUTPUT_DIR/doc/html
 outputformats = HTML

trunk/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp

r561	r846
10	10	QWebInspector *inspector = new QWebInspector;
11	11	inspector->setPage(page);
12
13		~~connect(page, SIGNAL(webInspectorTriggered(QWebElement)), inspector, SLOT(show()));~~
14	12	//! [0]
15	13

trunk/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webelement/main.cpp

-              r561
+              r846
+}
+static void findButtonAndClick()
+{
+    frame->setHtml("<form name=\"myform\" action=\"submit_form.asp\" method=\"get\">"
+                   "<input type=\"text\" name=\"myfield\">"
+                   "<input type=\"submit\" value=\"Submit\">"
+                   "</form>");
+//! [Calling a DOM element method]
+    QWebElement document = frame->documentElement();
+    /* Assume that the document has the following structure:
+        <form name="myform" action="submit_form.asp" method="get">
+            <input type="text" name="myfield">
+            <input type="submit" value="Submit">
+        </form>
+     */
+    QWebElement button = document.findFirst("input[type=submit]");
+    button.evaluateJavaScript("click()");
+//! [Calling a DOM element method]
+ }
+static void autocomplete1()
+{
+    QWebElement document = frame->documentElement();
+//! [autocomplete1]
+    QWebElement firstTextInput = document.findFirst("input[type=text]");
+    QString storedText = firstTextInput.attribute("value");
+//! [autocomplete1]
+}
+static void autocomplete2()
+{
+    QWebElement document = frame->documentElement();
+    QString storedText = "text";
+//! [autocomplete2]
+    QWebElement firstTextInput = document.findFirst("input[type=text]");
+    textInput.setAttribute("value", storedText);
+//! [autocomplete2]
+}
 static void findAll()
+{
 …
 //! [FindAll intro]
     QList<QWebElement> allSpans = document.findAll("span");
     QList<QWebElement> introSpans = document.findAll("p.intro span");
+    QWebElementCollection allSpans = document.findAll("span");
+    QWebElementCollection introSpans = document.findAll("p.intro span");
 //! [FindAll intro] //! [FindAll]
+}
 …
     traverse();
     findAll();
+    findButtonAndClick();
+    autocomplete1();
+    autocomplete2();
     return 0;
+}

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

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

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

-              r769
+              r846
         _Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameiiRK6QPoint @ 696 NONAME
         _ZN9QWebFrame17scrollRecursivelyEii @ 697 NONAME ABSENT
         _ZN16QGraphicsWebView20setResizesToContentsEb @ 698 NONAME ABSENT
         _ZNK16QGraphicsWebView17resizesToContentsEv @ 699 NONAME ABSENT
         _Z20qt_drt_numberOfPagesP9QWebFrameff @ 700 NONAME ABSENT
         _Z24qt_drt_pauseSVGAnimationP9QWebFrameRK7QStringdS3_ @ 701 NONAME ABSENT
         _Z24qt_drt_webinspector_showP8QWebPage @ 702 NONAME ABSENT
         _Z24qt_drt_workerThreadCountv @ 703 NONAME ABSENT
         _Z25qt_drt_hasDocumentElementP9QWebFrame @ 704 NONAME ABSENT
         _Z25qt_drt_webinspector_closeP8QWebPage @ 705 NONAME ABSENT
         _Z31qt_drt_pageNumberForElementByIdP9QWebFrameRK7QStringff @ 706 NONAME ABSENT
         _Z33qt_drt_webinspector_executeScriptP8QWebPagelRK7QString @ 707 NONAME ABSENT
         _Z34qt_drt_setTimelineProfilingEnabledP8QWebPageb @ 708 NONAME ABSENT
         _Z32qt_drt_setFrameFlatteningEnabledP8QWebPageb @ 709 NONAME ABSENT
         _Z36qt_drt_evaluateScriptInIsolatedWorldP9QWebFrameiRK7QString @ 710 NONAME ABSENT
         _Z47qt_drt_setDomainRelaxationForbiddenForURLSchemebRK7QString @ 711 NONAME ABSENT
         _ZN9QWebFrame11pageChangedEv @ 712 NONAME ABSENT
         _ZN9QWebFrame14scrollToAnchorERK7QString @ 713 NONAME ABSENT
+        _ZN16QGraphicsWebView20setResizesToContentsEb @ 698 NONAME
+        _ZNK16QGraphicsWebView17resizesToContentsEv @ 699 NONAME
+        _Z20qt_drt_numberOfPagesP9QWebFrameff @ 700 NONAME
+        _Z24qt_drt_pauseSVGAnimationP9QWebFrameRK7QStringdS3_ @ 701 NONAME
+        _Z24qt_drt_webinspector_showP8QWebPage @ 702 NONAME
+        _Z24qt_drt_workerThreadCountv @ 703 NONAME
+        _Z25qt_drt_hasDocumentElementP9QWebFrame @ 704 NONAME
+        _Z25qt_drt_webinspector_closeP8QWebPage @ 705 NONAME
+        _Z31qt_drt_pageNumberForElementByIdP9QWebFrameRK7QStringff @ 706 NONAME
+        _Z33qt_drt_webinspector_executeScriptP8QWebPagelRK7QString @ 707 NONAME
+        _Z34qt_drt_setTimelineProfilingEnabledP8QWebPageb @ 708 NONAME
+        _Z32qt_drt_setFrameFlatteningEnabledP8QWebPageb @ 709 NONAME
+        _Z36qt_drt_evaluateScriptInIsolatedWorldP9QWebFrameiRK7QString @ 710 NONAME
+        _Z47qt_drt_setDomainRelaxationForbiddenForURLSchemebRK7QString @ 711 NONAME
+        _ZN9QWebFrame11pageChangedEv @ 712 NONAME
+        _ZN9QWebFrame14scrollToAnchorERK7QString @ 713 NONAME
         _ZN12QWebSettings15setInspectorUrlERK4QUrl @ 714 NONAME ABSENT
         _ZN13QWebInspector10closeEventEP11QCloseEvent @ 715 NONAME ABSENT
         _ZN16QGraphicsWebView26setTiledBackingStoreFrozenEb @ 716 NONAME ABSENT
         _ZNK16QGraphicsWebView25isTiledBackingStoreFrozenEv @ 717 NONAME ABSENT
+        _ZN13QWebInspector10closeEventEP11QCloseEvent @ 715 NONAME
+        _ZN16QGraphicsWebView26setTiledBackingStoreFrozenEb @ 716 NONAME
+        _ZNK16QGraphicsWebView25isTiledBackingStoreFrozenEv @ 717 NONAME
         _Z18qt_wrt_setViewModeP8QWebPageRK7QString @ 718 NONAME ABSENT
         _Z19qt_drt_setMediaTypeP9QWebFrameRK7QString @ 719 NONAME ABSENT
         _Z26qt_drt_enableCaretBrowsingP8QWebPageb @ 720 NONAME ABSENT
+        _Z19qt_drt_setMediaTypeP9QWebFrameRK7QString @ 719 NONAME
+        _Z26qt_drt_enableCaretBrowsingP8QWebPageb @ 720 NONAME
         _ZNK12QWebSettings12inspectorUrlEv @ 721 NONAME ABSENT
         _ZN23DumpRenderTreeSupportQt19webPageSetGroupNameEP8QWebPageRK7QString @ 722 NONAME ABSENT

trunk/src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro

-              r561
+              r846
+TEMPLATE = app
+TARGET = tst_qgraphicswebview
+include(../../../../WebKit.pri)
+SOURCES  += tst_qgraphicswebview.cpp
+QT += testlib network
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+symbian {
+    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+}
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp

-              r561
+              r846
 */
+#include "../util.h"
 #include <QtTest/QtTest>
+#include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
 #include <qgraphicswebview.h>
 …
 #include <qwebframe.h>
-/**
- * Starts an event loop that runs until the given signal is received.
- * Optionally the event loop
- * can return earlier on a timeout.
+ *
- * \return \p true if the requested signal was received
- *         \p false on timeout
- */
-static bool waitForSignal(QObject* obj, const char* signal, int timeout = 10000)
+{
-    QEventLoop loop;
-    QObject::connect(obj, signal, &loop, SLOT(quit()));
-    QTimer timer;
-    QSignalSpy timeoutSpy(&timer, SIGNAL(timeout()));
-    if (timeout > 0) {
-        QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
-        timer.setSingleShot(true);
-        timer.start(timeout);
+    }
-    loop.exec();
-    return timeoutSpy.isEmpty();
+}
 class tst_QGraphicsWebView : public QObject
+{
 …
     void qgraphicswebview();
     void crashOnViewlessWebPages();
+    void microFocusCoordinates();
+    void focusInputTypes();
+    void crashOnSetScaleBeforeSetUrl();
 };
 …
 };
+class GraphicsWebView : public QGraphicsWebView
+{
+    Q_OBJECT
+public:
+    GraphicsWebView(QGraphicsItem* parent = 0): QGraphicsWebView(parent)
+    {
+    }
+    void fireMouseClick(QPointF point) {
+        QGraphicsSceneMouseEvent presEv(QEvent::GraphicsSceneMousePress);
+        presEv.setPos(point);
+        presEv.setButton(Qt::LeftButton);
+        presEv.setButtons(Qt::LeftButton);
+        QGraphicsSceneMouseEvent relEv(QEvent::GraphicsSceneMouseRelease);
+        relEv.setPos(point);
+        relEv.setButton(Qt::LeftButton);
+        relEv.setButtons(Qt::LeftButton);
+        QGraphicsWebView::sceneEvent(&presEv);
+        QGraphicsWebView::sceneEvent(&relEv);
+    }
+};
 void tst_QGraphicsWebView::crashOnViewlessWebPages()
+{
 …
     webView->setPage(page);
     page->webView = webView;
-    connect(page->mainFrame(), SIGNAL(initialLayoutCompleted()), page, SLOT(aborting()));
     scene.addItem(webView);
 …
     view.resize(600, 480);
     webView->resize(view.geometry().size());
+    QTest::qWait(200);
+    QCoreApplication::processEvents();
     view.show();
+    // Resizing the page will resize and layout the empty "about:blank"
+    // page, so we first connect the signal afterward.
+    connect(page->mainFrame(), SIGNAL(initialLayoutCompleted()), page, SLOT(aborting()));
     page->mainFrame()->setHtml(QString("data:text/html,"
 …
                                             "</frameset>"));
+    QVERIFY(::waitForSignal(page, SIGNAL(loadFinished(bool))));
+}
+    QVERIFY(waitForSignal(page, SIGNAL(loadFinished(bool))));
+    delete page;
+}
+void tst_QGraphicsWebView::crashOnSetScaleBeforeSetUrl()
+{
+    QGraphicsWebView* webView = new QGraphicsWebView;
+    webView->setScale(2.0);
+    delete webView;
+}
+void tst_QGraphicsWebView::microFocusCoordinates()
+{
+    QWebPage* page = new QWebPage;
+    QGraphicsWebView* webView = new QGraphicsWebView;
+    webView->setPage( page );
+    QGraphicsView* view = new QGraphicsView;
+    QGraphicsScene* scene = new QGraphicsScene(view);
+    view->setScene(scene);
+    scene->addItem(webView);
+    view->setGeometry(QRect(0,0,500,500));
+    page->mainFrame()->setHtml("<html><body>" \
+        "<input type='text' id='input1' style='font--family: serif' value='' maxlength='20'/><br>" \
+        "<canvas id='canvas1' width='500' height='500'/>" \
+        "<input type='password'/><br>" \
+        "<canvas id='canvas2' width='500' height='500'/>" \
+        "</body></html>");
+    page->mainFrame()->setFocus();
+    QVariant initialMicroFocus = page->inputMethodQuery(Qt::ImMicroFocus);
+    QVERIFY(initialMicroFocus.isValid());
+    page->mainFrame()->scroll(0,300);
+    QVariant currentMicroFocus = page->inputMethodQuery(Qt::ImMicroFocus);
+    QVERIFY(currentMicroFocus.isValid());
+    QCOMPARE(initialMicroFocus.toRect().translated(QPoint(0,-300)), currentMicroFocus.toRect());
+    delete view;
+}
+void tst_QGraphicsWebView::focusInputTypes()
+{
+    QWebPage* page = new QWebPage;
+    GraphicsWebView* webView = new GraphicsWebView;
+    webView->setPage( page );
+    QGraphicsView* view = new QGraphicsView;
+    QGraphicsScene* scene = new QGraphicsScene(view);
+    view->setScene(scene);
+    scene->addItem(webView);
+    view->setGeometry(QRect(0,0,500,500));
+    QCoreApplication::processEvents();
+    QUrl url("qrc:///resources/input_types.html");
+    page->mainFrame()->load(url);
+    page->mainFrame()->setFocus();
+    QVERIFY(waitForSignal(page, SIGNAL(loadFinished(bool))));
+    // 'text' type
+    webView->fireMouseClick(QPointF(20.0, 10.0));
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
+    QVERIFY(webView->inputMethodHints() & Qt::ImhNoAutoUppercase);
+    QVERIFY(webView->inputMethodHints() & Qt::ImhNoPredictiveText);
+#else
+    QVERIFY(webView->inputMethodHints() == Qt::ImhNone);
+#endif
+    // 'password' field
+    webView->fireMouseClick(QPointF(20.0, 60.0));
+    QVERIFY(webView->inputMethodHints() & Qt::ImhHiddenText);
+    // 'tel' field
+    webView->fireMouseClick(QPointF(20.0, 110.0));
+    QVERIFY(webView->inputMethodHints() & Qt::ImhDialableCharactersOnly);
+    // 'number' field
+    webView->fireMouseClick(QPointF(20.0, 160.0));
+    QVERIFY(webView->inputMethodHints() & Qt::ImhDigitsOnly);
+    // 'email' field
+    webView->fireMouseClick(QPointF(20.0, 210.0));
+    QVERIFY(webView->inputMethodHints() & Qt::ImhEmailCharactersOnly);
+    // 'url' field
+    webView->fireMouseClick(QPointF(20.0, 260.0));
+    QVERIFY(webView->inputMethodHints() & Qt::ImhUrlCharactersOnly);
+    delete webView;
+    delete view;
+}
 QTEST_MAIN(tst_QGraphicsWebView)

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/qwebelement.pro

-              r561
+              r846
+TEMPLATE = app
+TARGET = tst_qwebelement
+include(../../../../WebKit.pri)
+SOURCES  += tst_qwebelement.cpp
+RESOURCES += qwebelement.qrc
+QT += testlib network
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+symbian {
+    TARGET.UID3 = 0xA000E53A
+    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+}
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp

-              r561
+              r846
 #include <QtTest/QtTest>
 #include <qwebpage.h>
 #include <qwidget.h>
 …
 #include <qwebframe.h>
 #include <qwebelement.h>
+#include <util.h>
 //TESTED_CLASS=
 //TESTED_FILES=
-/**
- * Starts an event loop that runs until the given signal is received.
- Optionally the event loop
- * can return earlier on a timeout.
+ *
- * \return \p true if the requested signal was received
- *         \p false on timeout
- */
-static bool waitForSignal(QObject* obj, const char* signal, int timeout = 0)
+{
-    QEventLoop loop;
-    QObject::connect(obj, signal, &loop, SLOT(quit()));
-    QTimer timer;
-    QSignalSpy timeoutSpy(&timer, SIGNAL(timeout()));
-    if (timeout > 0) {
-        QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
-        timer.setSingleShot(true);
-        timer.start(timeout);
+    }
-    loop.exec();
-    return timeoutSpy.isEmpty();
+}
 class tst_QWebElement : public QObject
 …
     // in few seconds, the CSS should be completey loaded
-    QSignalSpy spy(m_page, SIGNAL(loadFinished(bool)));
     m_mainFrame->setHtml(html6);
     QTest::qWait(200);
+    waitForSignal(m_page, SIGNAL(loadFinished(bool)), 200);
     p = m_mainFrame->documentElement().findAll("p").at(0);
 …
     // in few seconds, the style should be completey loaded
     m_mainFrame->setHtml(html7);
     QTest::qWait(200);
+    waitForSignal(m_page, SIGNAL(loadFinished(bool)), 200);
     p = m_mainFrame->documentElement().findAll("p").at(0);

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/qwebframe.pro

-              r561
+              r846
+TEMPLATE = app
+TARGET = tst_qwebframe
+include(../../../../WebKit.pri)
+SOURCES  += tst_qwebframe.cpp
+RESOURCES += qwebframe.qrc
+QT += testlib network
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+!symbian:DEFINES += SRCDIR=\\\"$$PWD/resources\\\"
+symbian {
+    TARGET.UID3 = 0xA000E53D
+    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+}
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

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

-              r769
+              r846
 #include "../util.h"
-#if defined(Q_OS_SYMBIAN)
-# define SRCDIR ""
-#endif
-//TESTED_CLASS=
-//TESTED_FILES=
-// Task 160192
-/**
- * Starts an event loop that runs until the given signal is received.
- Optionally the event loop
- * can return earlier on a timeout.
+ *
- * \return \p true if the requested signal was received
- *         \p false on timeout
- */
-static bool waitForSignal(QObject* obj, const char* signal, int timeout = 0)
+{
-    QEventLoop loop;
-    QObject::connect(obj, signal, &loop, SLOT(quit()));
-    QTimer timer;
-    QSignalSpy timeoutSpy(&timer, SIGNAL(timeout()));
-    if (timeout > 0) {
-        QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
-        timer.setSingleShot(true);
-        timer.start(timeout);
+    }
-    loop.exec();
-    return timeoutSpy.isEmpty();
+}
-/* Mostly a test for the JavaScript related parts of QWebFrame */
 struct CustomType {
     QString string;
 …
     Q_PROPERTY(QVariant variantProperty READ variantProperty WRITE setVariantProperty)
     Q_PROPERTY(QVariantList variantListProperty READ variantListProperty WRITE setVariantListProperty)
+    Q_PROPERTY(QVariantMap variantMapProperty READ variantMapProperty WRITE setVariantMapProperty)
     Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty)
     Q_PROPERTY(QStringList stringListProperty READ stringListProperty WRITE setStringListProperty)
 …
     Q_PROPERTY(QKeySequence shortcut READ shortcut WRITE setShortcut)
     Q_PROPERTY(CustomType propWithCustomType READ propWithCustomType WRITE setPropWithCustomType)
+    Q_PROPERTY(QWebElement webElementProperty READ webElementProperty WRITE setWebElementProperty)
+    Q_PROPERTY(QObject* objectStarProperty READ objectStarProperty WRITE setObjectStarProperty)
     Q_ENUMS(Policy Strategy)
     Q_FLAGS(Ability)
 …
             m_writeOnlyValue(789),
             m_readOnlyValue(987),
+            m_qtFunctionInvoked(-1) { }
+            m_objectStar(0),
+            m_qtFunctionInvoked(-1)
+    {
+        m_variantMapValue.insert("a", QVariant(123));
+        m_variantMapValue.insert("b", QVariant(QLatin1String("foo")));
+        m_variantMapValue.insert("c", QVariant::fromValue<QObject*>(this));
+    }
     ~MyQObject() { }
 …
+    }
+    QVariantMap variantMapProperty() const {
+        return m_variantMapValue;
+    }
+    void setVariantMapProperty(const QVariantMap &value) {
+        m_variantMapValue = value;
+    }
     QString stringProperty() const {
         return m_stringValue;
 …
+    }
+    QWebElement webElementProperty() const {
+        return m_webElement;
+    }
+    void setWebElementProperty(const QWebElement& element) {
+        m_webElement = element;
+    }
     CustomType propWithCustomType() const {
         return m_customType;
 …
         m_customType = c;
+    }
+    QObject* objectStarProperty() const {
+        return m_objectStar;
+    }
+    void setObjectStarProperty(QObject* object) {
+        m_objectStar = object;
+    }
     int qtFunctionInvoked() const {
 …
         m_qtFunctionInvoked = 35;
         m_actuals << arg;
+    }
+    void myOverloadedSlot(const QWebElement &arg) {
+        m_qtFunctionInvoked = 36;
+        m_actuals << QVariant::fromValue<QWebElement>(arg);
+    }
 …
     QVariant m_variantValue;
     QVariantList m_variantListValue;
+    QVariantMap m_variantMapValue;
     QString m_stringValue;
     QStringList m_stringListValue;
 …
     int m_readOnlyValue;
     QKeySequence m_shortcut;
+    QWebElement m_webElement;
     CustomType m_customType;
+    QObject* m_objectStar;
     int m_qtFunctionInvoked;
     QVariantList m_actuals;
 …
     void objectDeleted();
     void typeConversion();
+    void arrayObjectEnumerable();
     void symmetricUrl();
     void progressSignal();
 …
     void ipv6HostEncoding();
     void metaData();
+#if !defined(Q_WS_MAEMO_5)
+    // as maemo 5 does not use QComboBoxes to implement the popups
+    // this test does not make sense for it.
     void popupFocus();
+#endif
+    void inputFieldFocus();
     void hitTestContent();
     void jsByteArray();
 …
     void render();
     void scrollPosition();
+    void scrollToAnchor();
+    void scrollbarsOff();
     void evaluateWillCauseRepaint();
     void qObjectWrapperWithSameIdentity();
+    void introspectQtMethods_data();
+    void introspectQtMethods();
 private:
 …
     QWebPage* m_page;
     MyQObject* m_myObject;
     QWebView* m_popupTestView;
     int m_popupTestPaintCount;
+    QWebView* m_inputFieldsTestView;
+    int m_inputFieldTestPaintCount;
 };
 tst_QWebFrame::tst_QWebFrame()
     : sTrue("true"), sFalse("false"), sUndefined("undefined"), sArray("array"), sFunction("function"), sError("error"),
         sString("string"), sObject("object"), sNumber("number"), m_popupTestView(0), m_popupTestPaintCount(0)
+        sString("string"), sObject("object"), sNumber("number"), m_inputFieldsTestView(0), m_inputFieldTestPaintCount(0)
+{
+}
 …
 bool tst_QWebFrame::eventFilter(QObject* watched, QEvent* event)
+{
     // used on the popupFocus test
     if (watched == m_popupTestView) {
+    // used on the inputFieldFocus test
+    if (watched == m_inputFieldsTestView) {
         if (event->type() == QEvent::Paint)
             m_popupTestPaintCount++;
+            m_inputFieldTestPaintCount++;
+    }
     return QObject::eventFilter(watched, event);
 …
     m_myObject = new MyQObject();
     m_page->mainFrame()->addToJavaScriptWindowObject("myObject", m_myObject);
-    QDir::setCurrent(SRCDIR);
+}
 …
 void tst_QWebFrame::getSetStaticProperty()
+{
+    m_page->mainFrame()->setHtml("<html><head><body></body></html>");
     QCOMPARE(evalJS("typeof myObject.noSuchProperty"), sUndefined);
 …
     QCOMPARE(evalJS("myObject.variantListProperty[0] === 123"), sTrue);
     QCOMPARE(evalJS("myObject.variantListProperty[1] === 'foo'"), sTrue);
+    {
+        QString type;
+        QVariant ret = evalJSV("myObject.variantMapProperty", type);
+        QCOMPARE(type, sObject);
+        QCOMPARE(ret.type(), QVariant::Map);
+        QVariantMap vm = ret.value<QVariantMap>();
+        QCOMPARE(vm.size(), 3);
+        QCOMPARE(vm.value("a").toInt(), 123);
+        QCOMPARE(vm.value("b").toString(), QLatin1String("foo"));
+        QCOMPARE(vm.value("c").value<QObject*>(), static_cast<QObject*>(m_myObject));
+    }
+    QCOMPARE(evalJS("myObject.variantMapProperty.a === 123"), sTrue);
+    QCOMPARE(evalJS("myObject.variantMapProperty.b === 'foo'"), sTrue);
+    QCOMPARE(evalJS("myObject.variantMapProperty.c.variantMapProperty.b === 'foo'"), sTrue);
+    {
 …
     QCOMPARE(evalJS("typeof myObject.stringListProperty[2]"), sString);
     QCOMPARE(evalJS("myObject.stringListProperty[2]"), QLatin1String("true"));
+    evalJS("myObject.webElementProperty=document.body;");
+    QCOMPARE(evalJS("myObject.webElementProperty.tagName"), QLatin1String("BODY"));
     // try to delete
 …
                     "myObject.readOnlyProperty == 987"), sTrue);
     QCOMPARE(m_myObject->readOnlyProperty(), 987);
+    // QObject* property
+    m_myObject->setObjectStarProperty(0);
+    QCOMPARE(m_myObject->objectStarProperty(), (QObject*)0);
+    QCOMPARE(evalJS("myObject.objectStarProperty == null"), sTrue);
+    QCOMPARE(evalJS("typeof myObject.objectStarProperty"), sObject);
+    QCOMPARE(evalJS("Boolean(myObject.objectStarProperty)"), sFalse);
+    QCOMPARE(evalJS("String(myObject.objectStarProperty) == 'null'"), sTrue);
+    QCOMPARE(evalJS("myObject.objectStarProperty.objectStarProperty"),
+        sUndefined);
+    m_myObject->setObjectStarProperty(this);
+    QCOMPARE(evalJS("myObject.objectStarProperty != null"), sTrue);
+    QCOMPARE(evalJS("typeof myObject.objectStarProperty"), sObject);
+    QCOMPARE(evalJS("Boolean(myObject.objectStarProperty)"), sTrue);
+    QCOMPARE(evalJS("String(myObject.objectStarProperty) != 'null'"), sTrue);
+}
 …
     QCOMPARE(m_myObject->qtFunctionInvoked(), 35);
     */
+    // should pick myOverloadedSlot(QRegExp)
+    m_myObject->resetQtFunctionInvoked();
+    evalJS("myObject.myOverloadedSlot(document.body)");
+    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=37319", Continue);
+    QCOMPARE(m_myObject->qtFunctionInvoked(), 36);
     // should pick myOverloadedSlot(QObject*)
     m_myObject->resetQtFunctionInvoked();
 …
+}
+class StringListTestObject : public QObject {
+    Q_OBJECT
+public Q_SLOTS:
+    QVariant stringList()
+    {
+        return QStringList() << "Q" << "t";
+    };
+};
+void tst_QWebFrame::arrayObjectEnumerable()
+{
+    QWebPage page;
+    QWebFrame* frame = page.mainFrame();
+    QObject* qobject = new StringListTestObject();
+    frame->addToJavaScriptWindowObject("test", qobject, QScriptEngine::ScriptOwnership);
+    const QString script("var stringArray = test.stringList();"
+                         "var result = '';"
+                         "for (var i in stringArray) {"
+                         "    result += stringArray[i];"
+                         "}"
+                         "result;");
+    QCOMPARE(frame->evaluateJavaScript(script).toString(), QString::fromLatin1("Qt"));
+}
 void tst_QWebFrame::symmetricUrl()
+{
 …
+    {
         QString url = request.url().toString();
         if (op == QNetworkAccessManager::GetOperation)
+        if (op == QNetworkAccessManager::GetOperation) {
             if (url == "qrc:/test1.html" ||  url == "http://abcdef.abcdef/")
                 return new FakeReply(request, this);
 …
+            }
 #endif
+       }
         return QNetworkAccessManager::createRequest(op, request, outgoingData);
 …
     frame->setUrl(QUrl("qrc:/test1.html"));
     QTest::qWait(200);
+    waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
     QCOMPARE(spy.count(), 1);
     QCOMPARE(frame->requestedUrl(), QUrl("qrc:/test1.html"));
 …
     frame->setUrl(QUrl("qrc:/non-existent.html"));
     QTest::qWait(200);
+    waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
     QCOMPARE(spy.count(), 2);
     QCOMPARE(frame->requestedUrl(), QUrl("qrc:/non-existent.html"));
 …
     frame->setUrl(QUrl("http://abcdef.abcdef"));
     QTest::qWait(200);
+    waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
     QCOMPARE(spy.count(), 3);
     QCOMPARE(frame->requestedUrl(), QUrl("http://abcdef.abcdef/"));
 …
     QSignalSpy spy2(page.networkAccessManager(), SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)));
     frame->setUrl(QUrl("qrc:/fake-ssl-error.html"));
     QTest::qWait(200);
+    waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
     QCOMPARE(spy2.count(), 1);
     QCOMPARE(frame->requestedUrl(), QUrl("qrc:/fake-ssl-error.html"));
 …
     QSignalSpy spy(&page, SIGNAL(loadFinished(bool)));
     frame->setHtml(html);
     QTest::qWait(200);
+    waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
     QCOMPARE(spy.count(), 1);
 …
     // in few seconds, the CSS should be completey loaded
     frame->setHtml(html2);
     QTest::qWait(200);
+    waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
     QCOMPARE(spy.size(), 2);
 …
 void tst_QWebFrame::setHtmlWithBaseURL()
+{
+    if (!QDir(TESTS_SOURCE_DIR).exists())
+        QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
+    QDir::setCurrent(TESTS_SOURCE_DIR);
     QString html("<html><body><p>hello world</p><img src='resources/image2.png'/></body></html>");
 …
     QSignalSpy spy(&page, SIGNAL(loadFinished(bool)));
     frame->setHtml(html, QUrl::fromLocalFile(QDir::currentPath()));
     QTest::qWait(200);
+    frame->setHtml(html, QUrl::fromLocalFile(TESTS_SOURCE_DIR));
+    waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
     QCOMPARE(spy.count(), 1);
 …
+}
+#if !defined(Q_WS_MAEMO_5)
 void tst_QWebFrame::popupFocus()
+{
 …
     // open the popup by clicking. check if focus is on the popup
     QTest::mouseClick(&view, Qt::LeftButton, 0, QPoint(25, 25));
     QObject* webpopup = firstChildByClassName(&view, "WebCore::QWebPopup");
+    QObject* webpopup = firstChildByClassName(&view, "QComboBox");
     QComboBox* combo = qobject_cast<QComboBox*>(webpopup);
+    QVERIFY(combo != 0);
     QTRY_VERIFY(!view.hasFocus() && combo->view()->hasFocus()); // Focus should be on the popup
 …
     combo->hidePopup();
     QTRY_VERIFY(view.hasFocus() && !combo->view()->hasFocus()); // Focus should be back on the WebView
+    // triple the flashing time, should at least blink twice already
+    int delay = qApp->cursorFlashTime() * 3;
+}
+#endif
+void tst_QWebFrame::inputFieldFocus()
+{
+    QWebView view;
+    view.setHtml("<html><body><input type=\"text\"></input></body></html>");
+    view.resize(400, 100);
+    view.show();
+    view.setFocus();
+    QTRY_VERIFY(view.hasFocus());
+    // double the flashing time, should at least blink once already
+    int delay = qApp->cursorFlashTime() * 2;
     // focus the lineedit and check if it blinks
     QTest::mouseClick(&view, Qt::LeftButton, 0, QPoint(200, 25));
     m_popupTestView = &view;
+    QTest::mouseClick(&view, Qt::LeftButton, 0, QPoint(25, 25));
+    m_inputFieldsTestView = &view;
     view.installEventFilter( this );
     QTest::qWait(delay);
     QVERIFY2(m_popupTestPaintCount >= 4,
+    QVERIFY2(m_inputFieldTestPaintCount >= 3,
              "The input field should have a blinking caret");
+}
 …
     m_page->mainFrame()->setHtml(html);
     QTest::qWait(200);
+    waitForSignal(m_page->mainFrame(), SIGNAL(loadFinished(bool)), 200);
     QCOMPARE(loadSpy.size(), 1);
 …
     frame->setHtml(innerHtml);
     QTest::qWait(200);
+    waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
     QCOMPARE(loadSpy.size(), 2);
 …
+}
+void tst_QWebFrame::scrollToAnchor()
+{
+    QWebPage page;
+    page.setViewportSize(QSize(480, 800));
+    QWebFrame* frame = page.mainFrame();
+    QString html("<html><body><p style=\"margin-bottom: 1500px;\">Hello.</p>"
+                 "<p><a id=\"foo\">This</a> is an anchor</p>"
+                 "<p style=\"margin-bottom: 1500px;\"><a id=\"bar\">This</a> is another anchor</p>"
+                 "</body></html>");
+    frame->setHtml(html);
+    frame->setScrollPosition(QPoint(0, 0));
+    QCOMPARE(frame->scrollPosition().x(), 0);
+    QCOMPARE(frame->scrollPosition().y(), 0);
+    QWebElement fooAnchor = frame->findFirstElement("a[id=foo]");
+    frame->scrollToAnchor("foo");
+    QCOMPARE(frame->scrollPosition().y(), fooAnchor.geometry().top());
+    frame->scrollToAnchor("bar");
+    frame->scrollToAnchor("foo");
+    QCOMPARE(frame->scrollPosition().y(), fooAnchor.geometry().top());
+    frame->scrollToAnchor("top");
+    QCOMPARE(frame->scrollPosition().y(), 0);
+    frame->scrollToAnchor("bar");
+    frame->scrollToAnchor("notexist");
+    QVERIFY(frame->scrollPosition().y() != 0);
+}
+void tst_QWebFrame::scrollbarsOff()
+{
+    QWebView view;
+    QWebFrame* mainFrame = view.page()->mainFrame();
+    mainFrame->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
+    mainFrame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
+    QString html("<script>" \
+                 "   function checkScrollbar() {" \
+                 "       if (innerWidth === document.documentElement.offsetWidth)" \
+                 "           document.getElementById('span1').innerText = 'SUCCESS';" \
+                 "       else" \
+                 "           document.getElementById('span1').innerText = 'FAIL';" \
+                 "   }" \
+                 "</script>" \
+                 "<body>" \
+                 "   <div style='margin-top:1000px ; margin-left:1000px'>" \
+                 "       <a id='offscreen' href='a'>End</a>" \
+                 "   </div>" \
+                 "<span id='span1'></span>" \
+                 "</body>");
+    view.setHtml(html);
+    ::waitForSignal(&view, SIGNAL(loadFinished(bool)));
+    mainFrame->evaluateJavaScript("checkScrollbar();");
+    QCOMPARE(mainFrame->documentElement().findAll("span").at(0).toPlainText(), QString("SUCCESS"));
+}
 void tst_QWebFrame::evaluateWillCauseRepaint()
+{
 …
     view.show();
+    QTest::qWait(200);
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    QTest::qWaitForWindowShown(&view);
+#else
+    QTest::qWait(2000);
+#endif
     view.page()->mainFrame()->evaluateJavaScript(
 …
     ::waitForSignal(view.page(), SIGNAL(repaintRequested(QRect)));
-    QTest::qWait(2000);
+}
 …
+}
+void tst_QWebFrame::introspectQtMethods_data()
+{
+    QTest::addColumn<QString>("objectExpression");
+    QTest::addColumn<QString>("methodName");
+    QTest::addColumn<QStringList>("expectedPropertyNames");
+    QTest::newRow("myObject.mySignal")
+        << "myObject" << "mySignal" << (QStringList() << "connect" << "disconnect" << "length" << "name");
+    QTest::newRow("myObject.mySlot")
+        << "myObject" << "mySlot" << (QStringList() << "connect" << "disconnect" << "length" << "name");
+    QTest::newRow("myObject.myInvokable")
+        << "myObject" << "myInvokable" << (QStringList() << "connect" << "disconnect" << "length" << "name");
+    QTest::newRow("myObject.mySignal.connect")
+        << "myObject.mySignal" << "connect" << (QStringList() << "length" << "name");
+    QTest::newRow("myObject.mySignal.disconnect")
+        << "myObject.mySignal" << "disconnect" << (QStringList() << "length" << "name");
+}
+void tst_QWebFrame::introspectQtMethods()
+{
+    QFETCH(QString, objectExpression);
+    QFETCH(QString, methodName);
+    QFETCH(QStringList, expectedPropertyNames);
+    QString methodLookup = QString::fromLatin1("%0['%1']").arg(objectExpression).arg(methodName);
+    QCOMPARE(evalJSV(QString::fromLatin1("Object.getOwnPropertyNames(%0).sort()").arg(methodLookup)).toStringList(), expectedPropertyNames);
+    for (int i = 0; i < expectedPropertyNames.size(); ++i) {
+        QString name = expectedPropertyNames.at(i);
+        QCOMPARE(evalJS(QString::fromLatin1("%0.hasOwnProperty('%1')").arg(methodLookup).arg(name)), sTrue);
+        evalJS(QString::fromLatin1("var descriptor = Object.getOwnPropertyDescriptor(%0, '%1')").arg(methodLookup).arg(name));
+        QCOMPARE(evalJS("typeof descriptor"), QString::fromLatin1("object"));
+        QCOMPARE(evalJS("descriptor.get"), sUndefined);
+        QCOMPARE(evalJS("descriptor.set"), sUndefined);
+        QCOMPARE(evalJS(QString::fromLatin1("descriptor.value === %0['%1']").arg(methodLookup).arg(name)), sTrue);
+        QCOMPARE(evalJS(QString::fromLatin1("descriptor.enumerable")), sFalse);
+        QCOMPARE(evalJS(QString::fromLatin1("descriptor.configurable")), sFalse);
+    }
+    QVERIFY(evalJSV("var props=[]; for (var p in myObject.deleteLater) {props.push(p);}; props.sort()").toStringList().isEmpty());
+}
 QTEST_MAIN(tst_QWebFrame)
 #include "tst_qwebframe.moc"

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebhistory/qwebhistory.pro

-              r561
+              r846
+TEMPLATE = app
+TARGET = tst_qwebhistory
+include(../../../../WebKit.pri)
+SOURCES  += tst_qwebhistory.cpp
+RESOURCES  += tst_qwebhistory.qrc
+QT += testlib network
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+symbian {
+    TARGET.UID3 = 0xA000E53B
+    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+}
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebhistory/tst_qwebhistory.cpp

r561	r846
38	38	void loadPage(int nr)
39	39	{
40		frame->load(QUrl("qrc:/~~data~~/page" + QString::number(nr) + ".html"));
	40	frame->load(QUrl("qrc:/resources/page" + QString::number(nr) + ".html"));
41	41	waitForLoadFinished.exec();
42	42	}

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebhistory/tst_qwebhistory.qrc

-              r561
+              r846
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
     <file>data/page1.html</file>
     <file>data/page2.html</file>
     <file>data/page3.html</file>
     <file>data/page4.html</file>
     <file>data/page5.html</file>
     <file>data/page6.html</file>
+    <file>resources/page1.html</file>
+    <file>resources/page2.html</file>
+    <file>resources/page3.html</file>
+    <file>resources/page4.html</file>
+    <file>resources/page5.html</file>
+    <file>resources/page6.html</file>
 </qresource>
 </RCC>

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebhistoryinterface/qwebhistoryinterface.pro

-              r561
+              r846
+TEMPLATE = app
+TARGET = tst_qwebhistoryinterface
+include(../../../../WebKit.pri)
+SOURCES  += tst_qwebhistoryinterface.cpp
+QT += testlib network
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+symbian {
+    TARGET.UID3 = 0xA000E53C
+    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+}
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/qwebpage.pro

-              r561
+              r846
+TEMPLATE = app
+TARGET = tst_qwebpage
+include(../../../../WebKit.pri)
+SOURCES  += tst_qwebpage.cpp
+RESOURCES  += tst_qwebpage.qrc
+QT += testlib network
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+!symbian:DEFINES += SRCDIR=\\\"$$PWD/\\\"
+symbian {
+    TARGET.UID3 = 0xA000E53E
+    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+}
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

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

-              r769
+              r846
 */
+#include "../util.h"
+#include <QDir>
+#include <QGraphicsWidget>
+#include <QLineEdit>
+#include <QLocale>
+#include <QMenu>
+#include <QPushButton>
+#include <QStyle>
 #include <QtTest/QtTest>
+#include <QTextCharFormat>
 #include <qgraphicsscene.h>
 #include <qgraphicsview.h>
 #include <qgraphicswebview.h>
+#include <qnetworkrequest.h>
+#include <qwebdatabase.h>
 #include <qwebelement.h>
-#include <qwebpage.h>
-#include <qwidget.h>
-#include <QGraphicsWidget>
-#include <qwebview.h>
 #include <qwebframe.h>
 #include <qwebhistory.h>
+#include <qnetworkrequest.h>
+#include <QDebug>
+#include <QLineEdit>
+#include <QMenu>
+#include <qwebpage.h>
 #include <qwebsecurityorigin.h>
+#include <qwebdatabase.h>
+#include <QPushButton>
+#include <QDir>
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR ""
+#endif
+// Will try to wait for the condition while allowing event processing
+#define QTRY_COMPARE(__expr, __expected) \
+    do { \
+        const int __step = 50; \
+        const int __timeout = 5000; \
+        if ((__expr) != (__expected)) { \
+            QTest::qWait(0); \
+        } \
+        for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \
+            QTest::qWait(__step); \
+        } \
+        QCOMPARE(__expr, __expected); \
+    } while(0)
+//TESTED_CLASS=
+//TESTED_FILES=
+// Task 160192
+/**
+ * Starts an event loop that runs until the given signal is received.
+ Optionally the event loop
+ * can return earlier on a timeout.
+ *
+ * \return \p true if the requested signal was received
+ *         \p false on timeout
+ */
+static bool waitForSignal(QObject* obj, const char* signal, int timeout = 10000)
+{
+    QEventLoop loop;
+    QObject::connect(obj, signal, &loop, SLOT(quit()));
+    QTimer timer;
+    QSignalSpy timeoutSpy(&timer, SIGNAL(timeout()));
+    if (timeout > 0) {
+        QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
+        timer.setSingleShot(true);
+        timer.start(timeout);
+    }
+    loop.exec();
+    return timeoutSpy.isEmpty();
+}
+#include <qwebview.h>
 class EventSpy : public QObject, public QList<QEvent::Type>
 …
     void contextMenuCrash();
     void database();
+    void createPlugin();
+    void createPluginWithPluginsEnabled();
+    void createPluginWithPluginsDisabled();
     void destroyPlugin_data();
     void destroyPlugin();
 …
     void inputMethods_data();
     void inputMethods();
+    void inputMethodsTextFormat_data();
+    void inputMethodsTextFormat();
     void defaultTextEncoding();
     void errorPageExtension();
+    void errorPageExtensionInIFrames();
+    void errorPageExtensionInFrameset();
+    void userAgentApplicationName();
+    void userAgentLocaleChange();
+    void viewModes();
     void crashTests_LazyInitializationOfMainFrame();
 …
     void originatingObjectInNetworkRequests();
     void testJSPrompt();
+    void showModalDialog();
+    void testStopScheduledPageRefresh();
+    void findText();
 private:
     QWebView* m_view;
 …
 void tst_QWebPage::infiniteLoopJS()
+{
+#ifdef Q_WS_MAEMO_5
+    QSKIP("Test never terminates on Maemo 5 : https://bugs.webkit.org/show_bug.cgi?id=38538", SkipAll);
+#endif
     JSTestPage* newPage = new JSTestPage(m_view);
     m_view->setPage(newPage);
 …
     QTRY_COMPARE(spyLoadFinished.count(), 1);
+    QTest::qWait(3000);
+    QVERIFY(spyLoadStarted.count() > 1);
+    QVERIFY(spyLoadFinished.count() > 1);
+    QTRY_VERIFY(spyLoadStarted.count() > 1);
+    QTRY_VERIFY(spyLoadFinished.count() > 1);
     spyLoadFinished.clear();
 …
     QVERIFY(networkManager->requestedUrls.count() >= 1);
     QCOMPARE(networkManager->requestedUrls.at(0), QUrl("http://does.not/exist.png"));
+}
+void tst_QWebPage::viewModes()
+{
+    m_view->setHtml("<body></body>");
+    m_page->setProperty("_q_viewMode", "minimized");
+    QVariant empty = m_page->mainFrame()->evaluateJavaScript("window.styleMedia.matchMedium(\"(-webkit-view-mode)\")");
+    QVERIFY(empty.type() == QVariant::Bool && empty.toBool());
+    QVariant minimized = m_page->mainFrame()->evaluateJavaScript("window.styleMedia.matchMedium(\"(-webkit-view-mode: minimized)\")");
+    QVERIFY(minimized.type() == QVariant::Bool && minimized.toBool());
+    QVariant maximized = m_page->mainFrame()->evaluateJavaScript("window.styleMedia.matchMedium(\"(-webkit-view-mode: maximized)\")");
+    QVERIFY(maximized.type() == QVariant::Bool && !maximized.toBool());
+}
 …
     QWebDatabase::removeAllDatabases();
     QVERIFY(!origin.databases().size());
-    QTest::qWait(1000);
+}
 …
 };
 void tst_QWebPage::createPlugin()
+{
     QSignalSpy loadSpy(m_view, SIGNAL(loadFinished(bool)));
     PluginPage* newPage = new PluginPage(m_view);
     m_view->setPage(newPage);
     // plugins not enabled by default, so the plugin shouldn't be loaded
     m_view->setHtml(QString("<html><body><object type='application/x-qt-plugin' classid='pushbutton' id='mybutton'/></body></html>"));
+static void createPlugin(QWebView *view)
+{
+    QSignalSpy loadSpy(view, SIGNAL(loadFinished(bool)));
+    PluginPage* newPage = new PluginPage(view);
+    view->setPage(newPage);
+    // type has to be application/x-qt-plugin
+    view->setHtml(QString("<html><body><object type='application/x-foobarbaz' classid='pushbutton' id='mybutton'/></body></html>"));
     QTRY_COMPARE(loadSpy.count(), 1);
     QCOMPARE(newPage->calls.count(), 0);
+    m_view->settings()->setAttribute(QWebSettings::PluginsEnabled, true);
+    // type has to be application/x-qt-plugin
+    m_view->setHtml(QString("<html><body><object type='application/x-foobarbaz' classid='pushbutton' id='mybutton'/></body></html>"));
+    view->setHtml(QString("<html><body><object type='application/x-qt-plugin' classid='pushbutton' id='mybutton'/></body></html>"));
     QTRY_COMPARE(loadSpy.count(), 2);
-    QCOMPARE(newPage->calls.count(), 0);
-    m_view->setHtml(QString("<html><body><object type='application/x-qt-plugin' classid='pushbutton' id='mybutton'/></body></html>"));
-    QTRY_COMPARE(loadSpy.count(), 3);
     QCOMPARE(newPage->calls.count(), 1);
+    {
 …
              QString::fromLatin1("function clicked() {\n    [native code]\n}"));
     m_view->setHtml(QString("<html><body><table>"
+    view->setHtml(QString("<html><body><table>"
                             "<tr><object type='application/x-qt-plugin' classid='lineedit' id='myedit'/></tr>"
                             "<tr><object type='application/x-qt-plugin' classid='pushbutton' id='mybutton'/></tr>"
                             "</table></body></html>"), QUrl("http://foo.bar.baz"));
     QTRY_COMPARE(loadSpy.count(), 4);
+    QTRY_COMPARE(loadSpy.count(), 3);
     QCOMPARE(newPage->calls.count(), 2);
+    {
 …
         QVERIFY(ci.returnValue->inherits("QPushButton"));
+    }
+}
+void tst_QWebPage::createPluginWithPluginsEnabled()
+{
+    m_view->settings()->setAttribute(QWebSettings::PluginsEnabled, true);
+    createPlugin(m_view);
+}
+void tst_QWebPage::createPluginWithPluginsDisabled()
+{
+    // Qt Plugins should be loaded by QtWebKit even when PluginsEnabled is
+    // false. The client decides whether a Qt plugin is enabled or not when
+    // it decides whether or not to instantiate it.
     m_view->settings()->setAttribute(QWebSettings::PluginsEnabled, false);
+    m_view->setHtml(QString("<html><body><object type='application/x-qt-plugin' classid='pushbutton' id='mybutton'/></body></html>"));
+    QTRY_COMPARE(loadSpy.count(), 5);
+    QCOMPARE(newPage->calls.count(), 0);
+}
+    createPlugin(m_view);
+}
 // Standard base class for template PluginTracerPage. In tests it is used as interface.
 …
     QVERIFY(!action->isEnabled());
     QSignalSpy loadSpy(page, SIGNAL(loadFinished(bool)));
     QUrl url = QUrl("qrc:///frametest/index.html");
+    QUrl url = QUrl("qrc:///resources/index.html");
     page->mainFrame()->load(url);
     QTRY_COMPARE(loadSpy.count(), 1);
 …
     QWebPage* webPage = webView.page();
     QSignalSpy loadSpy(webPage, SIGNAL(loadFinished(bool)));
     QUrl url = QUrl("qrc:///frametest/iframe.html");
+    QUrl url = QUrl("qrc:///resources/iframe.html");
     webPage->mainFrame()->load(url);
     QTRY_COMPARE(loadSpy.count(), 1);
 …
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    QVERIFY(!viewEventSpy.contains(QEvent::RequestSoftwareInputPanel));
+    // This part of the test checks if the SIP (Software Input Panel) is triggered,
+    // which normally happens on mobile platforms, when a user input form receives
+    // a mouse click.
+    int  inputPanel = 0;
+    if (viewType == "QWebView") {
+        if (QWebView* wv = qobject_cast<QWebView*>(view))
+            inputPanel = wv->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel);
+    } else if (viewType == "QGraphicsWebView") {
+        if (QGraphicsWebView* wv = qobject_cast<QGraphicsWebView*>(view))
+            inputPanel = wv->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel);
+    }
+    // For non-mobile platforms RequestSoftwareInputPanel event is not called
+    // because there is no SIP (Software Input Panel) triggered. In the case of a
+    // mobile platform, an input panel, e.g. virtual keyboard, is usually invoked
+    // and the RequestSoftwareInputPanel event is called. For these two situations
+    // this part of the test can verified as the checks below.
+    if (inputPanel)
+        QVERIFY(viewEventSpy.contains(QEvent::RequestSoftwareInputPanel));
+    else
+        QVERIFY(!viewEventSpy.contains(QEvent::RequestSoftwareInputPanel));
 #endif
     viewEventSpy.clear();
 …
     QCOMPARE(selectionValue, QString("eb"));
+    //Cancel current composition first
+    inputAttributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 0, 0, QVariant());
+    QInputMethodEvent eventSelection2("",inputAttributes);
+    page->event(&eventSelection2);
     //Set selection with negative length
     inputAttributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 6, -5, QVariant());
     QInputMethodEvent eventSelection2("",inputAttributes);
     page->event(&eventSelection2);
+    QInputMethodEvent eventSelection3("",inputAttributes);
+    page->event(&eventSelection3);
     //ImAnchorPosition
 …
 #endif
+    {
+        QList<QInputMethodEvent::Attribute> attributes;
+        QInputMethodEvent event(QString(), attributes);
+        event.setCommitString("XXX", 0, 0);
+        page->event(&event);
+        event.setCommitString(QString(), -2, 2); // Erase two characters.
+        page->event(&event);
+        event.setCommitString(QString(), -1, 1); // Erase one character.
+        page->event(&event);
+        variant = page->inputMethodQuery(Qt::ImSurroundingText);
+        value = variant.value<QString>();
+        QCOMPARE(value, QString("QtWebKit"));
+    }
+    // Cancel current composition first
+    inputAttributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 0, 0, QVariant());
+    QInputMethodEvent eventSelection4("", inputAttributes);
+    page->event(&eventSelection4);
+    // START - Tests for Selection when the Editor is NOT in Composition mode
+    // LEFT to RIGHT selection
+    // Deselect the selection by sending MouseButtonPress events
+    // This moves the current cursor to the end of the text
+    page->event(&evpres);
+    page->event(&evrel);
+    //Move to the start of the line
+    page->triggerAction(QWebPage::MoveToStartOfLine);
+    QKeyEvent keyRightEventPress(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier);
+    QKeyEvent keyRightEventRelease(QEvent::KeyRelease, Qt::Key_Right, Qt::NoModifier);
+    //Move 2 characters RIGHT
+    for (int j = 0; j < 2; ++j) {
+        page->event(&keyRightEventPress);
+        page->event(&keyRightEventRelease);
+    }
+    //Select to the end of the line
+    page->triggerAction(QWebPage::SelectEndOfLine);
+    //ImAnchorPosition QtWebKit
+    variant = page->inputMethodQuery(Qt::ImAnchorPosition);
+    anchorPosition =  variant.toInt();
+    QCOMPARE(anchorPosition, 2);
+    //ImCursorPosition
+    variant = page->inputMethodQuery(Qt::ImCursorPosition);
+    cursorPosition =  variant.toInt();
+    QCOMPARE(cursorPosition, 8);
+    //ImCurrentSelection
+    variant = page->inputMethodQuery(Qt::ImCurrentSelection);
+    selectionValue = variant.value<QString>();
+    QCOMPARE(selectionValue, QString("WebKit"));
+    //RIGHT to LEFT selection
+    //Deselect the selection (this moves the current cursor to the end of the text)
+    page->event(&evpres);
+    page->event(&evrel);
+    //ImAnchorPosition
+    variant = page->inputMethodQuery(Qt::ImAnchorPosition);
+    anchorPosition =  variant.toInt();
+    QCOMPARE(anchorPosition, 8);
+    //ImCursorPosition
+    variant = page->inputMethodQuery(Qt::ImCursorPosition);
+    cursorPosition =  variant.toInt();
+    QCOMPARE(cursorPosition, 8);
+    //ImCurrentSelection
+    variant = page->inputMethodQuery(Qt::ImCurrentSelection);
+    selectionValue = variant.value<QString>();
+    QCOMPARE(selectionValue, QString(""));
+    QKeyEvent keyLeftEventPress(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier);
+    QKeyEvent keyLeftEventRelease(QEvent::KeyRelease, Qt::Key_Left, Qt::NoModifier);
+    //Move 2 characters LEFT
+    for (int i = 0; i < 2; ++i) {
+        page->event(&keyLeftEventPress);
+        page->event(&keyLeftEventRelease);
+    }
+    //Select to the start of the line
+    page->triggerAction(QWebPage::SelectStartOfLine);
+    //ImAnchorPosition
+    variant = page->inputMethodQuery(Qt::ImAnchorPosition);
+    anchorPosition =  variant.toInt();
+    QCOMPARE(anchorPosition, 6);
+    //ImCursorPosition
+    variant = page->inputMethodQuery(Qt::ImCursorPosition);
+    cursorPosition =  variant.toInt();
+    QCOMPARE(cursorPosition, 0);
+    //ImCurrentSelection
+    variant = page->inputMethodQuery(Qt::ImCurrentSelection);
+    selectionValue = variant.value<QString>();
+    QCOMPARE(selectionValue, QString("QtWebK"));
+    //END - Tests for Selection when the Editor is not in Composition mode
     //ImhHiddenText
     QMouseEvent evpresPassword(QEvent::MouseButtonPress, inputs.at(1).geometry().center(), Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
 …
+}
+void tst_QWebPage::inputMethodsTextFormat_data()
+{
+    QTest::addColumn<QString>("string");
+    QTest::addColumn<int>("start");
+    QTest::addColumn<int>("length");
+    QTest::newRow("") << QString("") << 0 << 0;
+    QTest::newRow("Q") << QString("Q") << 0 << 1;
+    QTest::newRow("Qt") << QString("Qt") << 0 << 1;
+    QTest::newRow("Qt") << QString("Qt") << 0 << 2;
+    QTest::newRow("Qt") << QString("Qt") << 1 << 1;
+    QTest::newRow("Qt ") << QString("Qt ") << 0 << 1;
+    QTest::newRow("Qt ") << QString("Qt ") << 1 << 1;
+    QTest::newRow("Qt ") << QString("Qt ") << 2 << 1;
+    QTest::newRow("Qt ") << QString("Qt ") << 2 << -1;
+    QTest::newRow("Qt ") << QString("Qt ") << -2 << 3;
+    QTest::newRow("Qt ") << QString("Qt ") << 0 << 3;
+    QTest::newRow("Qt by") << QString("Qt by") << 0 << 1;
+    QTest::newRow("Qt by Nokia") << QString("Qt by Nokia") << 0 << 1;
+}
+void tst_QWebPage::inputMethodsTextFormat()
+{
+    QWebPage* page = new QWebPage;
+    QWebView* view = new QWebView;
+    view->setPage(page);
+    page->settings()->setFontFamily(QWebSettings::SerifFont, "FooSerifFont");
+    page->mainFrame()->setHtml("<html><body>" \
+                                            "<input type='text' id='input1' style='font-family: serif' value='' maxlength='20'/>");
+    page->mainFrame()->evaluateJavaScript("document.getElementById('input1').focus()");
+    page->mainFrame()->setFocus();
+    view->show();
+    QFETCH(QString, string);
+    QFETCH(int, start);
+    QFETCH(int, length);
+    QList<QInputMethodEvent::Attribute> attrs;
+    QTextCharFormat format;
+    format.setUnderlineStyle(QTextCharFormat::SingleUnderline);
+    format.setUnderlineColor(Qt::red);
+    attrs.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, start, length, format));
+    QInputMethodEvent im(string, attrs);
+    page->event(&im);
+    QTest::qWait(1000);
+    delete view;
+}
 // import a little DRT helper function to trigger the garbage collector
 void QWEBKIT_EXPORT qt_drt_garbageCollector_collect();
 …
+{
     int i = QWebSecurityOrigin::localSchemes().size();
     QWebSecurityOrigin::removeLocalScheme("file");
     QTRY_COMPARE(QWebSecurityOrigin::localSchemes().size(), i);
     QWebSecurityOrigin::addLocalScheme("file");
     QTRY_COMPARE(QWebSecurityOrigin::localSchemes().size(), i);
+    QWebSecurityOrigin::removeLocalScheme("qrc");
+    QTRY_COMPARE(QWebSecurityOrigin::localSchemes().size(), i - 1);
+    QWebSecurityOrigin::addLocalScheme("qrc");
+    QTRY_COMPARE(QWebSecurityOrigin::localSchemes().size(), i);
     QString myscheme = "myscheme";
     QWebSecurityOrigin::addLocalScheme(myscheme);
 …
     QWebSettings::enablePersistentStorage();
+    // Give it some time to initialize - icon database needs it
+    QTest::qWait(1000);
+    QCOMPARE(webPage.settings()->testAttribute(QWebSettings::LocalStorageEnabled), true);
+    QCOMPARE(webPage.settings()->testAttribute(QWebSettings::OfflineStorageDatabaseEnabled), true);
+    QCOMPARE(webPage.settings()->testAttribute(QWebSettings::OfflineWebApplicationCacheEnabled), true);
+    QVERIFY(!webPage.settings()->offlineStoragePath().isEmpty());
+    QVERIFY(!webPage.settings()->offlineWebApplicationCachePath().isEmpty());
+    QVERIFY(!webPage.settings()->iconDatabasePath().isEmpty());
+    QTRY_COMPARE(webPage.settings()->testAttribute(QWebSettings::LocalStorageEnabled), true);
+    QTRY_COMPARE(webPage.settings()->testAttribute(QWebSettings::OfflineStorageDatabaseEnabled), true);
+    QTRY_COMPARE(webPage.settings()->testAttribute(QWebSettings::OfflineWebApplicationCacheEnabled), true);
+    QTRY_VERIFY(!webPage.settings()->offlineStoragePath().isEmpty());
+    QTRY_VERIFY(!webPage.settings()->offlineWebApplicationCachePath().isEmpty());
+    QTRY_VERIFY(!webPage.settings()->iconDatabasePath().isEmpty());
+}
 …
     virtual bool extension(Extension, const ExtensionOption* option, ExtensionReturn* output)
+    {
-        const ErrorPageExtensionOption* info = static_cast<const ErrorPageExtensionOption*>(option);
         ErrorPageExtensionReturn* errorPage = static_cast<ErrorPageExtensionReturn*>(output);
+        if (info->frame == mainFrame()) {
+            errorPage->content = "data:text/html,error";
+            return true;
+        }
+        return false;
+        errorPage->content = "data:text/html,error";
+        return true;
+    }
 };
 …
     QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool)));
     page->mainFrame()->load(QUrl("qrc:///frametest/index.html"));
+    m_view->setUrl(QUrl("data:text/html,foo"));
     QTRY_COMPARE(spyLoadFinished.count(), 1);
     page->mainFrame()->setUrl(QUrl("http://non.existent/url"));
-    QTest::qWait(2000);
     QTRY_COMPARE(spyLoadFinished.count(), 2);
     QCOMPARE(page->mainFrame()->toPlainText(), QString("data:text/html,error"));
 …
     page->triggerAction(QWebPage::Back);
+    QTest::qWait(2000);
+    QCOMPARE(page->history()->canGoBack(), false);
+    QCOMPARE(page->history()->canGoForward(), true);
+    QTRY_COMPARE(page->history()->canGoBack(), false);
+    QTRY_COMPARE(page->history()->canGoForward(), true);
     page->triggerAction(QWebPage::Forward);
+    QTest::qWait(2000);
+    QCOMPARE(page->history()->canGoBack(), true);
+    QCOMPARE(page->history()->canGoForward(), false);
+    QTRY_COMPARE(page->history()->canGoBack(), true);
+    QTRY_COMPARE(page->history()->canGoForward(), false);
     page->triggerAction(QWebPage::Back);
+    QTest::qWait(2000);
+    QCOMPARE(page->history()->canGoBack(), false);
+    QCOMPARE(page->history()->canGoForward(), true);
+    QCOMPARE(page->history()->currentItem().url(), QUrl("qrc:///frametest/index.html"));
+    QTRY_COMPARE(page->history()->canGoBack(), false);
+    QTRY_COMPARE(page->history()->canGoForward(), true);
+    QTRY_COMPARE(page->history()->currentItem().url(), QUrl("data:text/html,foo"));
     m_view->setPage(0);
+}
+void tst_QWebPage::errorPageExtensionInIFrames()
+{
+    ErrorPage* page = new ErrorPage;
+    m_view->setPage(page);
+    m_view->setHtml(QString("data:text/html,"
+                            "<h1>h1</h1>"
+                            "<iframe src='data:text/html,<p/>p'></iframe>"
+                            "<iframe src='non-existent.html'></iframe>"));
+    QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool)));
+    QTRY_COMPARE(spyLoadFinished.count(), 1);
+    QCOMPARE(page->mainFrame()->childFrames()[1]->toPlainText(), QString("data:text/html,error"));
+    m_view->setPage(0);
+}
+void tst_QWebPage::errorPageExtensionInFrameset()
+{
+    ErrorPage* page = new ErrorPage;
+    m_view->setPage(page);
+    m_view->load(QUrl("qrc:///resources/index.html"));
+    QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool)));
+    QTRY_COMPARE(spyLoadFinished.count(), 1);
+    QCOMPARE(page->mainFrame()->childFrames()[1]->toPlainText(), QString("data:text/html,error"));
+    m_view->setPage(0);
+}
+class FriendlyWebPage : public QWebPage
+{
+public:
+    friend class tst_QWebPage;
+};
+void tst_QWebPage::userAgentApplicationName()
+{
+    const QString oldApplicationName = QCoreApplication::applicationName();
+    FriendlyWebPage page;
+    const QString applicationNameMarker = QString::fromUtf8("StrangeName\342\210\236");
+    QCoreApplication::setApplicationName(applicationNameMarker);
+    QVERIFY(page.userAgentForUrl(QUrl()).contains(applicationNameMarker));
+    QCoreApplication::setApplicationName(oldApplicationName);
+}
+void tst_QWebPage::userAgentLocaleChange()
+{
+    FriendlyWebPage page;
+    m_view->setPage(&page);
+    const QString markerString = QString::fromLatin1(" nn-NO)");
+    if (page.userAgentForUrl(QUrl()).contains(markerString))
+        QSKIP("marker string already present", SkipSingle);
+    m_view->setLocale(QLocale(QString::fromLatin1("nn_NO")));
+    QVERIFY(page.userAgentForUrl(QUrl()).contains(markerString));
+}
 …
 void tst_QWebPage::screenshot()
+{
+    QDir::setCurrent(SRCDIR);
+    if (!QDir(TESTS_SOURCE_DIR).exists())
+        QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
+    QDir::setCurrent(TESTS_SOURCE_DIR);
     QFETCH(QString, html);
 …
     page->settings()->setAttribute(QWebSettings::PluginsEnabled, true);
     QWebFrame* mainFrame = page->mainFrame();
+    mainFrame->setHtml(html, QUrl::fromLocalFile(QDir::currentPath()));
+    if (html.contains("</embed>")) {
+        // some reasonable time for the PluginStream to feed test.swf to flash and start painting
+        QTest::qWait(2000);
+    }
+    mainFrame->setHtml(html, QUrl::fromLocalFile(TESTS_SOURCE_DIR));
+    ::waitForSignal(mainFrame, SIGNAL(loadFinished(bool)), 2000);
     // take screenshot without a view
 …
+}
+class TestModalPage : public QWebPage
+{
+    Q_OBJECT
+public:
+    TestModalPage(QObject* parent = 0) : QWebPage(parent) {
+    }
+    virtual QWebPage* createWindow(WebWindowType) {
+        QWebPage* page = new TestModalPage();
+        connect(page, SIGNAL(windowCloseRequested()), page, SLOT(deleteLater()));
+        return page;
+    }
+};
+void tst_QWebPage::showModalDialog()
+{
+    TestModalPage page;
+    page.mainFrame()->setHtml(QString("<html></html>"));
+    QString res = page.mainFrame()->evaluateJavaScript("window.showModalDialog('javascript:window.returnValue=dialogArguments; window.close();', 'This is a test');").toString();
+    QCOMPARE(res, QString("This is a test"));
+}
+void tst_QWebPage::testStopScheduledPageRefresh()
+{
+    // Without QWebPage::StopScheduledPageRefresh
+    QWebPage page1;
+    page1.setNetworkAccessManager(new TestNetworkManager(&page1));
+    page1.mainFrame()->setHtml("<html><head>"
+                                "<meta http-equiv=\"refresh\"content=\"0;URL=http://qt.nokia.com/favicon.ico\">"
+                                "</head><body><h1>Page redirects immediately...</h1>"
+                                "</body></html>");
+    QVERIFY(::waitForSignal(&page1, SIGNAL(loadFinished(bool))));
+    QTest::qWait(500);
+    QCOMPARE(page1.mainFrame()->url().toString(), QString("http://qt.nokia.com/favicon.ico"));
+    // With QWebPage::StopScheduledPageRefresh
+    QWebPage page2;
+    page2.setNetworkAccessManager(new TestNetworkManager(&page2));
+    page2.mainFrame()->setHtml("<html><head>"
+                               "<meta http-equiv=\"refresh\"content=\"1;URL=http://qt.nokia.com/favicon.ico\">"
+                               "</head><body><h1>Page redirect test with 1 sec timeout...</h1>"
+                               "</body></html>");
+    page2.triggerAction(QWebPage::StopScheduledPageRefresh);
+    QTest::qWait(1500);
+    QCOMPARE(page2.mainFrame()->url().toString(), QString("about:blank"));
+}
+void tst_QWebPage::findText()
+{
+    m_view->setHtml(QString("<html><head></head><body><div>foo bar</div></body></html>"));
+    m_page->triggerAction(QWebPage::SelectAll);
+    QVERIFY(!m_page->selectedText().isEmpty());
+    m_page->findText("");
+    QVERIFY(m_page->selectedText().isEmpty());
+    QStringList words = (QStringList() << "foo" << "bar");
+    foreach (QString subString, words) {
+        m_page->findText(subString, QWebPage::FindWrapsAroundDocument);
+        QCOMPARE(m_page->selectedText(), subString);
+        m_page->findText("");
+        QVERIFY(m_page->selectedText().isEmpty());
+    }
+}
 QTEST_MAIN(tst_QWebPage)
 #include "tst_qwebpage.moc"

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

-              r561
+              r846
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
     <file>frametest/index.html</file>
     <file>frametest/frame_a.html</file>
     <file>frametest/iframe.html</file>
     <file>frametest/iframe2.html</file>
     <file>frametest/iframe3.html</file>
+    <file>resources/index.html</file>
+    <file>resources/frame_a.html</file>
+    <file>resources/iframe.html</file>
+    <file>resources/iframe2.html</file>
+    <file>resources/iframe3.html</file>
 </qresource>
 </RCC>

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebplugindatabase/qwebplugindatabase.pro

-              r561
+              r846
+TEMPLATE = app
+TARGET = tst_qwebplugindatabase
+include(../../../../WebKit.pri)
+SOURCES  += tst_qwebplugindatabase.cpp
+QT += testlib network
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+symbian {
+    TARGET.UID3 = 0xA000E540
+    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+}
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebview/qwebview.pro

-              r561
+              r846
+TEMPLATE = app
+TARGET = tst_qwebview
+include(../../../../WebKit.pri)
+SOURCES  += tst_qwebview.cpp
+QT += testlib network
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+RESOURCES  += tst_qwebview.qrc
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+symbian {
+    TARGET.UID3 = 0xA000E53F
+    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+}
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
+include(../tests.pri)
+exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp

-              r561
+              r846
     void reusePage_data();
     void reusePage();
+    void microFocusCoordinates();
+    void focusInputTypes();
     void crashTests();
+};
+class WebView : public QWebView
+{
+    Q_OBJECT
+public:
+    void fireMouseClick(QPoint point) {
+        QMouseEvent presEv(QEvent::MouseButtonPress, point, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+        QMouseEvent relEv(QEvent::MouseButtonRelease, point, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+        QWebView::mousePressEvent(&presEv);
+        QWebView::mousePressEvent(&relEv);
+    }
 };
 …
 void tst_QWebView::reusePage()
+{
+    QDir::setCurrent(SRCDIR);
+    if (!QDir(TESTS_SOURCE_DIR).exists())
+        QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
+    QDir::setCurrent(TESTS_SOURCE_DIR);
     QFETCH(QString, html);
 …
     page->settings()->setAttribute(QWebSettings::PluginsEnabled, true);
     QWebFrame* mainFrame = page->mainFrame();
     mainFrame->setHtml(html, QUrl::fromLocalFile(QDir::currentPath()));
+    mainFrame->setHtml(html, QUrl::fromLocalFile(TESTS_SOURCE_DIR));
     if (html.contains("</embed>")) {
         // some reasonable time for the PluginStream to feed test.swf to flash and start painting
         QTest::qWait(2000);
+        waitForSignal(view1, SIGNAL(loadFinished(bool)), 2000);
+    }
     view1->show();
+    QTest::qWait(2000);
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    QTest::qWaitForWindowShown(view1);
+#else
+    QTest::qWait(2000);
+#endif
     delete view1;
     QVERIFY(page != 0); // deleting view must not have deleted the page, since it's not a child of view
 …
     view2->setPage(page);
     view2->show(); // in Windowless mode, you should still be able to see the plugin here
+    QTest::qWait(2000);
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    QTest::qWaitForWindowShown(view2);
+#else
+    QTest::qWait(2000);
+#endif
     delete view2;
 …
     QWebView view;
     WebViewCrashTest tester(&view);
     QUrl url("qrc:///data/index.html");
+    QUrl url("qrc:///resources/index.html");
     view.load(url);
     QTRY_VERIFY(tester.m_executed); // If fail it means that the test wasn't executed.
+}
+void tst_QWebView::microFocusCoordinates()
+{
+    QWebPage* page = new QWebPage;
+    QWebView* webView = new QWebView;
+    webView->setPage( page );
+    page->mainFrame()->setHtml("<html><body>" \
+        "<input type='text' id='input1' style='font--family: serif' value='' maxlength='20'/><br>" \
+        "<canvas id='canvas1' width='500' height='500'/>" \
+        "<input type='password'/><br>" \
+        "<canvas id='canvas2' width='500' height='500'/>" \
+        "</body></html>");
+    page->mainFrame()->setFocus();
+    QVariant initialMicroFocus = page->inputMethodQuery(Qt::ImMicroFocus);
+    QVERIFY(initialMicroFocus.isValid());
+    page->mainFrame()->scroll(0,50);
+    QVariant currentMicroFocus = page->inputMethodQuery(Qt::ImMicroFocus);
+    QVERIFY(currentMicroFocus.isValid());
+    QCOMPARE(initialMicroFocus.toRect().translated(QPoint(0,-50)), currentMicroFocus.toRect());
+}
+void tst_QWebView::focusInputTypes()
+{
+    QWebPage* page = new QWebPage;
+    WebView* webView = new WebView;
+    webView->setPage( page );
+    QCoreApplication::processEvents();
+    QUrl url("qrc:///resources/input_types.html");
+    page->mainFrame()->load(url);
+    page->mainFrame()->setFocus();
+    QVERIFY(waitForSignal(page, SIGNAL(loadFinished(bool))));
+    // 'text' type
+    webView->fireMouseClick(QPoint(20, 10));
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
+    QVERIFY(webView->inputMethodHints() & Qt::ImhNoAutoUppercase);
+    QVERIFY(webView->inputMethodHints() & Qt::ImhNoPredictiveText);
+#else
+    QVERIFY(webView->inputMethodHints() == Qt::ImhNone);
+#endif
+    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    // 'password' field
+    webView->fireMouseClick(QPoint(20, 60));
+    QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText);
+    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    // 'tel' field
+    webView->fireMouseClick(QPoint(20, 110));
+    QVERIFY(webView->inputMethodHints() == Qt::ImhDialableCharactersOnly);
+    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    // 'number' field
+    webView->fireMouseClick(QPoint(20, 160));
+    QVERIFY(webView->inputMethodHints() == Qt::ImhDigitsOnly);
+    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    // 'email' field
+    webView->fireMouseClick(QPoint(20, 210));
+    QVERIFY(webView->inputMethodHints() == Qt::ImhEmailCharactersOnly);
+    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    // 'url' field
+    webView->fireMouseClick(QPoint(20, 260));
+    QVERIFY(webView->inputMethodHints() == Qt::ImhUrlCharactersOnly);
+    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    // 'password' field
+    webView->fireMouseClick(QPoint(20, 60));
+    QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText);
+    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    // 'text' type
+    webView->fireMouseClick(QPoint(20, 10));
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
+    QVERIFY(webView->inputMethodHints() & Qt::ImhNoAutoUppercase);
+    QVERIFY(webView->inputMethodHints() & Qt::ImhNoPredictiveText);
+#else
+    QVERIFY(webView->inputMethodHints() == Qt::ImhNone);
+#endif
+    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    // 'password' field
+    webView->fireMouseClick(QPoint(20, 60));
+    QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText);
+    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    qWarning("clicking on text area");
+    // 'text area' field
+    webView->fireMouseClick(QPoint(20, 320));
+    QVERIFY(webView->inputMethodHints() == Qt::ImhNone);
+    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    delete webView;
+}
 QTEST_MAIN(tst_QWebView)

trunk/src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.qrc

-              r561
+              r846
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
+    <file>data/index.html</file>
+    <file>data/frame_a.html</file>
+    <file>resources/index.html</file>
+    <file>resources/frame_a.html</file>
+    <file>resources/input_types.html</file>
 </qresource>
 </RCC>

trunk/src/3rdparty/webkit/WebKit/qt/tests/tests.pro

r561	r846
1	1
2	2	TEMPLATE = subdirs
3		SUBDIRS = qwebframe qwebpage qwebelement qgraphicswebview qwebhistoryinterface qwebview qwebhistory
4		greaterThan(QT_MINOR_VERSION, 4): SUBDIRS += benchmarks/painting/tst_painting.pro benchmarks/loading/tst_loading.pro
	3	SUBDIRS = qwebframe qwebpage qwebelement qgraphicswebview qwebhistoryinterface qwebview qwebhistory qwebinspector hybridPixmap
	4	SUBDIRS += benchmarks/painting benchmarks/loading

trunk/src/3rdparty/webkit/WebKit/qt/tests/util.h

-              r561
+              r846
 */
 // Functions and macros that really need to be in QTestLib
+#include <QEventLoop>
+#include <QSignalSpy>
+#include <QTimer>
+#if !defined(TESTS_SOURCE_DIR)
+#define TESTS_SOURCE_DIR ""
+#endif
+/**
+ * Starts an event loop that runs until the given signal is received.
+ * Optionally the event loop
+ * can return earlier on a timeout.
+ *
+ * \return \p true if the requested signal was received
+ *         \p false on timeout
+ */
+static bool waitForSignal(QObject* obj, const char* signal, int timeout = 10000)
+{
+    QEventLoop loop;
+    QObject::connect(obj, signal, &loop, SLOT(quit()));
+    QTimer timer;
+    QSignalSpy timeoutSpy(&timer, SIGNAL(timeout()));
+    if (timeout > 0) {
+        QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
+        timer.setSingleShot(true);
+        timer.start(timeout);
+    }
+    loop.exec();
+    return timeoutSpy.isEmpty();
+}
 // Will try to wait for the condition while allowing event processing
 …
         QCOMPARE(__expr, __expected); \
     } while(0)

/branches/vendor/nokia/qt/4.7.2 (added)	merged: 845
/branches/vendor/nokia/qt/current	merged: 844
/branches/vendor/nokia/qt/4.6.3	removed

Context Navigation

Legend:

Download in other formats: