Changeset 73865 in webkit

Timestamp:

Dec 11, 2010 7:21:51 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-11 Jan Erik Hanssen <​jhanssen@sencha.com>

Reviewed by Andreas Kling.

[Qt] QWebFrame does not support QNetworkRequest::CacheLoadControl
​https://bugs.webkit.org/show_bug.cgi?id=35671

Make QWebFrame respect the QNetworkRequest::CacheLoadControl attribute
set on the request, if any.

• Api/qwebframe.cpp: (cacheLoadControlToCachePolicy): (QWebFrame::load):
• tests/qwebframe/tst_qwebframe.cpp:

Location:

trunk/WebKit/qt

Files:

• Api/qwebframe.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• tests/qwebframe/tst_qwebframe.cpp (modified) (2 diffs)

trunk/WebKit/qt/Api/qwebframe.cpp

@@ -202 +202 @@
 }
 
+static inline ResourceRequestCachePolicy cacheLoadControlToCachePolicy(uint cacheLoadControl)
+{
+    switch (cacheLoadControl) {
+    case QNetworkRequest::AlwaysNetwork:
+        return WebCore::ReloadIgnoringCacheData;
+    case QNetworkRequest::PreferCache:
+        return WebCore::ReturnCacheDataElseLoad;
+    case QNetworkRequest::AlwaysCache:
+        return WebCore::ReturnCacheDataDontLoad;
+    default:
+        break;
+    }
+    return WebCore::UseProtocolCachePolicy;
+}
+
 QWebFrameData::QWebFrameData(WebCore::Page* parentPage, WebCore::Frame* parentFrame,
                              WebCore::HTMLFrameOwnerElement* ownerFrameElement,
@@ -884 +899 @@
     }
 
+    QVariant cacheLoad = req.attribute(QNetworkRequest::CacheLoadControlAttribute);
+    if (cacheLoad.isValid()) {
+        bool ok;
+        uint cacheLoadValue = cacheLoad.toUInt(&ok);
+        if (ok)
+            request.setCachePolicy(cacheLoadControlToCachePolicy(cacheLoadValue));
+    }
+
     QList<QByteArray> httpHeaders = req.rawHeaderList();
     for (int i = 0; i < httpHeaders.size(); ++i) {

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-12-11  Jan Erik Hanssen  <jhanssen@sencha.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] QWebFrame does not support QNetworkRequest::CacheLoadControl
+        https://bugs.webkit.org/show_bug.cgi?id=35671
+
+        Make QWebFrame respect the QNetworkRequest::CacheLoadControl attribute
+        set on the request, if any.
+
+        * Api/qwebframe.cpp:
+        (cacheLoadControlToCachePolicy):
+        (QWebFrame::load):
+        * tests/qwebframe/tst_qwebframe.cpp:
+
 2010-10-11  Diego Gonzalez  <diegohcg@webkit.org>
 

trunk/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp

@@ -626 +626 @@
     void setContent_data();
     void setContent();
+    void setCacheLoadControlAttribute();
 
 private:
@@ -3069 +3070 @@
 }
 
+class CacheNetworkAccessManager : public QNetworkAccessManager {
+public:
+    CacheNetworkAccessManager(QObject* parent = 0)
+        : QNetworkAccessManager(parent)
+        , m_lastCacheLoad(QNetworkRequest::PreferNetwork)
+    {
+    }
+
+    virtual QNetworkReply* createRequest(Operation, const QNetworkRequest& request, QIODevice*)
+    {
+        QVariant cacheLoad = request.attribute(QNetworkRequest::CacheLoadControlAttribute);
+        if (cacheLoad.isValid())
+            m_lastCacheLoad = static_cast<QNetworkRequest::CacheLoadControl>(cacheLoad.toUInt());
+        else
+            m_lastCacheLoad = QNetworkRequest::PreferNetwork; // default value
+        return new FakeReply(request, this);
+    }
+
+    QNetworkRequest::CacheLoadControl lastCacheLoad() const
+    {
+        return m_lastCacheLoad;
+    }
+
+private:
+    QNetworkRequest::CacheLoadControl m_lastCacheLoad;
+};
+
+void tst_QWebFrame::setCacheLoadControlAttribute()
+{
+    QWebPage page;
+    CacheNetworkAccessManager* manager = new CacheNetworkAccessManager(&page);
+    page.setNetworkAccessManager(manager);
+    QWebFrame* frame = page.mainFrame();
+
+    QNetworkRequest request(QUrl("http://abcdef.abcdef/"));
+
+    request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);
+    frame->load(request);
+    QCOMPARE(manager->lastCacheLoad(), QNetworkRequest::AlwaysCache);
+
+    request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
+    frame->load(request);
+    QCOMPARE(manager->lastCacheLoad(), QNetworkRequest::PreferCache);
+
+    request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
+    frame->load(request);
+    QCOMPARE(manager->lastCacheLoad(), QNetworkRequest::AlwaysNetwork);
+
+    request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork);
+    frame->load(request);
+    QCOMPARE(manager->lastCacheLoad(), QNetworkRequest::PreferNetwork);
+}
+
 QTEST_MAIN(tst_QWebFrame)
 #include "tst_qwebframe.moc"