Many API changes and additions after a full review with Jasmin Blanchette <jasmin@trolltech.com>
The diff is too big to mention the changes individually, but most of the changes were of cosmetic
nature where methods or enums have been renamed or prefixed/suffixed according to the consistency
rules of the Qt API.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32209 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 51300e6..8d06ddc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-18 Simon Hausmann <hausmann@webkit.org>
+
+ Reviewed by Holger.
+
+ Adapt to the API changes in WebKit/qt/
+
+ * platform/graphics/qt/ImageQt.cpp:
+ (loadResourcePixmap):
+
2008-04-18 Ariya Hidayat <ariya.hidayat@trolltech.com>
Reviewed by Adam Roben.
diff --git a/WebCore/platform/graphics/qt/ImageQt.cpp b/WebCore/platform/graphics/qt/ImageQt.cpp
index f807d6a..91090eb 100644
--- a/WebCore/platform/graphics/qt/ImageQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageQt.cpp
@@ -61,9 +61,9 @@
else if (resource == "nullPlugin")
pixmap = QWebSettings::webGraphic(QWebSettings::MissingPluginGraphic);
else if (resource == "urlIcon")
- pixmap = QWebSettings::webGraphic(QWebSettings::DefaultFaviconGraphic);
+ pixmap = QWebSettings::webGraphic(QWebSettings::DefaultFrameIconGraphic);
else if (resource == "textAreaResizeCorner")
- pixmap = QWebSettings::webGraphic(QWebSettings::TextAreaResizeCornerGraphic);
+ pixmap = QWebSettings::webGraphic(QWebSettings::TextAreaSizeGripCornerGraphic);
return pixmap;
}
diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 70cb46c..1d57743 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -87,9 +87,6 @@
frame = new Frame(webcorePage, frameData->ownerElement, frameLoaderClient);
frameLoaderClient->setFrame(qframe, frame);
frame->init();
-
- QObject::connect(q, SIGNAL(hoveringOverLink(const QString&, const QString&, const QString&)),
- page, SIGNAL(hoveringOverLink(const QString&, const QString&, const QString&)));
}
WebCore::PlatformScrollbar *QWebFramePrivate::horizontalScrollBar() const
@@ -160,7 +157,7 @@
Qt properties will be exposed as JavaScript properties and slots as
JavaScript methods.
*/
-void QWebFrame::addToJSWindowObject(const QString &name, QObject *object)
+void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object)
{
KJS::JSLock lock;
JSDOMWindow *window = toJSDOMWindow(d->frame);
@@ -179,7 +176,7 @@
/*!
returns the markup (HTML) contained in the current frame.
*/
-QString QWebFrame::markup() const
+QString QWebFrame::toHtml() const
{
if (!d->frame->document())
return QString();
@@ -189,7 +186,7 @@
/*!
returns the content of this frame as plain text.
*/
-QString QWebFrame::innerText() const
+QString QWebFrame::toPlainText() const
{
if (d->frame->view() && d->frame->view()->layoutPending())
d->frame->view()->layout();
@@ -231,7 +228,7 @@
/*!
The icon associated with this frame.
*/
-QPixmap QWebFrame::icon() const
+QIcon QWebFrame::icon() const
{
String url = d->frame->loader()->url().string();
@@ -256,7 +253,7 @@
/*!
The name of this frame as defined by the parent frame.
*/
-QString QWebFrame::name() const
+QString QWebFrame::frameName() const
{
return d->frame->tree()->name();
}
@@ -388,9 +385,11 @@
}
/*!
- Sets the content of this frame to \a data assuming \a mimeType. If
- \a mimeType is not specified it defaults to 'text/html'. \a baseUrl
- us optional and used to resolve relative URLs in the document.
+ Sets the content of this frame to the specified content \a data. If the \a mimeType argument
+ is empty it is currently assumed that the content is HTML but in future versions we may introduce
+ auto-detection.
+
+ External objects referenced in the content are located relative to \a baseUrl.
*/
void QWebFrame::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl)
{
@@ -436,45 +435,33 @@
}
/*!
- \property QWebFrame::verticalScrollBarPolicy
-
- This property defines the vertical scrollbar policy.
-
- \sa Qt::ScrollBarPolicy
+ Returns the scrollbar policy for the scrollbar defined by \a orientation.
*/
-Qt::ScrollBarPolicy QWebFrame::verticalScrollBarPolicy() const
+Qt::ScrollBarPolicy QWebFrame::scrollBarPolicy(Qt::Orientation orientation) const
{
+ if (orientation == Qt::Horizontal)
+ return d->horizontalScrollBarPolicy;
return d->verticalScrollBarPolicy;
}
-void QWebFrame::setVerticalScrollBarPolicy(Qt::ScrollBarPolicy policy)
+/*!
+ Sets the scrollbar policy for the scrollbar defined by \a orientation to \a policy.
+*/
+void QWebFrame::setScrollBarPolicy(Qt::Orientation orientation, Qt::ScrollBarPolicy policy)
{
Q_ASSERT((int)ScrollbarAuto == (int)Qt::ScrollBarAsNeeded);
Q_ASSERT((int)ScrollbarAlwaysOff == (int)Qt::ScrollBarAlwaysOff);
Q_ASSERT((int)ScrollbarAlwaysOn == (int)Qt::ScrollBarAlwaysOn);
- d->verticalScrollBarPolicy = policy;
- if (d->frame->view())
- d->frame->view()->setVScrollbarMode((ScrollbarMode)policy);
-}
-
-/*!
- \property QWebFrame::horizontalScrollBarPolicy
-
- This property defines the horizontal scrollbar policy.
-
- \sa Qt::ScrollBarPolicy
-*/
-Qt::ScrollBarPolicy QWebFrame::horizontalScrollBarPolicy() const
-{
- return d->horizontalScrollBarPolicy;
-}
-
-void QWebFrame::setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy policy)
-{
- d->horizontalScrollBarPolicy = policy;
- if (d->frame->view())
- d->frame->view()->setHScrollbarMode((ScrollbarMode)policy);
+ if (orientation == Qt::Horizontal) {
+ d->horizontalScrollBarPolicy = policy;
+ if (d->frame->view())
+ d->frame->view()->setHScrollbarMode((ScrollbarMode)policy);
+ } else {
+ d->verticalScrollBarPolicy = policy;
+ if (d->frame->view())
+ d->frame->view()->setVScrollbarMode((ScrollbarMode)policy);
+ }
}
/*!
@@ -543,7 +530,7 @@
if (!d->frame->view() || !d->frame->renderer())
return;
- layout();
+ d->frame->view()->layoutIfNeededRecursive();
GraphicsContext ctx(painter);
QVector<QRect> vector = clip.rects();
@@ -553,30 +540,34 @@
}
/*!
- \property QWebFrame::textZoomFactor
-
- This property defines the zoom factor for all text in percent.
+ Render the frame into \a painter.
*/
-
-void QWebFrame::setTextZoomFactor(int percent)
+void QWebFrame::render(QPainter *painter)
{
- d->frame->setZoomFactor(percent, /*isTextOnly*/true);
-}
-
-int QWebFrame::textZoomFactor() const
-{
- return d->frame->zoomFactor();
-}
-
-/*!
- Ensure that the content of the frame and all subframes are correctly layouted.
-*/
-void QWebFrame::layout()
-{
- if (!d->frame->view())
+ if (!d->frame->view() || !d->frame->renderer())
return;
d->frame->view()->layoutIfNeededRecursive();
+
+ GraphicsContext ctx(painter);
+ WebCore::FrameView* view = d->frame->view();
+ view->paint(&ctx, view->frameGeometry());
+}
+
+/*!
+ \property QWebFrame::textSizeMultiplier
+
+ This property defines the scaling factor for all text in the frame.
+*/
+
+void QWebFrame::setTextSizeMultiplier(qreal factor)
+{
+ d->frame->setZoomFactor(factor, /*isTextOnly*/true);
+}
+
+qreal QWebFrame::textSizeMultiplier() const
+{
+ return qreal(d->frame->zoomFactor()) / 100.;
}
/*!
@@ -628,10 +619,10 @@
/*!
- \fn void QWebFrame::cleared()
+ \fn void QWebFrame::javaScriptWindowObjectCleared()
- This signal is emitted whenever the content of the frame is cleared
- (e.g. before starting a new load).
+ This signal is emitted whenever the global window object of the JavaScript environment
+ is cleared (e.g. before starting a new load).
*/
/*!
@@ -664,15 +655,6 @@
\sa url()
*/
-/*!
- \fn void QWebFrame::hoveringOverLink(const QString &link, const QString &title, const QString &textContent)
-
- This signal is emitted whenever the mouse cursor is hovering over a
- link. It can be used to display information about the link in
- e.g. the status bar. The signal arguments consist of the \a link destination, the \a title and the
- link text as \a textContent .
-*/
-
/*!
\fn void QWebFrame::loadStarted()
@@ -687,7 +669,7 @@
*/
/*!
- \fn void QWebFrame::initialLayoutComplete()
+ \fn void QWebFrame::initialLayoutCompleted()
This signal is emitted when the first (initial) layout of the frame
has happened. This is the earliest time something can be shown on
@@ -695,7 +677,7 @@
*/
/*!
- \fn void QWebFrame::iconLoaded()
+ \fn void QWebFrame::iconChanged()
This signal is emitted when the icon ("favicon") associated with the frame has been loaded.
*/
diff --git a/WebKit/qt/Api/qwebframe.h b/WebKit/qt/Api/qwebframe.h
index 0f03daf..46ef165 100644
--- a/WebKit/qt/Api/qwebframe.h
+++ b/WebKit/qt/Api/qwebframe.h
@@ -26,6 +26,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qurl.h>
+#include <QtGui/qicon.h>
#if QT_VERSION >= 0x040400
#include <QtNetwork/qnetworkaccessmanager.h>
#endif
@@ -56,9 +57,10 @@
class QWEBKIT_EXPORT QWebFrame : public QObject
{
Q_OBJECT
- Q_PROPERTY(Qt::ScrollBarPolicy verticalScrollBarPolicy READ verticalScrollBarPolicy WRITE setVerticalScrollBarPolicy)
- Q_PROPERTY(Qt::ScrollBarPolicy horizontalScrollBarPolicy READ horizontalScrollBarPolicy WRITE setHorizontalScrollBarPolicy)
- Q_PROPERTY(int textZoomFactor READ textZoomFactor WRITE setTextZoomFactor)
+ Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier)
+ Q_PROPERTY(QString title READ title)
+ Q_PROPERTY(QUrl url READ url)
+ Q_PROPERTY(QIcon icon READ icon)
private:
QWebFrame(QWebPage *parent, QWebFrameData *frameData);
QWebFrame(QWebFrame *parent, QWebFrameData *frameData);
@@ -79,24 +81,22 @@
void setHtml(const QByteArray &html, const QUrl &baseUrl = QUrl());
void setContent(const QByteArray &data, const QString &mimeType = QString(), const QUrl &baseUrl = QUrl());
- void addToJSWindowObject(const QString &name, QObject *object);
- QString markup() const;
- QString innerText() const;
+ void addToJavaScriptWindowObject(const QString &name, QObject *object);
+ QString toHtml() const;
+ QString toPlainText() const;
QString renderTreeDump() const;
QString title() const;
QUrl url() const;
- QPixmap icon() const;
+ QIcon icon() const;
- QString name() const;
+ QString frameName() const;
QWebFrame *parentFrame() const;
QList<QWebFrame*> childFrames() const;
- Qt::ScrollBarPolicy verticalScrollBarPolicy() const;
- void setVerticalScrollBarPolicy(Qt::ScrollBarPolicy);
- Qt::ScrollBarPolicy horizontalScrollBarPolicy() const;
- void setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy);
+ Qt::ScrollBarPolicy scrollBarPolicy(Qt::Orientation orientation) const;
+ void setScrollBarPolicy(Qt::Orientation orientation, Qt::ScrollBarPolicy policy);
void setScrollBarValue(Qt::Orientation orientation, int value);
int scrollBarValue(Qt::Orientation orientation) const;
@@ -104,10 +104,10 @@
int scrollBarMaximum(Qt::Orientation orientation) const;
void render(QPainter *painter, const QRegion &clip);
- void layout();
+ void render(QPainter *painter);
- void setTextZoomFactor(int percent);
- int textZoomFactor() const;
+ void setTextSizeMultiplier(qreal factor);
+ qreal textSizeMultiplier() const;
QPoint pos() const;
QRect geometry() const;
@@ -116,25 +116,18 @@
QString evaluateJavaScript(const QString& scriptSource);
Q_SIGNALS:
- void cleared();
+ void javaScriptWindowObjectCleared();
void loadDone(bool ok);
void provisionalLoad();
void titleChanged(const QString &title);
- void hoveringOverLink(const QString &link, const QString &title, const QString &textContent);
void urlChanged(const QUrl &url);
void loadStarted();
void loadFinished();
- /**
- * Signal is emitted when the mainframe()'s initial layout is completed.
- */
- void initialLayoutComplete();
-
- /**
- * Signal is emitted when an icon ("favicon") is loaded from the site.
- */
- void iconLoaded();
+ void initialLayoutCompleted();
+
+ void iconChanged();
private:
friend class QWebPage;
diff --git a/WebKit/qt/Api/qwebhistory.cpp b/WebKit/qt/Api/qwebhistory.cpp
index 10127a4..a2183bc 100644
--- a/WebKit/qt/Api/qwebhistory.cpp
+++ b/WebKit/qt/Api/qwebhistory.cpp
@@ -73,9 +73,9 @@
/*!
- The current url associated with the history item.
+ The url associated with the history item.
*/
-QUrl QWebHistoryItem::currentUrl() const
+QUrl QWebHistoryItem::url() const
{
return QUrl(d->item->url().string());
}
@@ -103,7 +103,7 @@
/*!
The icon associated with the history item.
*/
-QPixmap QWebHistoryItem::icon() const
+QIcon QWebHistoryItem::icon() const
{
return *d->item->icon()->getPixmap();
}
@@ -217,7 +217,7 @@
/*!
goes back one history item.
*/
-void QWebHistory::goBack()
+void QWebHistory::back()
{
d->lst->goBack();
}
@@ -225,7 +225,7 @@
/*!
goes forward one history item.
*/
-void QWebHistory::goForward()
+void QWebHistory::forward()
{
d->lst->goBack();
}
@@ -271,7 +271,7 @@
/*!
returns the item at index \a i.
*/
-QWebHistoryItem QWebHistory::itemAtIndex(int i) const
+QWebHistoryItem QWebHistory::itemAt(int i) const
{
WebCore::HistoryItem *item = d->lst->itemAtIndex(i);
@@ -279,3 +279,11 @@
return QWebHistoryItem(priv);
}
+/*!
+ Returns the total number of items in the back-forward history.
+*/
+int QWebHistory::count() const
+{
+ return d->lst->entries().size();
+}
+
diff --git a/WebKit/qt/Api/qwebhistory.h b/WebKit/qt/Api/qwebhistory.h
index 6c8a4f4..6e049bf 100644
--- a/WebKit/qt/Api/qwebhistory.h
+++ b/WebKit/qt/Api/qwebhistory.h
@@ -41,12 +41,12 @@
~QWebHistoryItem();
QUrl originalUrl() const;
- QUrl currentUrl() const;
+ QUrl url() const;
QString title() const;
QDateTime lastVisited() const;
- QPixmap icon() const;
+ QIcon icon() const;
private:
QWebHistoryItem(QWebHistoryItemPrivate *priv);
@@ -68,14 +68,16 @@
bool canGoBack() const;
bool canGoForward() const;
- void goBack();
- void goForward();
+ void back();
+ void forward();
void goToItem(const QWebHistoryItem &item);
QWebHistoryItem backItem() const;
QWebHistoryItem currentItem() const;
QWebHistoryItem forwardItem() const;
- QWebHistoryItem itemAtIndex(int i) const;
+ QWebHistoryItem itemAt(int i) const;
+
+ int count() const;
private:
QWebHistory();
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 078a314..25d2325 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -139,6 +139,8 @@
pluginFactory = 0;
#endif
insideOpenCall = false;
+ forwardUnsupportedContent = false;
+ linkPolicy = QWebPage::DontDelegateLinks;
history.d = new QWebHistoryPrivate(page->backForwardList());
memset(actions, 0, sizeof(actions));
@@ -155,20 +157,20 @@
}
#if QT_VERSION < 0x040400
-QWebPage::NavigationRequestResponse QWebPagePrivate::navigationRequested(QWebFrame *frame, const QWebNetworkRequest &request, QWebPage::NavigationType type)
+bool QWebPagePrivate::acceptNavigationRequest(QWebFrame *frame, const QWebNetworkRequest &request, QWebPage::NavigationType type)
{
if (insideOpenCall
&& frame == mainFrame)
- return QWebPage::AcceptNavigationRequest;
- return q->navigationRequested(frame, request, type);
+ return true;
+ return q->acceptNavigationRequest(frame, request, type);
}
#else
-QWebPage::NavigationRequestResponse QWebPagePrivate::navigationRequested(QWebFrame *frame, const QNetworkRequest &request, QWebPage::NavigationType type)
+bool QWebPagePrivate::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, QWebPage::NavigationType type)
{
if (insideOpenCall
&& frame == mainFrame)
- return QWebPage::AcceptNavigationRequest;
- return q->navigationRequested(frame, request, type);
+ return true;
+ return q->acceptNavigationRequest(frame, request, type);
}
#endif
@@ -198,8 +200,8 @@
case WebCore::ContextMenuItemTagCopyImageToClipboard: return QWebPage::CopyImageToClipboard;
case WebCore::ContextMenuItemTagOpenFrameInNewWindow: return QWebPage::OpenFrameInNewWindow;
case WebCore::ContextMenuItemTagCopy: return QWebPage::Copy;
- case WebCore::ContextMenuItemTagGoBack: return QWebPage::GoBack;
- case WebCore::ContextMenuItemTagGoForward: return QWebPage::GoForward;
+ case WebCore::ContextMenuItemTagGoBack: return QWebPage::Back;
+ case WebCore::ContextMenuItemTagGoForward: return QWebPage::Forward;
case WebCore::ContextMenuItemTagStop: return QWebPage::Stop;
case WebCore::ContextMenuItemTagReload: return QWebPage::Reload;
case WebCore::ContextMenuItemTagCut: return QWebPage::Cut;
@@ -294,10 +296,10 @@
bool enabled = a->isEnabled();
switch (action) {
- case QWebPage::GoBack:
+ case QWebPage::Back:
enabled = loader->canGoBackOrForward(-1);
break;
- case QWebPage::GoForward:
+ case QWebPage::Forward:
enabled = loader->canGoBackOrForward(1);
break;
case QWebPage::Stop:
@@ -327,8 +329,8 @@
void QWebPagePrivate::updateNavigationActions()
{
- updateAction(QWebPage::GoBack);
- updateAction(QWebPage::GoForward);
+ updateAction(QWebPage::Back);
+ updateAction(QWebPage::Forward);
updateAction(QWebPage::Stop);
updateAction(QWebPage::Reload);
}
@@ -581,9 +583,9 @@
break;
case Qt::Key_Backspace:
if (ev->modifiers() == Qt::ShiftModifier)
- q->triggerAction(QWebPage::GoForward);
+ q->triggerAction(QWebPage::Forward);
else
- q->triggerAction(QWebPage::GoBack);
+ q->triggerAction(QWebPage::Back);
default:
handled = false;
break;
@@ -745,8 +747,8 @@
\value OpenImageInNewWindow Open the highlighted image in a new window.
\value DownloadImageToDisk Download the highlighted image to the disk.
\value CopyImageToClipboard Copy the highlighted image to the clipboard.
- \value GoBack Navigate back in the history of navigated links.
- \value GoForward Navigate forward in the history of navigated links.
+ \value Back Navigate back in the history of navigated links.
+ \value Forward Navigate forward in the history of navigated links.
\value Stop Stop loading the current page.
\value Reload Reload the current page.
\value Cut Cut the content currently selected into the clipboard.
@@ -792,6 +794,13 @@
*/
/*!
+ \enum QWebPage::WebWindowType
+
+ \value WebBrowserWindow The window is a regular web browser window.
+ \value WebModalDialog The window acts as modal dialog.
+*/
+
+/*!
\class QWebPage
\since 4.4
\brief The QWebPage class provides a widget that is used to view and edit web documents.
@@ -810,7 +819,7 @@
{
setView(qobject_cast<QWidget *>(parent));
- connect(this, SIGNAL(loadProgressChanged(int)), this, SLOT(_q_onLoadProgressChanged(int)));
+ connect(this, SIGNAL(loadProgress(int)), this, SLOT(_q_onLoadProgressChanged(int)));
}
/*!
@@ -878,7 +887,7 @@
/*!
This function is called whenever a JavaScript program tries to print to what is the console in web browsers.
*/
-void QWebPage::javaScriptConsoleMessage(const QString& message, unsigned int lineNumber, const QString& sourceID)
+void QWebPage::javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
{
}
@@ -914,14 +923,14 @@
}
/*!
- This function is called whenever WebKit wants to create a new window, for example as a result of
+ 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.
*/
-QWebPage *QWebPage::createWindow()
+QWebPage *QWebPage::createWindow(WebWindowType type)
{
QWebView *webView = qobject_cast<QWebView *>(d->view);
if (webView) {
- QWebView *newView = webView->createWindow();
+ QWebView *newView = webView->createWindow(type);
if (newView)
return newView->page();
}
@@ -929,14 +938,6 @@
}
/*!
- This function is called whenever WebKit wants to create a new window that should act as a modal dialog.
-*/
-QWebPage *QWebPage::createModalDialog()
-{
- return 0;
-}
-
-/*!
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.
@@ -1019,10 +1020,10 @@
case CopyImageToClipboard:
QApplication::clipboard()->setPixmap(d->currentContext.image());
break;
- case GoBack:
+ case Back:
d->page->goBack();
break;
- case GoForward:
+ case Forward:
d->page->goForward();
break;
case Stop:
@@ -1186,14 +1187,38 @@
}
+/*!
+ \fn bool QWebPage::acceptNavigationRequest(QWebFrame *frame, const QWebNetworkRequest &request, QWebPage::NavigationType type)
+
+ This function is called whenever WebKit requests to navigate \a frame to the resource specified by \a request by means of
+ the specified navigation type \a type.
+
+ The default implementation interprets the page's linkDelegationPolicy and emits linkClicked accordingly or returns true
+ to let QWebPage handle the navigation itself.
+*/
#if QT_VERSION < 0x040400
-QWebPage::NavigationRequestResponse QWebPage::navigationRequested(QWebFrame *frame, const QWebNetworkRequest &request, QWebPage::NavigationType type)
+bool QWebPage::acceptNavigationRequest(QWebFrame *frame, const QWebNetworkRequest &request, QWebPage::NavigationType type)
#else
-QWebPage::NavigationRequestResponse QWebPage::navigationRequested(QWebFrame *frame, const QNetworkRequest &request, QWebPage::NavigationType type)
+bool QWebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, QWebPage::NavigationType type)
#endif
{
- Q_UNUSED(request)
- return AcceptNavigationRequest;
+ if (type == NavigationTypeLinkClicked) {
+ switch (d->linkPolicy) {
+ case DontDelegateLinks:
+ return true;
+
+ case DelegateExternalLinks:
+ if (WebCore::FrameLoader::shouldTreatSchemeAsLocal(request.url().scheme()))
+ return true;
+ emit linkClicked(request.url());
+ return false;
+
+ case DelegateAllLinks:
+ emit linkClicked(request.url());
+ return false;
+ }
+ }
+ return true;
}
/*!
@@ -1254,13 +1279,13 @@
text = contextMenuItemTagCopyImageToClipboard();
break;
- case GoBack:
+ case Back:
text = contextMenuItemTagGoBack();
#if QT_VERSION >= 0x040400
icon = style->standardIcon(QStyle::SP_ArrowBack);
#endif
break;
- case GoForward:
+ case Forward:
text = contextMenuItemTagGoForward();
#if QT_VERSION >= 0x040400
icon = style->standardIcon(QStyle::SP_ArrowForward);
@@ -1476,10 +1501,48 @@
}
/*!
+ \property QWebPage::forwardUnsupportedContent
+
+ This property defines whether QWebPage should forward unsupported content through the
+ unsupportedContent signal. If disabled the download of such content is aborted immediately.
+
+ By default unsupported content is not forwarded.
+*/
+
+void QWebPage::setForwardUnsupportedContent(bool forward)
+{
+ d->forwardUnsupportedContent = forward;
+}
+
+bool QWebPage::forwardUnsupportedContent() const
+{
+ return d->forwardUnsupportedContent;
+}
+
+/*!
+ \property QWebPage::linkDelegationPolicy
+
+ This property defines how QWebPage should delegate the handling of links through the
+ linkClicked() signal.
+
+ The default is to delegate no links.
+*/
+
+void QWebPage::setLinkDelegationPolicy(LinkDelegationPolicy policy)
+{
+ d->linkPolicy = policy;
+}
+
+QWebPage::LinkDelegationPolicy QWebPage::linkDelegationPolicy() const
+{
+ return d->linkPolicy;
+}
+
+/*!
Finds the next occurrence of the string, \a subString, in the page, using the given \a options.
Returns true of \a subString was found and selects the match visually; otherwise returns false;
*/
-bool QWebPage::find(const QString &subString, FindFlags options)
+bool QWebPage::findText(const QString &subString, FindFlags options)
{
::TextCaseSensitivity caseSensitivity = ::TextCaseInsensitive;
if (options & FindCaseSensitively)
@@ -1497,7 +1560,7 @@
/*!
Returns a pointe to the page's settings object.
*/
-QWebSettings *QWebPage::settings()
+QWebSettings *QWebPage::settings() const
{
return d->settings;
}
@@ -1589,7 +1652,7 @@
This function is called when a user agent for HTTP requests is needed. You can re-implement this
function to dynamically return different user agent's for different urls, based on the \a url parameter.
*/
-QString QWebPage::userAgentFor(const QUrl& url) const
+QString QWebPage::userAgentForUrl(const QUrl& url) const
{
Q_UNUSED(url)
return QLatin1String("Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en) AppleWebKit/523.15 (KHTML, like Gecko) Safari/419.3 Qt");
@@ -1712,15 +1775,16 @@
}
/*!
- \fn void QWebPage::loadProgressChanged(int progress)
+ \fn void QWebPage::loadProgress(int progress)
This signal is emitted when the global progress status changes.
- The current value is provided by \a progress in percent.
+ The current value is provided by \a progress and scales from 0 to 100,
+ which is the default range of QProgressBar.
It accumulates changes from all the child frames.
*/
/*!
- \fn void QWebPage::hoveringOverLink(const QString &link, const QString &title, const QString &textContent)
+ \fn void QWebPage::linkHovered(const QString &link, const QString &title, const QString &textContent)
This signal is emitted when the mouse is hovering over a link.
The first parameter is the \a link url, the second is the link \a title
@@ -1729,7 +1793,7 @@
*/
/*!
- \fn void QWebPage::statusBarTextChanged(const QString& text)
+ \fn void QWebPage::statusBarMessage(const QString& text)
This signal is emitted when the statusbar \a text is changed by the page.
*/
@@ -1747,14 +1811,14 @@
*/
/*!
- \fn void QWebPage::geometryChangeRequest(const QRect& geom)
+ \fn void QWebPage::geometryChangeRequested(const QRect& geom)
This signal is emitted whenever the document wants to change the position and size of the
page to \a geom. This can happen for example through JavaScript.
*/
/*!
- \fn void QWebPage::updateRequest(const QRect& dirtyRect)
+ \fn void QWebPage::repaintRequested(const QRect& dirtyRect)
This signal is emitted whenever this QWebPage should be updated and no view was set.
\a dirtyRect contains the area that needs to be updated. To paint the QWebPage get
@@ -1767,7 +1831,7 @@
*/
/*!
- \fn void QWebPage::scrollRequest(int dy, int dy, const QRect& rectToScroll)
+ \fn void QWebPage::scrollRequested(int dy, int dy, const QRect& rectToScroll)
This signal is emitted whenever the content given by \a rectToScroll needs
to be scrolled dx and dy downwards and no view was set.
@@ -1777,15 +1841,17 @@
*/
/*!
- \fn void QWebPage::handleUnsupportedContent(QNetworkReply *reply)
+ \fn void QWebPage::unsupportedContent(QNetworkReply *reply)
This signals is emitted when webkit cannot handle a link the user navigated to.
At signal emissions time the meta data of the QNetworkReply is available.
+
+ \note This signal is only emitted if the forwardUnsupportedContent property is set to true.
*/
/*!
- \fn void QWebPage::download(const QNetworkRequest &request)
+ \fn void QWebPage::downloadRequested(const QNetworkRequest &request)
This signal is emitted when the user decides to download a link.
*/
@@ -1799,4 +1865,34 @@
slot.
*/
+/*!
+ \fn void QWebPage::linkClicked(const QUrl &url)
+
+ This signal is emitted whenever the user clicks on a link and the page's linkDelegationPolicy
+ property is set to delegate the link handling for the specified \a url.
+
+ By default no links are delegated and are handled by QWebPage instead.
+*/
+
+/*!
+ \fn void QWebPage::toolBarVisibilityChangeRequested(bool visible)
+
+ This signal is emitted whenever the visibility of the toolbar in a web browser
+ window that hosts QWebPage should be changed to \a visible.
+*/
+
+/*!
+ \fn void QWebPage::statusBarVisibilityChangeRequested(bool visible)
+
+ This signal is emitted whenever the visibility of the statusbar in a web browser
+ window that hosts QWebPage should be changed to \a visible.
+*/
+
+/*!
+ \fn void QWebPage::menuBarVisibilityChangeRequested(bool visible)
+
+ This signal is emitted whenever the visibility of the menubar in a web browser
+ window that hosts QWebPage should be changed to \a visible.
+*/
+
#include "moc_qwebpage.cpp"
diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index 9656897..0fc231c 100644
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -65,16 +65,14 @@
Q_PROPERTY(bool modified READ isModified)
Q_PROPERTY(QString selectedText READ selectedText)
Q_PROPERTY(QSize viewportSize READ viewportSize WRITE setViewportSize)
+ Q_PROPERTY(bool forwardUnsupportedContent READ forwardUnsupportedContent WRITE setForwardUnsupportedContent)
+ Q_PROPERTY(LinkDelegationPolicy linkDelegationPolicy READ linkDelegationPolicy WRITE setLinkDelegationPolicy)
+ Q_ENUMS(LinkDelegationPolicy NavigationType WebAction)
public:
- enum NavigationRequestResponse {
- AcceptNavigationRequest,
- IgnoreNavigationRequest
- };
-
enum NavigationType {
NavigationTypeLinkClicked,
NavigationTypeFormSubmitted,
- NavigationTypeBackForward,
+ NavigationTypeBackOrForward,
NavigationTypeReload,
NavigationTypeFormResubmitted,
NavigationTypeOther
@@ -95,8 +93,8 @@
DownloadImageToDisk,
CopyImageToClipboard,
- GoBack, // ###GoBackward instead?
- GoForward,
+ Back,
+ Forward,
Stop,
Reload,
@@ -147,12 +145,23 @@
};
enum FindFlag {
- FindBackward,
- FindCaseSensitively,
- FindWrapsAroundDocument
+ FindBackward = 1,
+ FindCaseSensitively = 2,
+ FindWrapsAroundDocument = 4
};
Q_DECLARE_FLAGS(FindFlags, FindFlag);
+ enum LinkDelegationPolicy {
+ DontDelegateLinks,
+ DelegateExternalLinks,
+ DelegateAllLinks
+ };
+
+ enum WebWindowType {
+ WebBrowserWindow,
+ WebModalDialog
+ };
+
explicit QWebPage(QObject *parent = 0);
~QWebPage();
@@ -160,8 +169,7 @@
QWebFrame *currentFrame() const;
QWebHistory *history() const;
-
- QWebSettings *settings();
+ QWebSettings *settings() const;
void setView(QWidget *view);
QWidget *view() const;
@@ -199,52 +207,56 @@
void setViewportSize(const QSize &size) const;
virtual bool event(QEvent*);
- virtual bool focusNextPrevChild(bool next);
+ bool focusNextPrevChild(bool next);
QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
- bool find(const QString &subString, FindFlags options = 0);
+ bool findText(const QString &subString, FindFlags options = 0);
+
+ void setForwardUnsupportedContent(bool forward);
+ bool forwardUnsupportedContent() const;
+
+ void setLinkDelegationPolicy(LinkDelegationPolicy policy);
+ LinkDelegationPolicy linkDelegationPolicy() const;
Q_SIGNALS:
- void loadProgressChanged(int progress);
- void hoveringOverLink(const QString &link, const QString &title, const QString &textContent = QString());
- void statusBarTextChanged(const QString& text);
+ void loadProgress(int progress);
+ void linkHovered(const QString &link, const QString &title, const QString &textContent);
+ void statusBarMessage(const QString& text);
void selectionChanged();
void frameCreated(QWebFrame *frame);
- void geometryChangeRequest(const QRect& geom);
- void updateRequest(const QRect& dirtyRect);
- void scrollRequest(int dx, int dy, const QRect& scrollViewRect);
+ void geometryChangeRequested(const QRect& geom);
+ void repaintRequested(const QRect& dirtyRect);
+ void scrollRequested(int dx, int dy, const QRect& scrollViewRect);
+ void linkClicked(const QUrl &url);
+
+ void toolBarVisibilityChangeRequested(bool visible);
+ void statusBarVisibilityChangeRequested(bool visible);
+ void menuBarVisibilityChangeRequested(bool visible);
#if QT_VERSION >= 0x040400
- void handleUnsupportedContent(QNetworkReply *reply);
- void download(const QNetworkRequest &request);
+ void unsupportedContent(QNetworkReply *reply);
+ void downloadRequested(const QNetworkRequest &request);
#endif
- //void addEmbeddableWidget(QWidget *widget);
- //void addEmbeddableWidget(const QString &classid, QWidget *widget);
- //void removeEmbeddableWidget(QWidget *widget);
- //QHash<QString, QWidget *> embeddableWidgets() const;
- //void clearEmbeddableWidgets();
-
void microFocusChanged();
protected:
- virtual QWebPage *createWindow();
- virtual QWebPage *createModalDialog();
+ virtual QWebPage *createWindow(WebWindowType type);
virtual QObject *createPlugin(const QString &classid, const QUrl &url, const QStringList ¶mNames, const QStringList ¶mValues);
#if QT_VERSION < 0x040400
- virtual NavigationRequestResponse navigationRequested(QWebFrame *frame, const QWebNetworkRequest &request, NavigationType type);
+ virtual bool acceptNavigationRequest(QWebFrame *frame, const QWebNetworkRequest &request, NavigationType type);
#else
- virtual NavigationRequestResponse navigationRequested(QWebFrame *frame, const QNetworkRequest &request, NavigationType type);
+ virtual bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type);
#endif
virtual QString chooseFile(QWebFrame *originatingFrame, const QString& oldFile);
virtual void javaScriptAlert(QWebFrame *originatingFrame, const QString& msg);
virtual bool javaScriptConfirm(QWebFrame *originatingFrame, const QString& msg);
virtual bool javaScriptPrompt(QWebFrame *originatingFrame, const QString& msg, const QString& defaultValue, QString* result);
- virtual void javaScriptConsoleMessage(const QString& message, unsigned int lineNumber, const QString& sourceID);
+ virtual void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID);
- virtual QString userAgentFor(const QUrl& url) const;
+ virtual QString userAgentForUrl(const QUrl& url) const;
private:
Q_PRIVATE_SLOT(d, void _q_onLoadProgressChanged(int))
diff --git a/WebKit/qt/Api/qwebpage_p.h b/WebKit/qt/Api/qwebpage_p.h
index 09c2598..717f779 100644
--- a/WebKit/qt/Api/qwebpage_p.h
+++ b/WebKit/qt/Api/qwebpage_p.h
@@ -140,7 +140,7 @@
quint64 m_bytesReceived;
#if QT_VERSION < 0x040400
- QWebPage::NavigationRequestResponse navigationRequested(QWebFrame *frame, const QWebNetworkRequest &request, QWebPage::NavigationType type);
+ bool acceptNavigationRequest(QWebFrame *frame, const QWebNetworkRequest &request, QWebPage::NavigationType type);
QWebNetworkInterface *networkInterface;
#ifndef QT_NO_NETWORKPROXY
@@ -148,10 +148,13 @@
#endif
#else
- QWebPage::NavigationRequestResponse navigationRequested(QWebFrame *frame, const QNetworkRequest &request, QWebPage::NavigationType type);
+ bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, QWebPage::NavigationType type);
QNetworkAccessManager *networkManager;
#endif
+ bool forwardUnsupportedContent;
+ QWebPage::LinkDelegationPolicy linkPolicy;
+
QSize viewportSize;
QWebHistory history;
QWebPageContext currentContext;
diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index a4f98d9..2f05b65 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -66,7 +66,7 @@
void QWebSettingsPrivate::apply()
{
if (settings) {
- QWebSettingsPrivate *global = QWebSettings::defaultSettings()->d;
+ QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
QString family = fontFamilies.value(QWebSettings::StandardFont,
global->fontFamilies.value(QWebSettings::StandardFont));
@@ -150,12 +150,12 @@
}
/*!
- Returns the global default settings object.
+ Returns the global settings object.
Any setting changed on the default object is automatically applied to all
QWebPage instances where the particular setting is not overriden already.
*/
-QWebSettings *QWebSettings::defaultSettings()
+QWebSettings *QWebSettings::globalSettings()
{
static QWebSettings *global = 0;
if (!global)
@@ -232,7 +232,7 @@
{
int defaultValue = 0;
if (d->settings) {
- QWebSettingsPrivate *global = QWebSettings::defaultSettings()->d;
+ QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
defaultValue = global->fontSizes.value(type);
}
return d->fontSizes.value(type, defaultValue);
@@ -258,7 +258,7 @@
\sa userStyleSheetLocation
*/
-void QWebSettings::setUserStyleSheetLocation(const QUrl &location)
+void QWebSettings::setUserStyleSheetUrl(const QUrl &location)
{
d->userStyleSheetLocation = location;
d->apply();
@@ -269,39 +269,46 @@
\sa setUserStyleSheetLocation
*/
-QUrl QWebSettings::userStyleSheetLocation() const
+QUrl QWebSettings::userStyleSheetUrl() const
{
return d->userStyleSheetLocation;
}
/*!
- Enables or disables the icon database. The icon database is used to store favicons
+ Sets the \a path of the icon database. The icon database is used to store favicons
associated with web sites.
- If \a enabled is true then \a location must be specified and point to an existing directory
- where the icons are stored.
+ The \a path must point to an existing directory where the icons are stored.
+
+ If \a path is empty then the icon database is disabled.
*/
-void QWebSettings::setIconDatabaseEnabled(bool enabled, const QString &location)
+void QWebSettings::setIconDatabasePath(const QString &path)
{
WebCore::iconDatabase()->delayDatabaseCleanup();
- WebCore::iconDatabase()->setEnabled(enabled);
- if (enabled) {
- QFileInfo info(location);
+
+ if (!path.isEmpty()) {
+ WebCore::iconDatabase()->setEnabled(true);
+ QFileInfo info(path);
if (info.isDir() && info.isWritable())
- WebCore::iconDatabase()->open(location);
+ WebCore::iconDatabase()->open(path);
} else {
+ WebCore::iconDatabase()->setEnabled(false);
WebCore::iconDatabase()->close();
}
}
/*!
- Returns whether the icon database is enabled or not.
+ Returns whether the path of the icon database or an empty string if the icon database is disabled.
- \sa setIconDatabaseEnabled
+ \sa setIconDatabasePath
*/
-bool QWebSettings::iconDatabaseEnabled()
+QString QWebSettings::iconDatabasePath()
{
- return WebCore::iconDatabase()->isEnabled() && WebCore::iconDatabase()->isOpen();
+ if (WebCore::iconDatabase()->isEnabled() && WebCore::iconDatabase()->isOpen()) {
+ return WebCore::iconDatabase()->databasePath();
+ } else {
+ return QString();
+ }
}
/*!
@@ -312,7 +319,7 @@
*/
void QWebSettings::clearIconDatabase()
{
- if (iconDatabaseEnabled())
+ if (WebCore::iconDatabase()->isEnabled() && WebCore::iconDatabase()->isOpen())
WebCore::iconDatabase()->removeAllIcons();
}
@@ -320,7 +327,7 @@
Returns the site icon for \a url
If there is no icon for the url a null QIcon is returned.
*/
-QPixmap QWebSettings::iconForUrl(const QUrl &url)
+QIcon QWebSettings::iconForUrl(const QUrl &url)
{
WebCore::Image* image = WebCore::iconDatabase()->iconForPageURL(WebCore::KURL(url).string(),
WebCore::IntSize(16, 16));
@@ -355,11 +362,19 @@
}
/*!
- @internal
+ Sets the maximum number of pages to hold in the memory cache to \a pages.
*/
-void QWebSettings::setPageCacheCapacity(int numberOfPages)
+void QWebSettings::setMaximumPagesInCache(int pages)
{
- WebCore::pageCache()->setCapacity(qMax(0, numberOfPages));
+ WebCore::pageCache()->setCapacity(qMax(0, pages));
+}
+
+/*
+ Returns the maximum number of web pages that are kept in the memory cache.
+*/
+int QWebSettings::maximumPagesInCache()
+{
+ return WebCore::pageCache()->capacity();
}
/*!
@@ -373,36 +388,36 @@
}
/*!
- Sets the default font family to \a family for the specified \a type of font.
+ Sets the default font family to \a family for the specified \a which of font.
*/
-void QWebSettings::setFontFamily(FontType type, const QString &family)
+void QWebSettings::setFontFamily(FontFamily which, const QString &family)
{
- d->fontFamilies.insert(type, family);
+ d->fontFamilies.insert(which, family);
d->apply();
}
/*!
- Returns the default font family to \a family for the specified \a type of font.
+ Returns the default font family to \a family for the specified \a which of font.
*/
-QString QWebSettings::fontFamily(FontType type) const
+QString QWebSettings::fontFamily(FontFamily which) const
{
QString defaultValue;
if (d->settings) {
- QWebSettingsPrivate *global = QWebSettings::defaultSettings()->d;
- defaultValue = global->fontFamilies.value(type);
+ QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
+ defaultValue = global->fontFamilies.value(which);
}
- return d->fontFamilies.value(type, defaultValue);
+ return d->fontFamilies.value(which, defaultValue);
}
/*!
- Resets the font family for specified \a type of fonts in a web page to the default.
+ Resets the font family for specified \a which of fonts in a web page to the default.
This function has not effect on the default QWebSettings instance.
*/
-void QWebSettings::resetFontFamily(FontType type)
+void QWebSettings::resetFontFamily(FontFamily which)
{
if (d->settings) {
- d->fontFamilies.remove(type);
+ d->fontFamilies.remove(which);
d->apply();
}
}
@@ -423,18 +438,18 @@
{
bool defaultValue = false;
if (d->settings) {
- QWebSettingsPrivate *global = QWebSettings::defaultSettings()->d;
+ QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
defaultValue = global->attributes.value(attr);
}
return d->attributes.value(attr, defaultValue);
}
/*!
- Clears the setting of \a attr. The global default for \a attr will be used instead.
+ Resets the setting of \a attr. The global default for \a attr will be used instead.
This function has not effect on the default QWebSettings instance.
*/
-void QWebSettings::clearAttribute(WebAttribute attr)
+void QWebSettings::resetAttribute(WebAttribute attr)
{
if (d->settings) {
d->attributes.remove(attr);
diff --git a/WebKit/qt/Api/qwebsettings.h b/WebKit/qt/Api/qwebsettings.h
index 3f84b57..9f7a23c 100644
--- a/WebKit/qt/Api/qwebsettings.h
+++ b/WebKit/qt/Api/qwebsettings.h
@@ -27,6 +27,7 @@
#include <QtCore/qstring.h>
#include <QtGui/qpixmap.h>
+#include <QtGui/qicon.h>
#include <QtCore/qshareddata.h>
namespace WebCore
@@ -43,7 +44,7 @@
class QWEBKIT_EXPORT QWebSettings
{
public:
- enum FontType {
+ enum FontFamily {
StandardFont,
FixedFont,
SerifFont,
@@ -65,8 +66,8 @@
enum WebGraphic {
MissingImageGraphic,
MissingPluginGraphic,
- DefaultFaviconGraphic,
- TextAreaResizeCornerGraphic
+ DefaultFrameIconGraphic,
+ TextAreaSizeGripCornerGraphic
};
enum FontSize {
MinimumFontSize,
@@ -75,32 +76,33 @@
DefaultFixedFontSize
};
- static QWebSettings *defaultSettings();
+ static QWebSettings *globalSettings();
- void setFontFamily(FontType type, const QString &family);
- QString fontFamily(FontType type) const;
- void resetFontFamily(FontType type);
+ void setFontFamily(FontFamily which, const QString &family);
+ QString fontFamily(FontFamily which) const;
+ void resetFontFamily(FontFamily which);
void setFontSize(FontSize type, int size);
int fontSize(FontSize type) const;
void resetFontSize(FontSize type);
- void setAttribute(WebAttribute attr, bool on = true);
+ void setAttribute(WebAttribute attr, bool on);
bool testAttribute(WebAttribute attr) const;
- void clearAttribute(WebAttribute attr);
+ void resetAttribute(WebAttribute attr);
- void setUserStyleSheetLocation(const QUrl &location);
- QUrl userStyleSheetLocation() const;
+ void setUserStyleSheetUrl(const QUrl &location);
+ QUrl userStyleSheetUrl() const;
- static void setIconDatabaseEnabled(bool enabled, const QString &location = QString());
- static bool iconDatabaseEnabled();
+ static void setIconDatabasePath(const QString &location);
+ static QString iconDatabasePath();
static void clearIconDatabase();
- static QPixmap iconForUrl(const QUrl &url);
+ static QIcon iconForUrl(const QUrl &url);
static void setWebGraphic(WebGraphic type, const QPixmap &graphic);
static QPixmap webGraphic(WebGraphic type);
- static void setPageCacheCapacity(int numberOfPages);
+ static void setMaximumPagesInCache(int pages);
+ static int maximumPagesInCache();
static void setObjectCacheCapacities(int cacheMinDeadCapacity, int cacheMaxDead, int totalCapacity);
private:
diff --git a/WebKit/qt/Api/qwebview.cpp b/WebKit/qt/Api/qwebview.cpp
index c6482f4..5afc0e2 100644
--- a/WebKit/qt/Api/qwebview.cpp
+++ b/WebKit/qt/Api/qwebview.cpp
@@ -114,15 +114,17 @@
this, SIGNAL(loadFinished()));
connect(mainFrame, SIGNAL(titleChanged(const QString&)),
this, SIGNAL(titleChanged(const QString&)));
- connect(mainFrame, SIGNAL(iconLoaded()),
- this, SIGNAL(iconLoaded()));
+ connect(mainFrame, SIGNAL(iconChanged()),
+ this, SIGNAL(iconChanged()));
connect(mainFrame, SIGNAL(urlChanged(const QUrl &)),
this, SIGNAL(urlChanged(const QUrl &)));
- connect(d->page, SIGNAL(loadProgressChanged(int)),
- this, SIGNAL(loadProgressChanged(int)));
- connect(d->page, SIGNAL(statusBarTextChanged(const QString &)),
- this, SIGNAL(statusBarTextChanged(const QString &)));
+ connect(d->page, SIGNAL(loadProgress(int)),
+ this, SIGNAL(loadProgress(int)));
+ connect(d->page, SIGNAL(statusBarMessage(const QString &)),
+ this, SIGNAL(statusBarMessage(const QString &)));
+ connect(d->page, SIGNAL(linkClicked(const QUrl &)),
+ this, SIGNAL(linkClicked(const QUrl &)));
connect(d->page, SIGNAL(microFocusChanged()),
this, SLOT(updateMicroFocus()));
@@ -175,9 +177,10 @@
/*!
Sets the content of the web view to the specified content \a data. If the \a mimeType argument
- is empty it is assumed that the content is HTML.
+ is empty it is currently assumed that the content is HTML but in future versions we may introduce
+ auto-detection.
- External objects referenced in the HTML document are located relative to \a baseUrl.
+ External objects referenced in the content are located relative to \a baseUrl.
*/
void QWebView::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl)
{
@@ -234,11 +237,11 @@
\property QWebView::icon
\brief the icon associated with the web page currently viewed.
*/
-QPixmap QWebView::icon() const
+QIcon QWebView::icon() const
{
if (d->page)
return d->page->mainFrame()->icon();
- return QPixmap();
+ return QIcon();
}
/*!
@@ -255,7 +258,7 @@
/*!
Returns a pointer to a QAction that encapsulates the specified web action \a action.
*/
-QAction *QWebView::action(QWebPage::WebAction action) const
+QAction *QWebView::pageAction(QWebPage::WebAction action) const
{
return page()->action(action);
}
@@ -267,7 +270,7 @@
\snippet doc/src/snippets/code/src.3rdparty.webkit.WebKit.qt.Api.qwebview.cpp 2
*/
-void QWebView::triggerAction(QWebPage::WebAction action, bool checked)
+void QWebView::triggerPageAction(QWebPage::WebAction action, bool checked)
{
page()->triggerAction(action, checked);
}
@@ -286,11 +289,13 @@
return false;
}
+/*
Qt::TextInteractionFlags QWebView::textInteractionFlags() const
{
// ### FIXME (add to page)
return Qt::TextInteractionFlags();
}
+*/
/*!
\property QWebView::textInteractionFlags
@@ -299,11 +304,13 @@
Specifies how the user can interact with the text on the page.
*/
+/*
void QWebView::setTextInteractionFlags(Qt::TextInteractionFlags flags)
{
Q_UNUSED(flags)
// ### FIXME (add to page)
}
+*/
/*!
\reimp
@@ -314,29 +321,29 @@
}
/*!
- \property QWebView::textZoomFactor
+ \property QWebView::textSizeMultiplier
- This property defines the zoom factor for all text in percent.
+ This property defines the scaling factor for all text in the frame.
*/
-void QWebView::setTextZoomFactor(int percent)
+void QWebView::setTextSizeMultiplier(qreal factor)
{
- page()->mainFrame()->setTextZoomFactor(percent);
+ page()->mainFrame()->setTextSizeMultiplier(factor);
}
-int QWebView::textZoomFactor() const
+qreal QWebView::textSizeMultiplier() const
{
- return page()->mainFrame()->textZoomFactor();
+ return page()->mainFrame()->textSizeMultiplier();
}
/*!
Finds the next occurrence of the string, \a subString, in the page, using the given \a options.
Returns true of \a subString was found and selects the match visually; otherwise returns false;
*/
-bool QWebView::find(const QString &subString, QWebPage::FindFlags options)
+bool QWebView::findText(const QString &subString, QWebPage::FindFlags options)
{
if (d->page)
- return d->page->find(subString, options);
+ return d->page->findText(subString, options);
return false;
}
@@ -362,10 +369,10 @@
\snippet doc/src/snippets/code/src.3rdparty.webkit.WebKit.qt.Api.qwebview.cpp 4
*/
-void QWebView::backward()
+void QWebView::back()
{
if (d->page)
- d->page->triggerAction(QWebPage::GoBack);
+ d->page->triggerAction(QWebPage::Back);
}
/*!
@@ -380,7 +387,7 @@
void QWebView::forward()
{
if (d->page)
- d->page->triggerAction(QWebPage::GoForward);
+ d->page->triggerAction(QWebPage::Forward);
}
/*!
@@ -423,11 +430,12 @@
}
/*!
- This function is called whenever WebKit wants to create a new window, for example as a result of
+ 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.
*/
-QWebView *QWebView::createWindow()
+QWebView *QWebView::createWindow(QWebPage::WebWindowType type)
{
+ Q_UNUSED(type)
return 0;
}
@@ -602,13 +610,13 @@
*/
/*!
- \fn void QWebView::statusBarTextChanged(const QString& text)
+ \fn void QWebView::statusBarMessage(const QString& text)
This signal is emitted when the statusbar \a text is changed by the page.
*/
/*!
- \fn void QWebView::iconLoaded()
+ \fn void QWebView::iconChanged()
This signal is emitted whenever the icon of the page is loaded or changes.
*/
@@ -632,9 +640,20 @@
*/
/*!
- \fn void QWebView::loadProgressChanged(int progress)
+ \fn void QWebView::loadProgress(int progress)
This signal is emitted when the global progress status changes.
- The current value is provided by \a progress in percent.
+ The current value is provided by \a progress and scales from 0 to 100,
+ which is the default range of QProgressBar.
It accumulates changes from all the child frames.
*/
+
+/*!
+ \fn void QWebView::linkClicked(const QUrl &url)
+
+ This signal is emitted when the user clicks on a link and the page's
+ linkDelegationPolicy property allows the delegation of the clicked link
+ to this signal.
+
+ \sa QWebPage::linkDelegationPolicy()
+*/
diff --git a/WebKit/qt/Api/qwebview.h b/WebKit/qt/Api/qwebview.h
index 2fc4078..1237beb 100644
--- a/WebKit/qt/Api/qwebview.h
+++ b/WebKit/qt/Api/qwebview.h
@@ -23,6 +23,7 @@
#include "qwebkitglobal.h"
#include "qwebpage.h"
#include <QtGui/qwidget.h>
+#include <QtGui/qicon.h>
#include <QtCore/qurl.h>
#if QT_VERSION >= 0x040400
#include <QtNetwork/qnetworkaccessmanager.h>
@@ -41,11 +42,11 @@
Q_OBJECT
Q_PROPERTY(QString title READ title)
Q_PROPERTY(QUrl url READ url WRITE load)
- Q_PROPERTY(QPixmap icon READ icon)
+ Q_PROPERTY(QIcon icon READ icon)
Q_PROPERTY(QString selectedText READ selectedText)
Q_PROPERTY(bool modified READ isModified)
- Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags WRITE setTextInteractionFlags)
- Q_PROPERTY(int textZoomFactor READ textZoomFactor WRITE setTextZoomFactor)
+ //Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags WRITE setTextInteractionFlags)
+ Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier)
public:
explicit QWebView(QWidget *parent = 0);
virtual ~QWebView();
@@ -70,57 +71,52 @@
QString title() const;
QUrl url() const;
- QPixmap icon() const;
+ QIcon icon() const;
QString selectedText() const;
- QAction *action(QWebPage::WebAction action) const;
- void triggerAction(QWebPage::WebAction action, bool checked = false);
+ QAction *pageAction(QWebPage::WebAction action) const;
+ void triggerPageAction(QWebPage::WebAction action, bool checked = false);
bool isModified() const;
+ /*
Qt::TextInteractionFlags textInteractionFlags() const;
void setTextInteractionFlags(Qt::TextInteractionFlags flags);
+ void setTextInteractionFlag(Qt::TextInteractionFlag flag);
+ */
QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
- /* #### QTextBrowser compatibility?
- bool openLinks() const;
- void setOpenLinks(bool open);
-
- bool openExternalLinks() const;
- void setOpenExternalLinks(bool open);
- */
-
QSize sizeHint() const;
- void setTextZoomFactor(int percent);
- int textZoomFactor() const;
+ void setTextSizeMultiplier(qreal factor);
+ qreal textSizeMultiplier() const;
- bool find(const QString &subString, QWebPage::FindFlags options = 0);
+ bool findText(const QString &subString, QWebPage::FindFlags options = 0);
public Q_SLOTS:
void stop();
- void backward();
+ void back();
void forward();
void reload();
Q_SIGNALS:
void loadStarted();
- void loadProgressChanged(int progress);
+ void loadProgress(int progress);
void loadFinished();
void titleChanged(const QString& title);
- void statusBarTextChanged(const QString& text);
+ void statusBarMessage(const QString& text);
void linkClicked(const QUrl &url);
void selectionChanged();
- void iconLoaded();
+ void iconChanged();
void urlChanged(const QUrl &url);
protected:
void resizeEvent(QResizeEvent *e);
void paintEvent(QPaintEvent *ev);
- virtual QWebView *createWindow();
+ virtual QWebView *createWindow(QWebPage::WebWindowType type);
virtual void mouseMoveEvent(QMouseEvent*);
virtual void mousePressEvent(QMouseEvent*);
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 1dbd002..289077e 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -2,6 +2,101 @@
Reviewed by Holger.
+ Many API changes and additions after a full review with Jasmin Blanchette <jasmin@trolltech.com>
+
+ The diff is too big to mention the changes individually, but most of the changes were of cosmetic
+ nature where methods or enums have been renamed or prefixed/suffixed according to the consistency
+ rules of the Qt API.
+
+ * Api/qwebframe.cpp:
+ (QWebFrame::addToJavaScriptWindowObject):
+ (QWebFrame::toHtml):
+ (QWebFrame::toPlainText):
+ (QWebFrame::icon):
+ (QWebFrame::setContent):
+ (QWebFrame::setScrollBarPolicy):
+ (QWebFrame::render):
+ (QWebFrame::setTextSizeMultiplier):
+ (QWebFrame::textSizeMultiplier):
+ (QWebFrame::pos):
+ * Api/qwebframe.h:
+ * Api/qwebhistory.cpp:
+ * Api/qwebhistory.h:
+ * Api/qwebpage.cpp:
+ (QWebPagePrivate::QWebPagePrivate):
+ (QWebPagePrivate::~QWebPagePrivate):
+ (QWebPagePrivate::acceptNavigationRequest):
+ (webActionForContextMenuAction):
+ (QWebPagePrivate::updateAction):
+ (QWebPagePrivate::keyPressEvent):
+ (QWebPage::view):
+ (QWebPage::javaScriptPrompt):
+ (QWebPage::createWindow):
+ (QWebPage::triggerAction):
+ (QWebPage::setViewportSize):
+ (QWebPage::acceptNavigationRequest):
+ (QWebPage::action):
+ (QWebPage::focusNextPrevChild):
+ (QWebPage::setForwardUnsupportedContent):
+ (QWebPage::forwardUnsupportedContent):
+ (QWebPage::setLinkDelegationPolicy):
+ (QWebPage::findText):
+ (QWebPage::networkAccessManager):
+ (QWebPageContext::imageUrl):
+ (QWebPageContext::image):
+ * Api/qwebpage.h:
+ * Api/qwebpage_p.h:
+ * Api/qwebsettings.cpp:
+ (QWebSettingsPrivate::apply):
+ (QWebSettings::QWebSettings):
+ (QWebSettings::setIconDatabasePath):
+ (QWebSettings::iconDatabasePath):
+ (QWebSettings::clearIconDatabase):
+ (QWebSettings::iconForUrl):
+ (QWebSettings::setWebGraphic):
+ (QWebSettings::fontFamily):
+ (QWebSettings::setAttribute):
+ (QWebSettings::testAttribute):
+ (QWebSettings::resetAttribute):
+ * Api/qwebsettings.h:
+ * Api/qwebview.cpp:
+ (QWebView::setPage):
+ (QWebView::icon):
+ (QWebView::setTextSizeMultiplier):
+ (QWebView::textSizeMultiplier):
+ (QWebView::findText):
+ (QWebView::reload):
+ (QWebView::mouseMoveEvent):
+ * Api/qwebview.h:
+ * QtLauncher/main.cpp:
+ (MainWindow::MainWindow):
+ (main):
+ * WebCoreSupport/ChromeClientQt.cpp:
+ (WebCore::ChromeClientQt::ChromeClientQt):
+ (WebCore::ChromeClientQt::setWindowRect):
+ (WebCore::ChromeClientQt::toolbarsVisible):
+ (WebCore::ChromeClientQt::setStatusbarVisible):
+ (WebCore::ChromeClientQt::statusbarVisible):
+ (WebCore::ChromeClientQt::setScrollbarsVisible):
+ (WebCore::ChromeClientQt::setResizable):
+ (WebCore::ChromeClientQt::scrollBackingStore):
+ (WebCore::ChromeClientQt::mouseDidMoveOverElement):
+ (WebCore::ChromeClientQt::setToolTip):
+ * WebCoreSupport/ChromeClientQt.h:
+ * WebCoreSupport/FrameLoaderClientQt.cpp:
+ (WebCore::FrameLoaderClientQt::setFrame):
+ (WebCore::FrameLoaderClientQt::didPerformFirstNavigation):
+ (WebCore::FrameLoaderClientQt::setMainDocumentError):
+ (WebCore::FrameLoaderClientQt::dispatchDidFailLoading):
+ (WebCore::FrameLoaderClientQt::createFrame):
+ (WebCore::FrameLoaderClientQt::objectContentType):
+ * WebCoreSupport/FrameLoaderClientQt.h:
+ * WebCoreSupport/InspectorClientQt.cpp:
+
+2008-04-18 Simon Hausmann <hausmann@webkit.org>
+
+ Reviewed by Holger.
+
Added QWebView::find/QWebFrame::find.
* Api/qwebpage.cpp:
diff --git a/WebKit/qt/QtLauncher/main.cpp b/WebKit/qt/QtLauncher/main.cpp
index 53705e7..072c411 100644
--- a/WebKit/qt/QtLauncher/main.cpp
+++ b/WebKit/qt/QtLauncher/main.cpp
@@ -276,7 +276,7 @@
public:
inline WebPage(QWidget *parent) : QWebPage(parent) {}
- virtual QWebPage *createWindow();
+ virtual QWebPage *createWindow(QWebPage::WebWindowType);
};
class MainWindow : public QMainWindow
@@ -291,7 +291,7 @@
connect(view, SIGNAL(loadStarted()),
info, SLOT(startLoad()));
- connect(view, SIGNAL(loadProgressChanged(int)),
+ connect(view, SIGNAL(loadProgress(int)),
info, SLOT(changeLoad(int)));
connect(view, SIGNAL(loadFinished()),
info, SLOT(endLoad()));
@@ -299,7 +299,7 @@
this, SLOT(loadFinished()));
connect(view, SIGNAL(titleChanged(const QString&)),
this, SLOT(setWindowTitle(const QString&)));
- connect(view->page(), SIGNAL(hoveringOverLink(const QString&, const QString&)),
+ connect(view->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString &)),
this, SLOT(showLinkHover(const QString&, const QString&)));
@@ -310,19 +310,19 @@
urlEdit->setSizePolicy(QSizePolicy::Expanding, urlEdit->sizePolicy().verticalPolicy());
connect(urlEdit, SIGNAL(returnPressed()),
SLOT(changeLocation()));
- bar->addAction(view->action(QWebPage::GoBack));
- bar->addAction(view->action(QWebPage::Stop));
- bar->addAction(view->action(QWebPage::GoForward));
- QAction* reloadAction = view->action(QWebPage::Reload);
+ bar->addAction(view->pageAction(QWebPage::Back));
+ bar->addAction(view->pageAction(QWebPage::Stop));
+ bar->addAction(view->pageAction(QWebPage::Forward));
+ QAction* reloadAction = view->pageAction(QWebPage::Reload);
reloadAction->setShortcut(QKeySequence::Refresh);
bar->addAction(reloadAction);
bar->addSeparator();
- bar->addAction(view->action(QWebPage::Cut));
- bar->addAction(view->action(QWebPage::Copy));
- bar->addAction(view->action(QWebPage::Paste));
+ bar->addAction(view->pageAction(QWebPage::Cut));
+ bar->addAction(view->pageAction(QWebPage::Copy));
+ bar->addAction(view->pageAction(QWebPage::Paste));
bar->addSeparator();
- bar->addAction(view->action(QWebPage::Undo));
- bar->addAction(view->action(QWebPage::Redo));
+ bar->addAction(view->pageAction(QWebPage::Undo));
+ bar->addAction(view->pageAction(QWebPage::Redo));
addToolBarBreak();
bar = addToolBar("Location");
@@ -374,7 +374,7 @@
InfoWidget *info;
};
-QWebPage *WebPage::createWindow()
+QWebPage *WebPage::createWindow(QWebPage::WebWindowType)
{
MainWindow *mw = new MainWindow;
return mw->webPage();
@@ -387,11 +387,11 @@
QApplication app(argc, argv);
QString url = QString("%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html"));
- QWebSettings::setPageCacheCapacity(4);
+ QWebSettings::setMaximumPagesInCache(4);
QWebSettings::setObjectCacheCapacities((16*1024*1024)/8, (16*1024*1024)/8, 16*1024*1024);
- QWebSettings::defaultSettings()->setAttribute(QWebSettings::PluginsEnabled);
- QWebSettings::defaultSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled);
+ QWebSettings::globalSettings()->setAttribute(QWebSettings::PluginsEnabled, true);
+ QWebSettings::globalSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
const QStringList args = app.arguments();
if (args.count() > 1)
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
index 9650717..56d77304 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -49,10 +49,9 @@
ChromeClientQt::ChromeClientQt(QWebPage* webPage)
: m_webPage(webPage)
{
-
+ toolBarsVisible = statusBarVisible = menuBarVisible = true;
}
-
ChromeClientQt::~ChromeClientQt()
{
@@ -62,7 +61,7 @@
{
if (!m_webPage)
return;
- emit m_webPage->geometryChangeRequest(QRect(qRound(rect.x()), qRound(rect.y()),
+ emit m_webPage->geometryChangeRequested(QRect(qRound(rect.x()), qRound(rect.y()),
qRound(rect.width()), qRound(rect.height())));
}
@@ -135,7 +134,7 @@
Page* ChromeClientQt::createWindow(Frame*, const FrameLoadRequest& request, const WindowFeatures& features)
{
- QWebPage *newPage = features.dialog ? m_webPage->createModalDialog() : m_webPage->createWindow();
+ QWebPage *newPage = m_webPage->createWindow(features.dialog ? QWebPage::WebModalDialog : QWebPage::WebBrowserWindow);
if (!newPage)
return 0;
newPage->mainFrame()->load(request.resourceRequest().url());
@@ -166,28 +165,29 @@
}
-void ChromeClientQt::setToolbarsVisible(bool)
+void ChromeClientQt::setToolbarsVisible(bool visible)
{
- notImplemented();
+ toolBarsVisible = visible;
+ emit m_webPage->toolBarVisibilityChangeRequested(visible);
}
bool ChromeClientQt::toolbarsVisible()
{
- notImplemented();
- return false;
+ return toolBarsVisible;
}
-void ChromeClientQt::setStatusbarVisible(bool)
+void ChromeClientQt::setStatusbarVisible(bool visible)
{
- notImplemented();
+ emit m_webPage->statusBarVisibilityChangeRequested(visible);
+ statusBarVisible = visible;
}
bool ChromeClientQt::statusbarVisible()
{
- notImplemented();
+ return statusBarVisible;
return false;
}
@@ -205,15 +205,15 @@
}
-void ChromeClientQt::setMenubarVisible(bool)
+void ChromeClientQt::setMenubarVisible(bool visible)
{
- notImplemented();
+ menuBarVisible = visible;
+ emit m_webPage->menuBarVisibilityChangeRequested(visible);
}
bool ChromeClientQt::menubarVisible()
{
- notImplemented();
- return false;
+ return menuBarVisible;
}
void ChromeClientQt::setResizable(bool)
@@ -276,7 +276,7 @@
void ChromeClientQt::setStatusbarText(const String& msg)
{
QString x = msg;
- emit m_webPage->statusBarTextChanged(x);
+ emit m_webPage->statusBarMessage(x);
}
bool ChromeClientQt::shouldInterruptJavaScript()
@@ -304,7 +304,7 @@
if (!r.isEmpty())
view->update(r);
} else
- emit m_webPage->updateRequest(r);
+ emit m_webPage->repaintRequested(r);
}
void ChromeClientQt::scrollBackingStore(int dx, int dy, const IntRect& scrollViewRect, const IntRect& clipRect)
@@ -313,7 +313,7 @@
if (view)
view->scroll(dx, dy, scrollViewRect);
else
- emit m_webPage->scrollRequest(dx, dy, scrollViewRect);
+ emit m_webPage->scrollRequested(dx, dy, scrollViewRect);
}
void ChromeClientQt::updateBackingStore()
@@ -328,7 +328,7 @@
lastHoverURL = result.absoluteLinkURL();
lastHoverTitle = result.title();
lastHoverContent = result.textContent();
- emit m_webPage->hoveringOverLink(lastHoverURL.prettyURL(),
+ emit m_webPage->linkHovered(lastHoverURL.prettyURL(),
lastHoverTitle, lastHoverContent);
}
}
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/WebKit/qt/WebCoreSupport/ChromeClientQt.h
index 31d492b..5a40cfd 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.h
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.h
@@ -115,6 +115,10 @@
WebCore::KURL lastHoverURL;
WebCore::String lastHoverTitle;
WebCore::String lastHoverContent;
+
+ bool toolBarsVisible;
+ bool statusBarVisible;
+ bool menuBarVisible;
};
}
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 0f78425..a9a1946 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -76,7 +76,7 @@
static QString drtDescriptionSuitableForTestResult(WebCore::Frame* _frame)
{
QWebFrame* frame = QWebFramePrivate::kit(_frame);
- QString name = frame->name();
+ QString name = frame->frameName();
bool isMainFrame = frame == frame->page()->mainFrame();
if (isMainFrame) {
@@ -125,8 +125,8 @@
connect(this, SIGNAL(loadStarted()),
m_webFrame, SIGNAL(loadStarted()));
- connect(this, SIGNAL(loadProgressChanged(int)),
- m_webFrame->page(), SIGNAL(loadProgressChanged(int)));
+ connect(this, SIGNAL(loadProgress(int)),
+ m_webFrame->page(), SIGNAL(loadProgress(int)));
connect(this, SIGNAL(loadFinished()),
m_webFrame, SIGNAL(loadFinished()));
connect(this, SIGNAL(titleChanged(const QString&)),
@@ -373,7 +373,7 @@
void FrameLoaderClientQt::dispatchDidFirstLayout()
{
if (m_webFrame)
- emit m_webFrame->initialLayoutComplete();
+ emit m_webFrame->initialLayoutCompleted();
}
@@ -423,7 +423,7 @@
void FrameLoaderClientQt::postProgressEstimateChangedNotification()
{
if (m_webFrame && m_frame->page())
- emit loadProgressChanged(qRound(m_frame->page()->progress()->estimatedProgress() * 100));
+ emit loadProgress(qRound(m_frame->page()->progress()->estimatedProgress() * 100));
}
void FrameLoaderClientQt::postProgressFinishedNotification()
@@ -525,7 +525,7 @@
String FrameLoaderClientQt::userAgent(const KURL& url)
{
if (m_webFrame) {
- return m_webFrame->page()->userAgentFor(QUrl((QString)url.string()));
+ return m_webFrame->page()->userAgentForUrl(url);
}
return String();
}
@@ -536,7 +536,7 @@
printf("%s - didReceiveIconForFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
if (m_webFrame) {
- emit m_webFrame->iconLoaded();
+ emit m_webFrame->iconChanged();
}
}
@@ -560,7 +560,7 @@
printf("%s - didClearWindowObjectForFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
if (m_webFrame)
- emit m_webFrame->cleared();
+ emit m_webFrame->javaScriptWindowObjectCleared();
}
void FrameLoaderClientQt::didPerformFirstNavigation() const
@@ -686,8 +686,8 @@
QNetworkReply* reply = handler->release();
if (reply) {
QWebPage *page = m_webFrame->page();
- if (page->receivers(SIGNAL(handleUnsupportedContent(QNetworkReply *))))
- emit m_webFrame->page()->handleUnsupportedContent(reply);
+ if (page->forwardUnsupportedContent())
+ emit m_webFrame->page()->unsupportedContent(reply);
else
reply->abort();
}
@@ -767,7 +767,7 @@
{
if (!m_webFrame)
return 0;
- QWebPage *newPage = m_webFrame->page()->createWindow();
+ QWebPage *newPage = m_webFrame->page()->createWindow(QWebPage::WebBrowserWindow);
if (!newPage)
return 0;
return newPage->mainFrame()->d->frame;
@@ -803,8 +803,7 @@
#endif
QWebPage *page = m_webFrame->page();
- if (page->d->navigationRequested(m_webFrame, r, QWebPage::NavigationType(action.type())) ==
- QWebPage::IgnoreNavigationRequest) {
+ if (!page->d->acceptNavigationRequest(m_webFrame, r, QWebPage::NavigationType(action.type()))) {
slotCallPolicyFunction(PolicyIgnore);
return;
}
@@ -825,7 +824,7 @@
return;
QWebPage *page = m_webFrame->page();
- emit m_webFrame->page()->download(request.toNetworkRequest());
+ emit m_webFrame->page()->downloadRequested(request.toNetworkRequest());
#endif
}
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
index 1ede942..8a68926 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
@@ -62,7 +62,7 @@
signals:
void sigCallPolicyFunction(int);
void loadStarted();
- void loadProgressChanged(int d);
+ void loadProgress(int d);
void loadFinished();
void titleChanged(const QString& title);
diff --git a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
index 4e8f5a5..00cf1a8 100644
--- a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
@@ -46,7 +46,7 @@
class InspectorClientWebPage : public QWebPage
{
public:
- QWebPage* createWindow()
+ QWebPage* createWindow(QWebPage::WebWindowType)
{
QWidget *w = new QWebView(0);
QWebPage *page = new QWebPage(w);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 088888d..ff6379a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2008-04-18 Simon Hausmann <hausmann@webkit.org>
+
+ Reviewed by Holger.
+
+ Adapt to the API changes in WebKit/qt
+
+ * DumpRenderTree/qt/DumpRenderTree.cpp:
+ (WebCore::WebPage::WebPage):
+ (WebCore::DumpRenderTree::DumpRenderTree):
+ (WebCore::DumpRenderTree::initJSObjects):
+ (WebCore::DumpRenderTree::dumpFramesAsText):
+ (WebCore::DumpRenderTree::dump):
+
2008-04-17 Adam Roben <aroben@apple.com>
Fix many tests on Windows
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index bdec2ad..c5b995c 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -65,10 +65,10 @@
public:
WebPage(QWidget *parent, DumpRenderTree *drt);
- QWebPage *createWindow();
+ QWebPage *createWindow(QWebPage::WebWindowType);
void javaScriptAlert(QWebFrame *frame, const QString& message);
- void javaScriptConsoleMessage(const QString& message, unsigned int lineNumber, const QString& sourceID);
+ void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID);
bool javaScriptConfirm(QWebFrame *frame, const QString& msg);
bool javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result);
@@ -89,13 +89,13 @@
settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, true);
settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard, true);
settings()->setAttribute(QWebSettings::LinksIncludedInFocusChain, false);
- connect(this, SIGNAL(geometryChangeRequest(const QRect &)),
+ connect(this, SIGNAL(geometryChangeRequested(const QRect &)),
this, SLOT(setViewGeometry(const QRect & )));
setPluginFactory(new TestPlugin(this));
}
-QWebPage *WebPage::createWindow()
+QWebPage *WebPage::createWindow(QWebPage::WebWindowType)
{
return m_drt->createWindow();
}
@@ -105,7 +105,7 @@
fprintf(stdout, "ALERT: %s\n", message.toUtf8().constData());
}
-void WebPage::javaScriptConsoleMessage(const QString& message, unsigned int lineNumber, const QString&)
+void WebPage::javaScriptConsoleMessage(const QString& message, int lineNumber, const QString&)
{
fprintf (stdout, "CONSOLE MESSAGE: line %d: %s\n", lineNumber, message.toUtf8().constData());
}
@@ -137,8 +137,8 @@
connect(m_page, SIGNAL(frameCreated(QWebFrame *)), this, SLOT(connectFrame(QWebFrame *)));
connectFrame(m_page->mainFrame());
- m_page->mainFrame()->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- m_page->mainFrame()->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ m_page->mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
+ m_page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
connect(m_page->mainFrame(), SIGNAL(titleChanged(const QString&)),
SLOT(titleChanged(const QString&)));
@@ -212,9 +212,9 @@
{
QWebFrame *frame = qobject_cast<QWebFrame*>(sender());
Q_ASSERT(frame);
- frame->addToJSWindowObject(QLatin1String("layoutTestController"), m_controller);
- frame->addToJSWindowObject(QLatin1String("eventSender"), m_eventSender);
- frame->addToJSWindowObject(QLatin1String("textInputController"), m_textInputController);
+ frame->addToJavaScriptWindowObject(QLatin1String("layoutTestController"), m_controller);
+ frame->addToJavaScriptWindowObject(QLatin1String("eventSender"), m_eventSender);
+ frame->addToJavaScriptWindowObject(QLatin1String("textInputController"), m_textInputController);
}
@@ -227,11 +227,11 @@
QWebFrame *parent = qobject_cast<QWebFrame *>(frame->parent());
if (parent) {
result.append(QLatin1String("\n--------\nFrame: '"));
- result.append(frame->name());
+ result.append(frame->frameName());
result.append(QLatin1String("'\n--------\n"));
}
- result.append(frame->innerText());
+ result.append(frame->toPlainText());
result.append(QLatin1String("\n"));
if (m_controller->shouldDumpChildrenAsText()) {
@@ -250,7 +250,7 @@
//fprintf(stderr, " Dumping\n");
if (!m_notifier) {
// Dump markup in single file mode...
- QString markup = frame->markup();
+ QString markup = frame->toHtml();
fprintf(stdout, "Source:\n\n%s\n", markup.toUtf8().constData());
}
@@ -289,7 +289,7 @@
void DumpRenderTree::connectFrame(QWebFrame *frame)
{
- connect(frame, SIGNAL(cleared()), this, SLOT(initJSObjects()));
+ connect(frame, SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(initJSObjects()));
connect(frame, SIGNAL(provisionalLoad()),
layoutTestController(), SLOT(provisionalLoad()));
