Changeset 20299 in webkit


Ignore:
Timestamp:
Mar 18, 2007 5:37:19 PM (17 years ago)
Author:
beidson
Message:

Reviewed by Hyatt

http://bugs.webkit.org/show_bug.cgi?id=13111
When stopped a load before it completes, partial images become the
broken image icon

  • loader/loader.cpp: (WebCore::Loader::didFail): Split off into a method that knows the difference between failed and cancelled. If a load is cancelled, don't call error() on the object - only remove it from the cache (WebCore::Loader::cancelRequests): Call didFail(loader, true)
  • loader/loader.h: Added didFail(SubresourceLoader*, bool cancelled)
Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r20298 r20299  
     12007-03-18  Brady Eidson  <beidson@apple.com>
     2
     3        Reviewed by Hyatt
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=13111
     6        When stopped a load before it completes, partial images become the
     7        broken image icon
     8
     9        * loader/loader.cpp:
     10        (WebCore::Loader::didFail): Split off into a method that knows the
     11          difference between failed and cancelled.  If a load is cancelled,
     12          don't call error() on the object - only remove it from the cache
     13        (WebCore::Loader::cancelRequests): Call didFail(loader, true)
     14        * loader/loader.h: Added didFail(SubresourceLoader*, bool cancelled)
     15
    1162007-03-18  Mitz Pettel  <mitz@webkit.org>
    217
  • trunk/WebCore/loader/loader.cpp

    r20182 r20299  
    114114}
    115115
    116 void Loader::didFail(SubresourceLoader* loader, const ResourceError& error)
     116void Loader::didFail(SubresourceLoader* loader, const ResourceError&)
     117{
     118    didFail(loader);
     119}
     120
     121void Loader::didFail(SubresourceLoader* loader, bool cancelled)
    117122{
    118123    RequestMap::iterator i = m_requestsLoading.find(loader);
     
    126131    DocLoader* docLoader = req->docLoader();
    127132
    128     docLoader->setLoadInProgress(true);
    129     object->error();
     133    if (!cancelled) {
     134        docLoader->setLoadInProgress(true);
     135        object->error();
     136    }
     137   
    130138    docLoader->setLoadInProgress(false);
    131139    cache()->remove(object);
     
    222230    for (unsigned i = 0; i < loadersToCancel.size(); ++i) {
    223231        SubresourceLoader* loader = loadersToCancel[i];
    224         didFail(loader, loader->cancelledError());
     232        didFail(loader, true);
    225233    }
    226234}
  • trunk/WebCore/loader/loader.h

    r19977 r20299  
    6060        virtual void didFinishLoading(SubresourceLoader*);
    6161        virtual void didFail(SubresourceLoader*, const ResourceError&);
     62        void didFail(SubresourceLoader*, bool cancelled = false);
    6263
    6364        void servePendingRequests(bool skipCanLoadCheck = false);
Note: See TracChangeset for help on using the changeset viewer.