Changeset 95120 in webkit


Ignore:
Timestamp:
Sep 14, 2011 2:03:20 PM (13 years ago)
Author:
andersca@apple.com
Message:

Get rid of ResourceHandle::bufferedData()
​https://bugs.webkit.org/show_bug.cgi?id=68112

Reviewed by David Hyatt.

ResourceHandle::bufferedData() was only implemented on Mac, and the support in the underlying
NSURLConnection class hasn't been there for several OS releases.

  • loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::resourceData):
(WebCore::ResourceLoader::addData):

  • platform/network/ResourceHandle.h:
  • platform/network/cf/ResourceHandleCFNet.cpp:
  • platform/network/curl/ResourceHandleCurl.cpp:
  • platform/network/mac/ResourceHandleMac.mm:
  • platform/network/qt/ResourceHandleQt.cpp:
  • platform/network/soup/ResourceHandleSoup.cpp:
  • platform/network/win/ResourceHandleWin.cpp:
Location:
trunk/Source/WebCore
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r95117 r95120  
     12011-09-14  Anders Carlsson  <andersca@apple.com>
     2
     3        Get rid of ResourceHandle::bufferedData()
     4        https://bugs.webkit.org/show_bug.cgi?id=68112
     5
     6        Reviewed by David Hyatt.
     7
     8        ResourceHandle::bufferedData() was only implemented on Mac, and the support in the underlying
     9        NSURLConnection class hasn't been there for several OS releases.
     10
     11        * loader/ResourceLoader.cpp:
     12        (WebCore::ResourceLoader::resourceData):
     13        (WebCore::ResourceLoader::addData):
     14        * platform/network/ResourceHandle.h:
     15        * platform/network/cf/ResourceHandleCFNet.cpp:
     16        * platform/network/curl/ResourceHandleCurl.cpp:
     17        * platform/network/mac/ResourceHandleMac.mm:
     18        * platform/network/qt/ResourceHandleQt.cpp:
     19        * platform/network/soup/ResourceHandleSoup.cpp:
     20        * platform/network/win/ResourceHandleWin.cpp:
     21
    1222011-09-14  Mark Hahnenberg  <mhahnenberg@apple.com>
    223

  • trunk/Source/WebCore/loader/ResourceLoader.cpp

    r93923 r95120  
    5050PassRefPtr<SharedBuffer> ResourceLoader::resourceData()
    5151{
    52     if (m_resourceData)
    53         return m_resourceData;
    54 
    55     if (ResourceHandle::supportsBufferedData() && m_handle)
    56         return m_handle->bufferedData();
    57    
    58     return 0;
     52    return m_resourceData;
    5953}
    6054
    … …  
    203197    }
    204198       
    205     if (ResourceHandle::supportsBufferedData()) {
    206         // Buffer data only if the connection has handed us the data because is has stopped buffering it.
    207         if (m_resourceData)
    208             m_resourceData->append(data, length);
    209     } else {
    210         if (!m_resourceData)
    211             m_resourceData = SharedBuffer::create(data, length);
    212         else
    213             m_resourceData->append(data, length);
    214     }
     199    if (!m_resourceData)
     200        m_resourceData = SharedBuffer::create(data, length);
     201    else
     202        m_resourceData->append(data, length);
    215203}
    216204

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

    r94358 r95120  
    159159#endif
    160160
    161     PassRefPtr<SharedBuffer> bufferedData();
    162     static bool supportsBufferedData();
    163 
    164161    bool shouldContentSniff() const;
    165162    static bool shouldContentSniffURL(const KURL&);

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

    r94358 r95120  
    527527}
    528528
    529 PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
    530 {
    531     ASSERT_NOT_REACHED();
    532     return 0;
    533 }
    534 
    535 bool ResourceHandle::supportsBufferedData()
    536 {
    537     return false;
    538 }
    539 
    540529void ResourceHandle::willSendRequest(ResourceRequest& request, const ResourceResponse& redirectResponse)
    541530{

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

    r84260 r95120  
    115115}
    116116
    117 PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
    118 {
    119     return 0;
    120 }
    121 
    122 bool ResourceHandle::supportsBufferedData()
    123 {
    124     return false;
    125 }
    126 
    127117#if PLATFORM(WIN) && USE(CF)
    128118static HashSet<String>& allowsAnyHTTPSCertificateHosts()

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

    r94358 r95120  
    7272@end
    7373
    74 @interface NSURLConnection (NSURLConnectionTigerPrivate)
    75 - (NSData *)_bufferedData;
    76 @end
    77 
    7874@interface NSURLConnection (Details)
    7975-(id)_initWithRequest:(NSURLRequest *)request delegate:(id)delegate usesCache:(BOOL)usesCacheFlag maxContentLength:(long long)maxContentLength startImmediately:(BOOL)startImmediately connectionProperties:(NSDictionary *)connectionProperties;
    … …  
    373369    [d->m_delegate.get() detachHandle];
    374370    d->m_delegate = nil;
    375 }
    376 
    377 bool ResourceHandle::supportsBufferedData()
    378 {
    379     static bool supportsBufferedData = [NSURLConnection instancesRespondToSelector:@selector(_bufferedData)];
    380     return supportsBufferedData;
    381 }
    382 
    383 PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
    384 {
    385     if (ResourceHandle::supportsBufferedData())
    386         return SharedBuffer::wrapNSData([d->m_connection.get() _bufferedData]);
    387 
    388     return 0;
    389371}
    390372

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

    r89213 r95120  
    151151}
    152152
    153 bool ResourceHandle::supportsBufferedData()
    154 {
    155     return false;
    156 }
    157 
    158 PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
    159 {
    160     ASSERT_NOT_REACHED();
    161     return 0;
    162 }
    163 
    164153void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const ResourceRequest& request, StoredCredentials /*storedCredentials*/, ResourceError& error, ResourceResponse& response, Vector<char>& data)
    165154{

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

    r92271 r95120  
    686686}
    687687
    688 PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
    689 {
    690     ASSERT_NOT_REACHED();
    691     return 0;
    692 }
    693 
    694 bool ResourceHandle::supportsBufferedData()
    695 {
    696     return false;
    697 }
    698 
    699688void ResourceHandle::platformSetDefersLoading(bool defersLoading)
    700689{

  • trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp

    r84260 r95120  
    440440}
    441441
    442 PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
    443 {
    444     ASSERT_NOT_REACHED();
    445     return 0;
    446 }
    447 
    448 bool ResourceHandle::supportsBufferedData()
     442bool ResourceHandle::loadsBlocked()
    449443{
    450444    return false;
    451445}
    452446
    453 bool ResourceHandle::loadsBlocked()
    454 {
    455     return false;
    456 }
    457 
    458447void ResourceHandle::platformSetDefersLoading(bool)
    459448{
Note: See TracChangeset for help on using the changeset viewer.