Changeset 140676 in webkit

Timestamp:

Jan 24, 2013 4:25:19 AM (11 years ago)

Author:

michael.bruning@digia.com

Message:

[Qt][WK2] Pages / resources cannot be loaded from qrc files.
​https://bugs.webkit.org/show_bug.cgi?id=107031

Reviewed by Jocelyn Turcotte.

Enables WebKit2 Qt applications to load files from the bundled
qrc files. This is achieved by adding a url scheme handler for
the "qrc" scheme using the application scheme handler and ignoring
all handlers for the qrc application scheme that the application might
set.

• UIProcess/API/qt/qquickurlschemedelegate.cpp:

(QQuickQrcSchemeDelegate::QQuickQrcSchemeDelegate):
(QQuickQrcSchemeDelegate::readResourceAndSend):

• UIProcess/API/qt/qquickurlschemedelegate_p.h:

(QQuickQrcSchemeDelegate):

• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::initialize):
(QQuickWebViewExperimental::schemeDelegates_Append):
(QQuickWebViewExperimental::invokeApplicationSchemeHandler):

• UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml:
• UIProcess/API/qt/tests/qmltests/common/qrctest.html: Added.
• UIProcess/API/qt/tests/qmltests/resources.qrc:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickurlschemedelegate.cpp (modified) (2 diffs)
• UIProcess/API/qt/qquickurlschemedelegate_p.h (modified) (2 diffs)
• UIProcess/API/qt/qquickwebview.cpp (modified) (3 diffs)
• UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml (modified) (1 diff)
• UIProcess/API/qt/tests/qmltests/common/qrctest.html (added)
• UIProcess/API/qt/tests/qmltests/resources.qrc (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-24  Michael Brüning  <michael.bruning@digia.com>
+
+        [Qt][WK2] Pages / resources cannot be loaded from qrc files.
+        https://bugs.webkit.org/show_bug.cgi?id=107031
+
+        Reviewed by Jocelyn Turcotte.
+
+        Enables WebKit2 Qt applications to load files from the bundled
+        qrc files. This is achieved by adding a url scheme handler for
+        the "qrc" scheme using the application scheme handler and ignoring
+        all handlers for the qrc application scheme that the application might
+        set.
+
+        * UIProcess/API/qt/qquickurlschemedelegate.cpp:
+        (QQuickQrcSchemeDelegate::QQuickQrcSchemeDelegate):
+        (QQuickQrcSchemeDelegate::readResourceAndSend):
+        * UIProcess/API/qt/qquickurlschemedelegate_p.h:
+        (QQuickQrcSchemeDelegate):
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::initialize):
+        (QQuickWebViewExperimental::schemeDelegates_Append):
+        (QQuickWebViewExperimental::invokeApplicationSchemeHandler):
+        * UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml:
+        * UIProcess/API/qt/tests/qmltests/common/qrctest.html: Added.
+        * UIProcess/API/qt/tests/qmltests/resources.qrc:
+
 2013-01-24  Krzysztof Czech  <k.czech@samsung.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate.cpp

@@ -24 +24 @@
 #include "qquicknetworkreply_p.h"
 #include "qquicknetworkrequest_p.h"
+
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QMimeDatabase>
+#include <QtCore/QUrl>
 
 QQuickUrlSchemeDelegate::QQuickUrlSchemeDelegate(QObject* parent)
@@ -52 +57 @@
 }
 
+QQuickQrcSchemeDelegate::QQuickQrcSchemeDelegate(const QUrl& url)
+    : QQuickUrlSchemeDelegate()
+    , m_fileName(QLatin1Char(':') + url.path())
+{
+}
+
+void QQuickQrcSchemeDelegate::readResourceAndSend()
+{
+    QFile file(m_fileName);
+    QFileInfo fileInfo(file);
+    if (fileInfo.isDir() || !file.open(QIODevice::ReadOnly | QIODevice::Unbuffered))
+        return;
+
+    QByteArray fileData(file.readAll());
+    QMimeDatabase mimeDb;
+    QMimeType mimeType = mimeDb.mimeTypeForFileNameAndData(m_fileName, fileData);
+    file.close();
+
+    reply()->setData(fileData);
+    reply()->setContentType(mimeType.name());
+    reply()->send();
+}
+
 #include "moc_qquickurlschemedelegate_p.cpp"

trunk/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h

@@ -28 +28 @@
 class QQuickNetworkRequest;
 class QQuickNetworkReply;
+class QUrl;
 
 class QWEBKIT_EXPORT QQuickUrlSchemeDelegate : public QObject {
@@ -54 +55 @@
 QML_DECLARE_TYPE(QQuickUrlSchemeDelegate)
 
+class QQuickQrcSchemeDelegate : public QQuickUrlSchemeDelegate {
+    Q_OBJECT
+public:
+    QQuickQrcSchemeDelegate(const QUrl& url);
+    void readResourceAndSend();
+
+private:
+    QString m_fileName;
+};
+
 #endif // qquickurlschemedelegate_p_h
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

@@ -329 +329 @@
     pageClient.initialize(q_ptr, pageViewPrivate->eventHandler.data(), &undoController);
     webPageProxy->initializeWebPage();
+    webPageProxy->registerApplicationScheme(ASCIILiteral("qrc"));
 
     q_ptr->setAcceptedMouseButtons(Qt::MouseButtonMask);
@@ -1313 +1314 @@
 void QQuickWebViewExperimental::schemeDelegates_Append(QQmlListProperty<QQuickUrlSchemeDelegate>* property, QQuickUrlSchemeDelegate *scheme)
 {
+    if (!scheme->scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive)) {
+        qWarning("WARNING: The qrc scheme is reserved to be handled internally. The handler will be ignored.");
+        delete scheme;
+        return;
+    }
+
     QObject* schemeParent = property->object;
     scheme->setParent(schemeParent);
@@ -1350 +1357 @@
 {
     RefPtr<QtRefCountedNetworkRequestData> req = request;
+    if (req->data().m_scheme.startsWith("qrc", false)) {
+        QQuickQrcSchemeDelegate qrcDelegate(QUrl(QString(req->data().m_urlString)));
+        qrcDelegate.request()->setNetworkRequestData(req);
+        qrcDelegate.reply()->setNetworkRequestData(req);
+        qrcDelegate.reply()->setWebViewExperimental(this);
+        qrcDelegate.readResourceAndSend();
+        return;
+    }
+
     const QObjectList children = schemeParent->children();
     for (int index = 0; index < children.count(); index++) {

trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml

@@ -114 +114 @@
             compare(webView.title, "title with copyright ©")
         }
+
+        function test_qrcScheme() {
+            var testUrl = "qrc:///common/qrctest.html"
+            webView.url = testUrl
+            verify(webView.waitForLoadSucceeded())
+            compare(webView.title, "Loaded from qrc.")
+
+        }
     }
 }

trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/resources.qrc

@@ -2 +2 @@
     <qresource prefix="/">
         <file>common/change-document-title.js</file>
+        <file>common/qrctest.html</file>
     </qresource>
 </RCC>