summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-11-12 10:36:19 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-11-12 10:36:19 (GMT)
commita495b9a6ed660ac74596d3ce6700e47c2e1887eb (patch)
treea7d80c222af0bfd907a025e1ba5ecc4e4f3f4985 /src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
parent1212fbea0b6829986649dd1f237e59377f52a6cd (diff)
downloadQt-a495b9a6ed660ac74596d3ce6700e47c2e1887eb.zip
Qt-a495b9a6ed660ac74596d3ce6700e47c2e1887eb.tar.gz
Qt-a495b9a6ed660ac74596d3ce6700e47c2e1887eb.tar.bz2
Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( 361c6ae17415602fedcce8924de445feafaddebb )
Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-11 Liang QI <liang.qi@nokia.com> [Qt] Fix tst_qwebpage and tst_qwebframe compilation on Symbian. * tests/qwebframe/qwebframe.pro: * tests/qwebframe/tst_qwebframe.cpp: * tests/qwebpage/qwebpage.pro: * tests/qwebpage/tst_qwebpage.cpp: 2009-11-11 Kenneth Rohde Christiansen <kenneth@webkit.org> Reviewed by Simon Hausmann. Fix a crash in the layout test plugins/document-open.html * Api/qwebframe.cpp: (QWebFrame::toPlainText): 2009-11-11 Warwick Allison <warwick.allison@nokia.com>, Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. [Qt] Regression: Preserve the parent of plugin objects when using QtWebKit with only a QWebPage. * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::createPlugin): Don't reparent plugins to 0. * tests/qwebpage/tst_qwebpage.cpp: (PluginCounterPage::PluginCounterPage): Initialize m_pluginParent to 0. (PluginCounterPage::~PluginCounterPage): Delete the plugin parent later (after the page) (PluginTracerPage::createPlugin): Assign a dummy parent to the plugin. (PluginTracerPage::PluginTracerPage): Set up the plugin parent. (tst_QWebPage::createViewlessPlugin): Verify that for viewless pages the plugin parent remains unchanged. 2009-11-11 David Boddie <dboddie@trolltech.com> [Qt] Doc: Added internal or hidden placeholder documentation. * Api/qwebpage.cpp: 2009-11-11 Martin Smith <msmith@trolltech.com> [Qt] doc: Changed Trolltech to Nokia * Api/qwebview.cpp: 2009-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: 2009-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: 2009-11-11 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. Fix enabling of software input panel when activating editable elements in QGraphicsWebView. * Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::inputMethodEnabled): Implement method to query for input method support. * Api/qwebpage.cpp: (QWebPageWidgetClient::inputMethodEnabled): Ditto for QWidget. (QWebPagePrivate::handleSoftwareInputPanel): Don't use view() to test for input method support. Instead query using QWebPageClient and send the SIPR event to the ownerWidget() instead of the view(). The latter is null for QGraphicsWebView. * tests/qwebpage/tst_qwebpage.cpp: (EventSpy::EventSpy): (EventSpy::eventFilter): (tst_QWebPage::inputMethods): Modify the test to verify that SIPR events are dispatched when activating focusable content.
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
index 55ce1f7..9edec36 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
@@ -759,8 +759,12 @@ void QWebView::paintEvent(QPaintEvent *ev)
}
/*!
- This function is called whenever WebKit wants to create a new window of the given \a type, for example as a result of
- a JavaScript request to open a document in a new window.
+ This function is called from the createWindow() method of the associated QWebPage,
+ each time the page wants to create a new window of the given \a type. This might
+ be the result, for example, of a JavaScript request to open a document in a new window.
+
+ \note If the createWindow() method of the associated page is reimplemented, this
+ method is not called, unless explicitly done so in the reimplementation.
\sa QWebPage::createWindow()
*/
@@ -974,7 +978,7 @@ void QWebView::changeEvent(QEvent *e)
/*!
\fn void QWebView::statusBarMessage(const QString& text)
- This signal is emitted when the status bar \a text is changed by the page.
+ This signal is emitted when the statusbar \a text is changed by the page.
*/
/*!