Changeset 53687 in webkit

Timestamp:

Jan 22, 2010 1:17:41 AM (14 years ago)

Author:

kenneth@webkit.org

Message:

[Qt] Separate out the WebPage class into it's own
cpp/header files. Also, removed the assumption that
the view is a QWebView, in preparation of a merger
of the two Qt WebKit launchers.

Rubberstamped by Antti Koivisto.

• QtLauncher/QtLauncher.pro:
• QtLauncher/main.cpp:

(WebView::mousePressEvent):

• QtLauncher/webpage.cpp: Added.

(WebPage::supportsExtension):
(WebPage::extension):
(WebPage::acceptNavigationRequest):
(WebPage::openUrlInDefaultBrowser):

• QtLauncher/webpage.h: Added.

(WebPage::WebPage):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/QtLauncher.pro (modified) (1 diff)
• QtLauncher/main.cpp (modified) (3 diffs)
• QtLauncher/webpage.cpp (added)
• QtLauncher/webpage.h (added)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-22  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Rubberstamped by Antti Koivisto.
+
+        [Qt] Separate out the WebPage class into it's own
+        cpp/header files. Also, removed the assumption that
+        the view is a QWebView, in preparation of a merger
+        of the two Qt WebKit launchers.
+
+        * QtLauncher/QtLauncher.pro:
+        * QtLauncher/main.cpp:
+        (WebView::mousePressEvent):
+        * QtLauncher/webpage.cpp: Added.
+        (WebPage::supportsExtension):
+        (WebPage::extension):
+        (WebPage::acceptNavigationRequest):
+        (WebPage::openUrlInDefaultBrowser):
+        * QtLauncher/webpage.h: Added.
+        (WebPage::WebPage):
+
 2010-01-21  Chris Jerdonek  <cjerdonek@webkit.org>
 

trunk/WebKitTools/QtLauncher/QtLauncher.pro

@@ -1 +1 @@
 TEMPLATE = app
-SOURCES += main.cpp
+SOURCES += main.cpp webpage.cpp
 CONFIG -= app_bundle
 CONFIG += uitools

trunk/WebKitTools/QtLauncher/main.cpp

@@ -52 +52 @@
 #include <qwebframe.h>
 #include <qwebinspector.h>
-#include <qwebpage.h>
+#include "webpage.h"
 #include <qwebsettings.h>
 #include <qwebview.h>
@@ -94 +94 @@
     virtual void mousePressEvent(QMouseEvent* event)
     {
-        mouseButtons = event->buttons();
-        keyboardModifiers = event->modifiers();
+        setProperty("mouseButtons", QVariant::fromValue(int(event->buttons())));
+        setProperty("keyboardModifiers", QVariant::fromValue(int(event->modifiers())));
 
         QWebView::mousePressEvent(event);
     }
 
-public slots:
-    void openUrlInDefaultBrowser(const QUrl &url = QUrl())
-    {
-        if (QAction* action = qobject_cast<QAction*>(sender()))
-            QDesktopServices::openUrl(action->data().toUrl());
-        else
-            QDesktopServices::openUrl(url);
-    }
-
-public:
-    Qt::MouseButtons mouseButtons;
-    Qt::KeyboardModifiers keyboardModifiers;
-};
-
-class WebPage : public QWebPage {
-public:
-    WebPage(QWidget *parent) : QWebPage(parent) {}
-
-    virtual QWebPage *createWindow(QWebPage::WebWindowType);
-    virtual QObject* createPlugin(const QString&, const QUrl&, const QStringList&, const QStringList&);
-    virtual bool supportsExtension(QWebPage::Extension extension) const
-    {
-        if (extension == QWebPage::ErrorPageExtension)
-            return true;
-        return false;
-    }
-    virtual bool extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output);
-
-
-    virtual bool acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest &request, NavigationType type)
-    {
-        WebView* webView = static_cast<WebView*>(view());
-        if (webView->keyboardModifiers & Qt::ShiftModifier) {
-            QWebPage* page = createWindow(QWebPage::WebBrowserWindow);
-            page->mainFrame()->load(request);
-            return false;
-        }
-        if (webView->keyboardModifiers & Qt::AltModifier) {
-            webView->openUrlInDefaultBrowser(request.url());
-            return false;
-        }
-
-        return QWebPage::acceptNavigationRequest(frame, request, type);
-    }
 };
 
@@ -629 +585 @@
 };
 
-bool WebPage::extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output)
-{
-    const QWebPage::ErrorPageExtensionOption* info = static_cast<const QWebPage::ErrorPageExtensionOption*>(option);
-    QWebPage::ErrorPageExtensionReturn* errorPage = static_cast<QWebPage::ErrorPageExtensionReturn*>(output);
-
-    errorPage->content = QString("<html><head><title>Failed loading page</title></head><body>%1</body></html>")
-        .arg(info->errorString).toUtf8();
-
-    return true;
-}
 
 QWebPage* WebPage::createWindow(QWebPage::WebWindowType)