Changeset 161338 in webkit
- Timestamp:
- Jan 6, 2014 3:17:46 AM (10 years ago)
- Location:
- trunk/Source
- Files:
-
- 37 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r161337 r161338 1 2014-01-06 László Langó <lango@inf.u-szeged.hu> 2 3 Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code. 4 https://bugs.webkit.org/show_bug.cgi?id=124579 5 6 Reviewed by Anders Carlsson. 7 8 * WebCore.exp.in: 9 * loader/NetscapePlugInStreamLoader.cpp: 10 (WebCore::NetscapePlugInStreamLoader::didReceiveData): 11 * loader/NetscapePlugInStreamLoader.h: 12 * loader/PingLoader.h: 13 * loader/ResourceBuffer.cpp: 14 (WebCore::ResourceBuffer::ResourceBuffer): 15 * loader/ResourceBuffer.h: 16 (WebCore::ResourceBuffer::create): 17 * loader/ResourceLoader.cpp: 18 (WebCore::ResourceLoader::addDataOrBuffer): 19 (WebCore::ResourceLoader::didReceiveData): 20 (WebCore::ResourceLoader::didReceiveDataOrBuffer): 21 (WebCore::ResourceLoader::willStopBufferingData): 22 * loader/ResourceLoader.h: 23 * loader/SubresourceLoader.cpp: 24 (WebCore::SubresourceLoader::didReceiveData): 25 * loader/SubresourceLoader.h: 26 * loader/appcache/ApplicationCacheGroup.cpp: 27 (WebCore::ApplicationCacheGroup::didReceiveData): 28 * loader/appcache/ApplicationCacheGroup.h: 29 * loader/mac/ResourceLoaderMac.mm: 30 (WebCore::ResourceLoader::didReceiveDataArray): 31 * platform/SharedBuffer.cpp: 32 (WebCore::SharedBuffer::SharedBuffer): 33 * platform/SharedBuffer.h: 34 (WebCore::SharedBuffer::create): 35 * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: 36 (ResourceHandleStreamingClient::didReceiveData): 37 * platform/network/BlobResourceHandle.cpp: 38 * platform/network/ResourceHandleClient.h: 39 (WebCore::ResourceHandleClient::didReceiveData): 40 (WebCore::ResourceHandleClient::willStopBufferingData): 41 * platform/network/SynchronousLoaderClient.cpp: 42 (WebCore::SynchronousLoaderClient::didReceiveData): 43 * platform/network/SynchronousLoaderClient.h: 44 * platform/network/blackberry/BlobStream.cpp: 45 (WebCore::BlobStream::didReceiveData): 46 * platform/network/blackberry/BlobStream.h: 47 * platform/network/blackberry/ResourceHandleBlackBerry.cpp: 48 (WebCore::WebCoreSynchronousLoader::didReceiveData): 49 * platform/network/curl/ResourceHandleCurl.cpp: 50 (WebCore::WebCoreSynchronousLoader::didReceiveData): 51 * platform/network/mac/WebCoreResourceHandleAsDelegate.mm: 52 (-[WebCoreResourceHandleAsDelegate connection:willStopBufferingData:]): 53 * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm: 54 (-[WebCoreResourceHandleAsOperationQueueDelegate connection:willStopBufferingData:]): 55 * platform/network/soup/ResourceHandleSoup.cpp: 56 (WebCore::WebCoreSynchronousLoader::didReceiveData): 57 * platform/network/win/ResourceHandleWin.cpp: 58 (WebCore::WebCoreSynchronousLoader::didReceiveData): 59 1 60 2014-01-06 Andreas Kling <akling@apple.com> 2 61 -
trunk/Source/WebCore/WebCore.exp.in
r161319 r161338 234 234 __ZN7WebCore12SharedBuffer24createWithContentsOfFileERKN3WTF6StringE 235 235 __ZN7WebCore12SharedBuffer6appendEPKcj 236 __ZN7WebCore12SharedBufferC1EPKc i237 __ZN7WebCore12SharedBufferC1EPKh i236 __ZN7WebCore12SharedBufferC1EPKcj 237 __ZN7WebCore12SharedBufferC1EPKhj 238 238 __ZN7WebCore12SharedBufferC1Ev 239 239 __ZN7WebCore12SharedBufferD1Ev … … 355 355 __ZN7WebCore14ResourceBuffer12createNSDataEv 356 356 __ZN7WebCore14ResourceBuffer6appendEPKcj 357 __ZN7WebCore14ResourceBufferC1EPKc i357 __ZN7WebCore14ResourceBufferC1EPKcj 358 358 __ZN7WebCore14ResourceBufferC1Ev 359 359 __ZN7WebCore14ResourceBufferC2Ev -
trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp
r154962 r161338 95 95 } 96 96 97 void NetscapePlugInStreamLoader::didReceiveData(const char* data, intlength, long long encodedDataLength, DataPayloadType dataPayloadType)97 void NetscapePlugInStreamLoader::didReceiveData(const char* data, unsigned length, long long encodedDataLength, DataPayloadType dataPayloadType) 98 98 { 99 99 didReceiveDataOrBuffer(data, length, 0, encodedDataLength, dataPayloadType); -
trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h
r145820 r161338 58 58 private: 59 59 virtual void didReceiveResponse(const ResourceResponse&) OVERRIDE; 60 virtual void didReceiveData(const char*, int, long long encodedDataLength, DataPayloadType) OVERRIDE;60 virtual void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType) OVERRIDE; 61 61 virtual void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType) OVERRIDE; 62 62 virtual void didFinishLoading(double finishTime) OVERRIDE; -
trunk/Source/WebCore/loader/PingLoader.h
r158558 r161338 66 66 67 67 virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE { delete this; } 68 virtual void didReceiveData(ResourceHandle*, const char*, int, int) OVERRIDE { delete this; }68 virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int) OVERRIDE { delete this; } 69 69 virtual void didFinishLoading(ResourceHandle*, double) OVERRIDE { delete this; } 70 70 virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE { delete this; } -
trunk/Source/WebCore/loader/ResourceBuffer.cpp
r160841 r161338 36 36 } 37 37 38 ResourceBuffer::ResourceBuffer(const char* data, intsize)38 ResourceBuffer::ResourceBuffer(const char* data, unsigned size) 39 39 : m_sharedBuffer(SharedBuffer::create(data, size)) 40 40 { -
trunk/Source/WebCore/loader/ResourceBuffer.h
r160841 r161338 46 46 47 47 static PassRefPtr<ResourceBuffer> create() { return adoptRef(new ResourceBuffer); } 48 static PassRefPtr<ResourceBuffer> create(const char* data, intsize) { return adoptRef(new ResourceBuffer(data, size)); }48 static PassRefPtr<ResourceBuffer> create(const char* data, unsigned size) { return adoptRef(new ResourceBuffer(data, size)); } 49 49 static PassRefPtr<ResourceBuffer> adoptSharedBuffer(PassRefPtr<SharedBuffer> shared) { return shared ? adoptRef(new ResourceBuffer(shared)) : 0; } 50 50 … … 95 95 96 96 private: 97 ResourceBuffer(const char*, int);97 ResourceBuffer(const char*, unsigned); 98 98 ResourceBuffer(PassRefPtr<SharedBuffer>); 99 99 -
trunk/Source/WebCore/loader/ResourceLoader.cpp
r160841 r161338 207 207 208 208 209 void ResourceLoader::addDataOrBuffer(const char* data, intlength, SharedBuffer* buffer, DataPayloadType dataPayloadType)209 void ResourceLoader::addDataOrBuffer(const char* data, unsigned length, SharedBuffer* buffer, DataPayloadType dataPayloadType) 210 210 { 211 211 if (m_options.dataBufferingPolicy == DoNotBufferData) … … 308 308 } 309 309 310 void ResourceLoader::didReceiveData(const char* data, intlength, long long encodedDataLength, DataPayloadType dataPayloadType)310 void ResourceLoader::didReceiveData(const char* data, unsigned length, long long encodedDataLength, DataPayloadType dataPayloadType) 311 311 { 312 312 // The following assertions are not quite valid here, since a subclass … … 324 324 } 325 325 326 void ResourceLoader::didReceiveDataOrBuffer(const char* data, intlength, PassRefPtr<SharedBuffer> prpBuffer, long long encodedDataLength, DataPayloadType dataPayloadType)326 void ResourceLoader::didReceiveDataOrBuffer(const char* data, unsigned length, PassRefPtr<SharedBuffer> prpBuffer, long long encodedDataLength, DataPayloadType dataPayloadType) 327 327 { 328 328 // This method should only get data+length *OR* a SharedBuffer. … … 343 343 } 344 344 345 void ResourceLoader::willStopBufferingData(const char* data, intlength)345 void ResourceLoader::willStopBufferingData(const char* data, unsigned length) 346 346 { 347 347 if (m_options.dataBufferingPolicy == DoNotBufferData) … … 499 499 } 500 500 501 void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, intlength, int encodedDataLength)501 void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int encodedDataLength) 502 502 { 503 503 InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceData(m_frame.get(), identifier(), encodedDataLength); -
trunk/Source/WebCore/loader/ResourceLoader.h
r160841 r161338 93 93 virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent); 94 94 virtual void didReceiveResponse(const ResourceResponse&); 95 virtual void didReceiveData(const char*, int, long long encodedDataLength, DataPayloadType);95 virtual void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType); 96 96 virtual void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType); 97 void willStopBufferingData(const char*, int);97 void willStopBufferingData(const char*, unsigned); 98 98 virtual void didFinishLoading(double finishTime); 99 99 virtual void didFail(const ResourceError&); … … 115 115 virtual void didSendData(ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE; 116 116 virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE; 117 virtual void didReceiveData(ResourceHandle*, const char*, int, int encodedDataLength) OVERRIDE;117 virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int encodedDataLength) OVERRIDE; 118 118 virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedDataLength) OVERRIDE; 119 119 virtual void didFinishLoading(ResourceHandle*, double finishTime) OVERRIDE; … … 122 122 virtual void cannotShowURL(ResourceHandle*) OVERRIDE; 123 123 #if PLATFORM(MAC) 124 virtual void willStopBufferingData(ResourceHandle*, const char* data, intlength) OVERRIDE { willStopBufferingData(data, length); }124 virtual void willStopBufferingData(ResourceHandle*, const char* data, unsigned length) OVERRIDE { willStopBufferingData(data, length); } 125 125 #endif 126 126 virtual bool shouldUseCredentialStorage(ResourceHandle*) OVERRIDE { return shouldUseCredentialStorage(); } … … 172 172 bool wasCancelled() const { return m_cancellationStatus >= Cancelled; } 173 173 174 void didReceiveDataOrBuffer(const char*, int, PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType);174 void didReceiveDataOrBuffer(const char*, unsigned, PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType); 175 175 176 176 const ResourceLoaderOptions& options() { return m_options; } … … 185 185 virtual void didCancel(const ResourceError&) = 0; 186 186 187 void addDataOrBuffer(const char*, int, SharedBuffer*, DataPayloadType);187 void addDataOrBuffer(const char*, unsigned, SharedBuffer*, DataPayloadType); 188 188 189 189 ResourceRequest m_request; -
trunk/Source/WebCore/loader/SubresourceLoader.cpp
r160841 r161338 246 246 } 247 247 248 void SubresourceLoader::didReceiveData(const char* data, intlength, long long encodedDataLength, DataPayloadType dataPayloadType)248 void SubresourceLoader::didReceiveData(const char* data, unsigned length, long long encodedDataLength, DataPayloadType dataPayloadType) 249 249 { 250 250 didReceiveDataOrBuffer(data, length, 0, encodedDataLength, dataPayloadType); -
trunk/Source/WebCore/loader/SubresourceLoader.h
r160841 r161338 68 68 virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE; 69 69 virtual void didReceiveResponse(const ResourceResponse&) OVERRIDE; 70 virtual void didReceiveData(const char*, int, long long encodedDataLength, DataPayloadType) OVERRIDE;70 virtual void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType) OVERRIDE; 71 71 virtual void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType) OVERRIDE; 72 72 virtual void didFinishLoading(double finishTime) OVERRIDE; -
trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
r157075 r161338 596 596 } 597 597 598 void ApplicationCacheGroup::didReceiveData(ResourceHandle* handle, const char* data, intlength, int encodedDataLength)598 void ApplicationCacheGroup::didReceiveData(ResourceHandle* handle, const char* data, unsigned length, int encodedDataLength) 599 599 { 600 600 UNUSED_PARAM(encodedDataLength); -
trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h
r157044 r161338 111 111 112 112 virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE; 113 virtual void didReceiveData(ResourceHandle*, const char*, intlength, int encodedDataLength) OVERRIDE;113 virtual void didReceiveData(ResourceHandle*, const char*, unsigned length, int encodedDataLength) OVERRIDE; 114 114 virtual void didFinishLoading(ResourceHandle*, double finishTime) OVERRIDE; 115 115 virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE; -
trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm
r157007 r161338 80 80 for (CFIndex i = 0; i < arrayCount; ++i) { 81 81 CFDataRef data = static_cast<CFDataRef>(CFArrayGetValueAtIndex(dataArray, i)); 82 int dataLen = static_cast<int>(CFDataGetLength(data));82 unsigned dataLen = static_cast<unsigned>(CFDataGetLength(data)); 83 83 84 84 if (m_options.dataBufferingPolicy == BufferData) { -
trunk/Source/WebCore/platform/SharedBuffer.cpp
r160792 r161338 76 76 } 77 77 78 SharedBuffer::SharedBuffer( size_tsize)78 SharedBuffer::SharedBuffer(unsigned size) 79 79 : m_size(size) 80 80 , m_buffer(size) … … 88 88 } 89 89 90 SharedBuffer::SharedBuffer(const char* data, intsize)90 SharedBuffer::SharedBuffer(const char* data, unsigned size) 91 91 : m_size(0) 92 92 #if ENABLE(DISK_IMAGE_CACHE) … … 97 97 #endif 98 98 { 99 // FIXME: Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.100 if (size < 0)101 CRASH();102 103 99 append(data, size); 104 100 } 105 101 106 SharedBuffer::SharedBuffer(const unsigned char* data, intsize)102 SharedBuffer::SharedBuffer(const unsigned char* data, unsigned size) 107 103 : m_size(0) 108 104 #if ENABLE(DISK_IMAGE_CACHE) … … 113 109 #endif 114 110 { 115 // FIXME: Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.116 if (size < 0)117 CRASH();118 119 111 append(reinterpret_cast<const char*>(data), size); 120 112 } -
trunk/Source/WebCore/platform/SharedBuffer.h
r160310 r161338 53 53 public: 54 54 static PassRefPtr<SharedBuffer> create() { return adoptRef(new SharedBuffer); } 55 static PassRefPtr<SharedBuffer> create( size_tsize) { return adoptRef(new SharedBuffer(size)); }56 static PassRefPtr<SharedBuffer> create(const char* c, inti) { return adoptRef(new SharedBuffer(c, i)); }57 static PassRefPtr<SharedBuffer> create(const unsigned char* c, inti) { return adoptRef(new SharedBuffer(c, i)); }55 static PassRefPtr<SharedBuffer> create(unsigned size) { return adoptRef(new SharedBuffer(size)); } 56 static PassRefPtr<SharedBuffer> create(const char* c, unsigned i) { return adoptRef(new SharedBuffer(c, i)); } 57 static PassRefPtr<SharedBuffer> create(const unsigned char* c, unsigned i) { return adoptRef(new SharedBuffer(c, i)); } 58 58 59 59 static PassRefPtr<SharedBuffer> createWithContentsOfFile(const String& filePath); … … 169 169 private: 170 170 SharedBuffer(); 171 explicit SharedBuffer( size_t);172 SharedBuffer(const char*, int);173 SharedBuffer(const unsigned char*, int);171 explicit SharedBuffer(unsigned); 172 SharedBuffer(const char*, unsigned); 173 SharedBuffer(const unsigned char*, unsigned); 174 174 175 175 // Calling this function will force internal segmented buffers -
trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
r160310 r161338 100 100 virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse&); 101 101 virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&); 102 virtual void didReceiveData(ResourceHandle*, const char*, int, int);102 virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int); 103 103 virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedLength); 104 104 virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/); … … 1118 1118 } 1119 1119 1120 void ResourceHandleStreamingClient::didReceiveData(ResourceHandle*, const char* data, intlength, int)1120 void ResourceHandleStreamingClient::didReceiveData(ResourceHandle*, const char* data, unsigned length, int) 1121 1121 { 1122 1122 ASSERT_NOT_REACHED(); -
trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp
r156550 r161338 86 86 87 87 virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE; 88 virtual void didReceiveData(ResourceHandle*, const char*, int, int /*encodedDataLength*/) OVERRIDE;88 virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) OVERRIDE; 89 89 virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/) OVERRIDE; 90 90 virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE; … … 118 118 } 119 119 120 void BlobResourceSynchronousLoader::didReceiveData(ResourceHandle*, const char*, int, int)120 void BlobResourceSynchronousLoader::didReceiveData(ResourceHandle*, const char*, unsigned, int) 121 121 { 122 122 } -
trunk/Source/WebCore/platform/network/ResourceHandleClient.h
r160467 r161338 68 68 virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) { } 69 69 70 virtual void didReceiveData(ResourceHandle*, const char*, int, int /*encodedDataLength*/) { }70 virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) { } 71 71 virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedDataLength); 72 72 … … 123 123 #elif PLATFORM(MAC) 124 124 virtual NSCachedURLResponse *willCacheResponse(ResourceHandle*, NSCachedURLResponse *response) { return response; } 125 virtual void willStopBufferingData(ResourceHandle*, const char*, int) { }125 virtual void willStopBufferingData(ResourceHandle*, const char*, unsigned) { } 126 126 #endif 127 127 -
trunk/Source/WebCore/platform/network/SynchronousLoaderClient.cpp
r158504 r161338 68 68 } 69 69 70 void SynchronousLoaderClient::didReceiveData(ResourceHandle*, const char* data, intlength, int /*encodedDataLength*/)70 void SynchronousLoaderClient::didReceiveData(ResourceHandle*, const char* data, unsigned length, int /*encodedDataLength*/) 71 71 { 72 72 m_data.append(data, length); -
trunk/Source/WebCore/platform/network/SynchronousLoaderClient.h
r154893 r161338 61 61 virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge&) OVERRIDE; 62 62 virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE; 63 virtual void didReceiveData(ResourceHandle*, const char*, int, int /*encodedDataLength*/) OVERRIDE;63 virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) OVERRIDE; 64 64 virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/) OVERRIDE; 65 65 virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE; -
trunk/Source/WebCore/platform/network/blackberry/BlobStream.cpp
r150217 r161338 38 38 } 39 39 40 void BlobStream::didReceiveData(ResourceHandle*, const char* data, intlen, int)40 void BlobStream::didReceiveData(ResourceHandle*, const char* data, unsigned len, int) 41 41 { 42 42 notifyDataReceived(BlackBerry::Platform::createNetworkBufferByWrappingData(data, len)); -
trunk/Source/WebCore/platform/network/blackberry/BlobStream.h
r150217 r161338 39 39 40 40 // From class ResourceHandleClient. 41 virtual void didReceiveData(ResourceHandle*, const char*, int, int) OVERRIDE;41 virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int) OVERRIDE; 42 42 virtual void didFinishLoading(ResourceHandle*, double) OVERRIDE; 43 43 virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE; -
trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp
r151426 r161338 45 45 46 46 virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&); 47 virtual void didReceiveData(ResourceHandle*, const char*, int, int);47 virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int); 48 48 virtual void didFinishLoading(ResourceHandle*, double); 49 49 virtual void didFail(ResourceHandle*, const ResourceError&); … … 71 71 } 72 72 73 void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, intlength, int)73 void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int) 74 74 { 75 75 m_data.append(data, length); -
trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp
r159587 r161338 49 49 50 50 virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&); 51 virtual void didReceiveData(ResourceHandle*, const char*, int, int encodedDataLength);51 virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int encodedDataLength); 52 52 virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/); 53 53 virtual void didFail(ResourceHandle*, const ResourceError&); … … 72 72 } 73 73 74 void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, intlength, int)74 void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int) 75 75 { 76 76 m_data.append(data, length); -
trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm
r160498 r161338 207 207 // However, with today's computers and networking speeds, this won't happen in practice. 208 208 // Could be an issue with a giant local file. 209 m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast< int>([data length]));209 m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<unsigned>([data length])); 210 210 } 211 211 -
trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
r160498 r161338 304 304 // However, with today's computers and networking speeds, this won't happen in practice. 305 305 // Could be an issue with a giant local file. 306 m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast< int>([data length]));306 m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<unsigned>([data length])); 307 307 }); 308 308 } -
trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
r161179 r161338 145 145 } 146 146 147 virtual void didReceiveData(ResourceHandle*, const char* /* data */, int/* length */, int)147 virtual void didReceiveData(ResourceHandle*, const char* /* data */, unsigned /* length */, int) 148 148 { 149 149 ASSERT_NOT_REACHED(); -
trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp
r156550 r161338 88 88 89 89 virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&); 90 virtual void didReceiveData(ResourceHandle*, const char*, int, int encodedDataLength);90 virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int encodedDataLength); 91 91 virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/); 92 92 virtual void didFail(ResourceHandle*, const ResourceError&); … … 117 117 } 118 118 119 void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, intlength, int)119 void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int) 120 120 { 121 121 m_data.append(data, length); -
trunk/Source/WebKit/gtk/ChangeLog
r161255 r161338 1 2014-01-06 László Langó <lango@inf.u-szeged.hu> 2 3 Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code. 4 https://bugs.webkit.org/show_bug.cgi?id=124579 5 6 Reviewed by Anders Carlsson. 7 8 * webkit/webkitdownload.cpp: 9 (DownloadClient::didReceiveData): 10 1 11 2014-01-02 Carlos Garcia Campos <cgarcia@igalia.com> 2 12 -
trunk/Source/WebKit/gtk/webkit/webkitdownload.cpp
r160310 r161338 68 68 69 69 virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&); 70 virtual void didReceiveData(ResourceHandle*, const char*, int, int);70 virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int); 71 71 virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer> buffer, int encodedLength); 72 72 virtual void didFinishLoading(ResourceHandle*, double); … … 942 942 } 943 943 944 void DownloadClient::didReceiveData(ResourceHandle*, const char* data, intlength, int encodedDataLength)944 void DownloadClient::didReceiveData(ResourceHandle*, const char* data, unsigned length, int encodedDataLength) 945 945 { 946 946 ASSERT_NOT_REACHED(); -
trunk/Source/WebKit/win/ChangeLog
r161166 r161338 1 2014-01-06 László Langó <lango@inf.u-szeged.hu> 2 3 Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code. 4 https://bugs.webkit.org/show_bug.cgi?id=124579 5 6 Reviewed by Anders Carlsson. 7 8 * WebKitDLL.cpp: 9 (loadResourceIntoBuffer): 10 1 11 2013-12-30 Gyuyoung Kim <gyuyoung.kim@samsung.com> 2 12 -
trunk/Source/WebKit/win/WebKitDLL.cpp
r82284 r161338 203 203 if (!resource) 204 204 return 0; 205 intsize = SizeofResource(gInstance, resInfo);205 unsigned size = SizeofResource(gInstance, resInfo); 206 206 207 207 return WebCore::SharedBuffer::create(reinterpret_cast<const char*>(resource), size); -
trunk/Source/WebKit2/ChangeLog
r161329 r161338 1 2014-01-06 László Langó <lango@inf.u-szeged.hu> 2 3 Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code. 4 https://bugs.webkit.org/show_bug.cgi?id=124579 5 6 Reviewed by Anders Carlsson. 7 8 * NetworkProcess/NetworkResourceLoader.cpp: 9 (WebKit::NetworkResourceLoader::didReceiveData): 10 (WebKit::NetworkResourceLoader::willStopBufferingData): 11 * NetworkProcess/NetworkResourceLoader.h: 12 * Shared/Downloads/soup/DownloadSoup.cpp: 13 (WebKit::DownloadClient::didReceiveData): 14 1 15 2014-01-04 Simon Fraser <simon.fraser@apple.com> 2 16 -
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
r161148 r161338 192 192 } 193 193 194 void NetworkResourceLoader::didReceiveData(ResourceHandle*, const char* data, intlength, int encodedDataLength)194 void NetworkResourceLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int encodedDataLength) 195 195 { 196 196 // The NetworkProcess should never get a didReceiveData callback. … … 399 399 400 400 #if PLATFORM(MAC) 401 void NetworkResourceLoader::willStopBufferingData(ResourceHandle*, const char*, int)401 void NetworkResourceLoader::willStopBufferingData(ResourceHandle*, const char*, unsigned) 402 402 { 403 403 notImplemented(); -
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h
r161148 r161338 83 83 virtual void didSendData(WebCore::ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE; 84 84 virtual void didReceiveResponseAsync(WebCore::ResourceHandle*, const WebCore::ResourceResponse&) OVERRIDE; 85 virtual void didReceiveData(WebCore::ResourceHandle*, const char*, int, int encodedDataLength) OVERRIDE;85 virtual void didReceiveData(WebCore::ResourceHandle*, const char*, unsigned, int encodedDataLength) OVERRIDE; 86 86 virtual void didReceiveBuffer(WebCore::ResourceHandle*, PassRefPtr<WebCore::SharedBuffer>, int encodedDataLength) OVERRIDE; 87 87 virtual void didFinishLoading(WebCore::ResourceHandle*, double finishTime) OVERRIDE; … … 109 109 virtual void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) OVERRIDE; 110 110 #endif 111 virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, int) OVERRIDE;111 virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, unsigned) OVERRIDE; 112 112 #endif // PLATFORM(MAC) 113 113 -
trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp
r161156 r161338 111 111 } 112 112 113 void didReceiveData(ResourceHandle*, const char* data, intlength, int /*encodedDataLength*/)113 void didReceiveData(ResourceHandle*, const char* data, unsigned length, int /*encodedDataLength*/) 114 114 { 115 115 if (m_handleResponseLaterID) {
Note: See TracChangeset
for help on using the changeset viewer.