Changeset 46535 in webkit


Ignore:
Timestamp:
Jul 29, 2009 3:33:20 AM (15 years ago)
Author:
Simon Hausmann
Message:

2009-07-29 Yongjun Zhang <​yongjun.zhang@nokia.com>

Reviewed by Simon Hausmann.

​https://bugs.webkit.org/show_bug.cgi?id=26848
[Qt] ResourceHandle::willLoadFromCache needs to be implemented QtWebKit.

  • loader/FrameLoader.cpp: (WebCore::FrameLoader::loadItem):
  • platform/network/ResourceHandle.h:
  • platform/network/cf/ResourceHandleCFNet.cpp: (WebCore::ResourceHandle::willLoadFromCache):
  • platform/network/curl/ResourceHandleCurl.cpp: (WebCore::ResourceHandle::willLoadFromCache):
  • platform/network/mac/ResourceHandleMac.mm: (WebCore::ResourceHandle::willLoadFromCache):
  • platform/network/qt/ResourceHandleQt.cpp: (WebCore::ResourceHandle::willLoadFromCache):
  • platform/network/soup/ResourceHandleSoup.cpp: (WebCore::):
Location:
trunk/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r46534 r46535  
     12009-07-29  Yongjun Zhang  <yongjun.zhang@nokia.com>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=26848
     6        [Qt] ResourceHandle::willLoadFromCache needs to be implemented QtWebKit.
     7
     8        * loader/FrameLoader.cpp:
     9        (WebCore::FrameLoader::loadItem):
     10        * platform/network/ResourceHandle.h:
     11        * platform/network/cf/ResourceHandleCFNet.cpp:
     12        (WebCore::ResourceHandle::willLoadFromCache):
     13        * platform/network/curl/ResourceHandleCurl.cpp:
     14        (WebCore::ResourceHandle::willLoadFromCache):
     15        * platform/network/mac/ResourceHandleMac.mm:
     16        (WebCore::ResourceHandle::willLoadFromCache):
     17        * platform/network/qt/ResourceHandleQt.cpp:
     18        (WebCore::ResourceHandle::willLoadFromCache):
     19        * platform/network/soup/ResourceHandleSoup.cpp:
     20        (WebCore::):
     21
    1222009-07-29  Alpha Lam  <hclam@chromium.org>
    223

  • trunk/WebCore/loader/FrameLoader.cpp

    r46418 r46535  
    45214521                // extremely rare, but in that case the user will get an error on the navigation.
    45224522               
    4523                 if (ResourceHandle::willLoadFromCache(request))
     4523                if (ResourceHandle::willLoadFromCache(request, m_frame))
    45244524                    action = NavigationAction(itemURL, loadType, false);
    45254525                else {

  • trunk/WebCore/platform/network/ResourceHandle.h

    r46468 r46535  
    106106
    107107    static void loadResourceSynchronously(const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>& data, Frame* frame);
    108     static bool willLoadFromCache(ResourceRequest&);
     108    static bool willLoadFromCache(ResourceRequest&, Frame*);
    109109#if PLATFORM(MAC)
    110110    static bool didSendBodyDataDelegateExists();

  • trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

    r46308 r46535  
    558558}
    559559
    560 bool ResourceHandle::willLoadFromCache(ResourceRequest& request)
     560bool ResourceHandle::willLoadFromCache(ResourceRequest& request, Frame* frame)
    561561{
    562562    request.setCachePolicy(ReturnCacheDataDontLoad);

  • trunk/WebCore/platform/network/curl/ResourceHandleCurl.cpp

    r42483 r46535  
    180180}
    181181
    182 bool ResourceHandle::willLoadFromCache(ResourceRequest&)
     182bool ResourceHandle::willLoadFromCache(ResourceRequest&, Frame*)
    183183{
    184184    notImplemented();

  • trunk/WebCore/platform/network/mac/ResourceHandleMac.mm

    r45476 r46535  
    349349}
    350350
    351 bool ResourceHandle::willLoadFromCache(ResourceRequest& request)
     351bool ResourceHandle::willLoadFromCache(ResourceRequest& request, Frame*)
    352352{
    353353#ifndef BUILDING_ON_TIGER

  • trunk/WebCore/platform/network/qt/ResourceHandleQt.cpp

    r42483 r46535  
    3636#include "ResourceHandleInternal.h"
    3737#include "qwebpage_p.h"
     38#include "qwebframe_p.h"
    3839#include "ChromeClientQt.h"
    3940#include "FrameLoaderClientQt.h"
    … …  
    4950#include <QNetworkRequest>
    5051#include <QNetworkReply>
     52#include <QAbstractNetworkCache>
    5153#else
    5254#include "qwebnetworkinterface_p.h"
    … …  
    155157}
    156158
    157 bool ResourceHandle::willLoadFromCache(ResourceRequest& request)
    158 {
    159     notImplemented();
    160     return false;
     159bool ResourceHandle::willLoadFromCache(ResourceRequest& request, Frame* frame)
     160{
     161    if (!frame)
     162        return false;
     163
     164#if QT_VERSION >= 0x040500
     165    QNetworkAccessManager* manager = QWebFramePrivate::kit(frame)->page()->networkAccessManager();
     166    QAbstractNetworkCache* cache = manager->cache();
     167
     168    if (!cache)
     169        return false;
     170
     171    QNetworkCacheMetaData data = cache->metaData(request.url());
     172    if (data.isValid()) {
     173        request.setCachePolicy(ReturnCacheDataDontLoad);
     174        return true;
     175    }
     176
     177    return false;
     178#else
     179    return false;
     180#endif
    161181}
    162182

  • trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp

    r46468 r46535  
    631631}
    632632
    633 bool ResourceHandle::willLoadFromCache(ResourceRequest&)
     633bool ResourceHandle::willLoadFromCache(ResourceRequest&, Frame*)
    634634{
    635635    // Not having this function means that we'll ask the user about re-posting a form
Note: See TracChangeset for help on using the changeset viewer.