<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161338] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161338">161338</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-06 03:17:46 -0800 (Mon, 06 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
https://bugs.webkit.org/show_bug.cgi?id=124579
Patch by László Langó <lango@inf.u-szeged.hu> on 2014-01-06
Reviewed by Anders Carlsson.
Source/WebCore:
* WebCore.exp.in:
* loader/NetscapePlugInStreamLoader.cpp:
(WebCore::NetscapePlugInStreamLoader::didReceiveData):
* loader/NetscapePlugInStreamLoader.h:
* loader/PingLoader.h:
* loader/ResourceBuffer.cpp:
(WebCore::ResourceBuffer::ResourceBuffer):
* loader/ResourceBuffer.h:
(WebCore::ResourceBuffer::create):
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::addDataOrBuffer):
(WebCore::ResourceLoader::didReceiveData):
(WebCore::ResourceLoader::didReceiveDataOrBuffer):
(WebCore::ResourceLoader::willStopBufferingData):
* loader/ResourceLoader.h:
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::didReceiveData):
* loader/SubresourceLoader.h:
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::didReceiveData):
* loader/appcache/ApplicationCacheGroup.h:
* loader/mac/ResourceLoaderMac.mm:
(WebCore::ResourceLoader::didReceiveDataArray):
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::SharedBuffer):
* platform/SharedBuffer.h:
(WebCore::SharedBuffer::create):
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(ResourceHandleStreamingClient::didReceiveData):
* platform/network/BlobResourceHandle.cpp:
* platform/network/ResourceHandleClient.h:
(WebCore::ResourceHandleClient::didReceiveData):
(WebCore::ResourceHandleClient::willStopBufferingData):
* platform/network/SynchronousLoaderClient.cpp:
(WebCore::SynchronousLoaderClient::didReceiveData):
* platform/network/SynchronousLoaderClient.h:
* platform/network/blackberry/BlobStream.cpp:
(WebCore::BlobStream::didReceiveData):
* platform/network/blackberry/BlobStream.h:
* platform/network/blackberry/ResourceHandleBlackBerry.cpp:
(WebCore::WebCoreSynchronousLoader::didReceiveData):
* platform/network/curl/ResourceHandleCurl.cpp:
(WebCore::WebCoreSynchronousLoader::didReceiveData):
* platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
(-[WebCoreResourceHandleAsDelegate connection:willStopBufferingData:]):
* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:willStopBufferingData:]):
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::WebCoreSynchronousLoader::didReceiveData):
* platform/network/win/ResourceHandleWin.cpp:
(WebCore::WebCoreSynchronousLoader::didReceiveData):
Source/WebKit/gtk:
* webkit/webkitdownload.cpp:
(DownloadClient::didReceiveData):
Source/WebKit/win:
* WebKitDLL.cpp:
(loadResourceIntoBuffer):
Source/WebKit2:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::didReceiveData):
(WebKit::NetworkResourceLoader::willStopBufferingData):
* NetworkProcess/NetworkResourceLoader.h:
* Shared/Downloads/soup/DownloadSoup.cpp:
(WebKit::DownloadClient::didReceiveData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreloaderNetscapePlugInStreamLoadercpp">trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNetscapePlugInStreamLoaderh">trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderPingLoaderh">trunk/Source/WebCore/loader/PingLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceBuffercpp">trunk/Source/WebCore/loader/ResourceBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceBufferh">trunk/Source/WebCore/loader/ResourceBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadercpp">trunk/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoaderh">trunk/Source/WebCore/loader/ResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoaderh">trunk/Source/WebCore/loader/SubresourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGrouph">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h</a></li>
<li><a href="#trunkSourceWebCoreloadermacResourceLoaderMacmm">trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBuffercpp">trunk/Source/WebCore/platform/SharedBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBufferh">trunk/Source/WebCore/platform/SharedBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobResourceHandlecpp">trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleClienth">trunk/Source/WebCore/platform/network/ResourceHandleClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkSynchronousLoaderClientcpp">trunk/Source/WebCore/platform/network/SynchronousLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkSynchronousLoaderClienth">trunk/Source/WebCore/platform/network/SynchronousLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkblackberryBlobStreamcpp">trunk/Source/WebCore/platform/network/blackberry/BlobStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkblackberryBlobStreamh">trunk/Source/WebCore/platform/network/blackberry/BlobStream.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkblackberryResourceHandleBlackBerrycpp">trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleCurlcpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegatemm">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegatemm">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinResourceHandleWincpp">trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitdownloadcpp">trunk/Source/WebKit/gtk/webkit/webkitdownload.cpp</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebKitDLLcpp">trunk/Source/WebKit/win/WebKitDLL.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadssoupDownloadSoupcpp">trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/ChangeLog 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -1,3 +1,62 @@
</span><ins>+2014-01-06 László Langó <lango@inf.u-szeged.hu>
+
+ Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
+ https://bugs.webkit.org/show_bug.cgi?id=124579
+
+ Reviewed by Anders Carlsson.
+
+ * WebCore.exp.in:
+ * loader/NetscapePlugInStreamLoader.cpp:
+ (WebCore::NetscapePlugInStreamLoader::didReceiveData):
+ * loader/NetscapePlugInStreamLoader.h:
+ * loader/PingLoader.h:
+ * loader/ResourceBuffer.cpp:
+ (WebCore::ResourceBuffer::ResourceBuffer):
+ * loader/ResourceBuffer.h:
+ (WebCore::ResourceBuffer::create):
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::addDataOrBuffer):
+ (WebCore::ResourceLoader::didReceiveData):
+ (WebCore::ResourceLoader::didReceiveDataOrBuffer):
+ (WebCore::ResourceLoader::willStopBufferingData):
+ * loader/ResourceLoader.h:
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::didReceiveData):
+ * loader/SubresourceLoader.h:
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::didReceiveData):
+ * loader/appcache/ApplicationCacheGroup.h:
+ * loader/mac/ResourceLoaderMac.mm:
+ (WebCore::ResourceLoader::didReceiveDataArray):
+ * platform/SharedBuffer.cpp:
+ (WebCore::SharedBuffer::SharedBuffer):
+ * platform/SharedBuffer.h:
+ (WebCore::SharedBuffer::create):
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (ResourceHandleStreamingClient::didReceiveData):
+ * platform/network/BlobResourceHandle.cpp:
+ * platform/network/ResourceHandleClient.h:
+ (WebCore::ResourceHandleClient::didReceiveData):
+ (WebCore::ResourceHandleClient::willStopBufferingData):
+ * platform/network/SynchronousLoaderClient.cpp:
+ (WebCore::SynchronousLoaderClient::didReceiveData):
+ * platform/network/SynchronousLoaderClient.h:
+ * platform/network/blackberry/BlobStream.cpp:
+ (WebCore::BlobStream::didReceiveData):
+ * platform/network/blackberry/BlobStream.h:
+ * platform/network/blackberry/ResourceHandleBlackBerry.cpp:
+ (WebCore::WebCoreSynchronousLoader::didReceiveData):
+ * platform/network/curl/ResourceHandleCurl.cpp:
+ (WebCore::WebCoreSynchronousLoader::didReceiveData):
+ * platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
+ (-[WebCoreResourceHandleAsDelegate connection:willStopBufferingData:]):
+ * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+ (-[WebCoreResourceHandleAsOperationQueueDelegate connection:willStopBufferingData:]):
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::WebCoreSynchronousLoader::didReceiveData):
+ * platform/network/win/ResourceHandleWin.cpp:
+ (WebCore::WebCoreSynchronousLoader::didReceiveData):
+
</ins><span class="cx"> 2014-01-06 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderBlock::clone() should return RenderPtr.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -233,8 +233,8 @@
</span><span class="cx"> __ZN7WebCore12SharedBuffer12createNSDataEv
</span><span class="cx"> __ZN7WebCore12SharedBuffer24createWithContentsOfFileERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore12SharedBuffer6appendEPKcj
</span><del>-__ZN7WebCore12SharedBufferC1EPKci
-__ZN7WebCore12SharedBufferC1EPKhi
</del><ins>+__ZN7WebCore12SharedBufferC1EPKcj
+__ZN7WebCore12SharedBufferC1EPKhj
</ins><span class="cx"> __ZN7WebCore12SharedBufferC1Ev
</span><span class="cx"> __ZN7WebCore12SharedBufferD1Ev
</span><span class="cx"> __ZN7WebCore12TextEncodingC1ERKN3WTF6StringE
</span><span class="lines">@@ -354,7 +354,7 @@
</span><span class="cx"> __ZN7WebCore14PluginDocument12pluginWidgetEv
</span><span class="cx"> __ZN7WebCore14ResourceBuffer12createNSDataEv
</span><span class="cx"> __ZN7WebCore14ResourceBuffer6appendEPKcj
</span><del>-__ZN7WebCore14ResourceBufferC1EPKci
</del><ins>+__ZN7WebCore14ResourceBufferC1EPKcj
</ins><span class="cx"> __ZN7WebCore14ResourceBufferC1Ev
</span><span class="cx"> __ZN7WebCore14ResourceBufferC2Ev
</span><span class="cx"> __ZN7WebCore14ResourceBufferD1Ev
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNetscapePlugInStreamLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> cancel(frameLoader()->client().fileDoesNotExistError(response));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetscapePlugInStreamLoader::didReceiveData(const char* data, int length, long long encodedDataLength, DataPayloadType dataPayloadType)
</del><ins>+void NetscapePlugInStreamLoader::didReceiveData(const char* data, unsigned length, long long encodedDataLength, DataPayloadType dataPayloadType)
</ins><span class="cx"> {
</span><span class="cx"> didReceiveDataOrBuffer(data, length, 0, encodedDataLength, dataPayloadType);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNetscapePlugInStreamLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void didReceiveResponse(const ResourceResponse&) OVERRIDE;
</span><del>- virtual void didReceiveData(const char*, int, long long encodedDataLength, DataPayloadType) OVERRIDE;
</del><ins>+ virtual void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType) OVERRIDE;
</ins><span class="cx"> virtual void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType) OVERRIDE;
</span><span class="cx"> virtual void didFinishLoading(double finishTime) OVERRIDE;
</span><span class="cx"> virtual void didFail(const ResourceError&) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPingLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PingLoader.h (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PingLoader.h 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/loader/PingLoader.h 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> PingLoader(Frame*, ResourceRequest&);
</span><span class="cx">
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE { delete this; }
</span><del>- virtual void didReceiveData(ResourceHandle*, const char*, int, int) OVERRIDE { delete this; }
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int) OVERRIDE { delete this; }
</ins><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double) OVERRIDE { delete this; }
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE { delete this; }
</span><span class="cx"> virtual bool shouldUseCredentialStorage(ResourceHandle*) OVERRIDE { return m_shouldUseCredentialStorage; }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceBuffer.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceBuffer.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/loader/ResourceBuffer.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ResourceBuffer::ResourceBuffer(const char* data, int size)
</del><ins>+ResourceBuffer::ResourceBuffer(const char* data, unsigned size)
</ins><span class="cx"> : m_sharedBuffer(SharedBuffer::create(data, size))
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceBuffer.h (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceBuffer.h 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/loader/ResourceBuffer.h 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> public:
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<ResourceBuffer> create() { return adoptRef(new ResourceBuffer); }
</span><del>- static PassRefPtr<ResourceBuffer> create(const char* data, int size) { return adoptRef(new ResourceBuffer(data, size)); }
</del><ins>+ static PassRefPtr<ResourceBuffer> create(const char* data, unsigned size) { return adoptRef(new ResourceBuffer(data, size)); }
</ins><span class="cx"> static PassRefPtr<ResourceBuffer> adoptSharedBuffer(PassRefPtr<SharedBuffer> shared) { return shared ? adoptRef(new ResourceBuffer(shared)) : 0; }
</span><span class="cx">
</span><span class="cx"> virtual ~ResourceBuffer();
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> ResourceBuffer();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ResourceBuffer(const char*, int);
</del><ins>+ ResourceBuffer(const char*, unsigned);
</ins><span class="cx"> ResourceBuffer(PassRefPtr<SharedBuffer>);
</span><span class="cx">
</span><span class="cx"> RefPtr<SharedBuffer> m_sharedBuffer;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-void ResourceLoader::addDataOrBuffer(const char* data, int length, SharedBuffer* buffer, DataPayloadType dataPayloadType)
</del><ins>+void ResourceLoader::addDataOrBuffer(const char* data, unsigned length, SharedBuffer* buffer, DataPayloadType dataPayloadType)
</ins><span class="cx"> {
</span><span class="cx"> if (m_options.dataBufferingPolicy == DoNotBufferData)
</span><span class="cx"> return;
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> frameLoader()->notifier().didReceiveResponse(this, m_response);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoader::didReceiveData(const char* data, int length, long long encodedDataLength, DataPayloadType dataPayloadType)
</del><ins>+void ResourceLoader::didReceiveData(const char* data, unsigned length, long long encodedDataLength, DataPayloadType dataPayloadType)
</ins><span class="cx"> {
</span><span class="cx"> // The following assertions are not quite valid here, since a subclass
</span><span class="cx"> // might override didReceiveData in a way that invalidates them. This
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> didReceiveDataOrBuffer(0, 0, buffer, encodedDataLength, dataPayloadType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoader::didReceiveDataOrBuffer(const char* data, int length, PassRefPtr<SharedBuffer> prpBuffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</del><ins>+void ResourceLoader::didReceiveDataOrBuffer(const char* data, unsigned length, PassRefPtr<SharedBuffer> prpBuffer, long long encodedDataLength, DataPayloadType dataPayloadType)
</ins><span class="cx"> {
</span><span class="cx"> // This method should only get data+length *OR* a SharedBuffer.
</span><span class="cx"> ASSERT(!prpBuffer || (!data && !length));
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> frameLoader()->notifier().didReceiveData(this, buffer ? buffer->data() : data, buffer ? buffer->size() : length, static_cast<int>(encodedDataLength));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoader::willStopBufferingData(const char* data, int length)
</del><ins>+void ResourceLoader::willStopBufferingData(const char* data, unsigned length)
</ins><span class="cx"> {
</span><span class="cx"> if (m_options.dataBufferingPolicy == DoNotBufferData)
</span><span class="cx"> return;
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> didReceiveResponse(response);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, int length, int encodedDataLength)
</del><ins>+void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int encodedDataLength)
</ins><span class="cx"> {
</span><span class="cx"> InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceData(m_frame.get(), identifier(), encodedDataLength);
</span><span class="cx"> didReceiveData(data, length, encodedDataLength, DataPayloadBytes);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.h (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.h 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx"> virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse);
</span><span class="cx"> virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
</span><span class="cx"> virtual void didReceiveResponse(const ResourceResponse&);
</span><del>- virtual void didReceiveData(const char*, int, long long encodedDataLength, DataPayloadType);
</del><ins>+ virtual void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType);
</ins><span class="cx"> virtual void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType);
</span><del>- void willStopBufferingData(const char*, int);
</del><ins>+ void willStopBufferingData(const char*, unsigned);
</ins><span class="cx"> virtual void didFinishLoading(double finishTime);
</span><span class="cx"> virtual void didFail(const ResourceError&);
</span><span class="cx"> #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><span class="lines">@@ -114,14 +114,14 @@
</span><span class="cx"> virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse& redirectResponse) OVERRIDE;
</span><span class="cx"> virtual void didSendData(ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE;
</span><del>- virtual void didReceiveData(ResourceHandle*, const char*, int, int encodedDataLength) OVERRIDE;
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int encodedDataLength) OVERRIDE;
</ins><span class="cx"> virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedDataLength) OVERRIDE;
</span><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double finishTime) OVERRIDE;
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE;
</span><span class="cx"> virtual void wasBlocked(ResourceHandle*) OVERRIDE;
</span><span class="cx"> virtual void cannotShowURL(ResourceHandle*) OVERRIDE;
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- virtual void willStopBufferingData(ResourceHandle*, const char* data, int length) OVERRIDE { willStopBufferingData(data, length); }
</del><ins>+ virtual void willStopBufferingData(ResourceHandle*, const char* data, unsigned length) OVERRIDE { willStopBufferingData(data, length); }
</ins><span class="cx"> #endif
</span><span class="cx"> virtual bool shouldUseCredentialStorage(ResourceHandle*) OVERRIDE { return shouldUseCredentialStorage(); }
</span><span class="cx"> virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) OVERRIDE { didReceiveAuthenticationChallenge(challenge); }
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx">
</span><span class="cx"> bool wasCancelled() const { return m_cancellationStatus >= Cancelled; }
</span><span class="cx">
</span><del>- void didReceiveDataOrBuffer(const char*, int, PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType);
</del><ins>+ void didReceiveDataOrBuffer(const char*, unsigned, PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType);
</ins><span class="cx">
</span><span class="cx"> const ResourceLoaderOptions& options() { return m_options; }
</span><span class="cx">
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> virtual void willCancel(const ResourceError&) = 0;
</span><span class="cx"> virtual void didCancel(const ResourceError&) = 0;
</span><span class="cx">
</span><del>- void addDataOrBuffer(const char*, int, SharedBuffer*, DataPayloadType);
</del><ins>+ void addDataOrBuffer(const char*, unsigned, SharedBuffer*, DataPayloadType);
</ins><span class="cx">
</span><span class="cx"> ResourceRequest m_request;
</span><span class="cx"> ResourceRequest m_originalRequest; // Before redirects.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> checkForHTTPStatusCodeError();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SubresourceLoader::didReceiveData(const char* data, int length, long long encodedDataLength, DataPayloadType dataPayloadType)
</del><ins>+void SubresourceLoader::didReceiveData(const char* data, unsigned length, long long encodedDataLength, DataPayloadType dataPayloadType)
</ins><span class="cx"> {
</span><span class="cx"> didReceiveDataOrBuffer(data, length, 0, encodedDataLength, dataPayloadType);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.h (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.h 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/loader/SubresourceLoader.h 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse) OVERRIDE;
</span><span class="cx"> virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
</span><span class="cx"> virtual void didReceiveResponse(const ResourceResponse&) OVERRIDE;
</span><del>- virtual void didReceiveData(const char*, int, long long encodedDataLength, DataPayloadType) OVERRIDE;
</del><ins>+ virtual void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType) OVERRIDE;
</ins><span class="cx"> virtual void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType) OVERRIDE;
</span><span class="cx"> virtual void didFinishLoading(double finishTime) OVERRIDE;
</span><span class="cx"> virtual void didFail(const ResourceError&) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -595,7 +595,7 @@
</span><span class="cx"> m_currentResource = ApplicationCacheResource::create(url, response, type);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationCacheGroup::didReceiveData(ResourceHandle* handle, const char* data, int length, int encodedDataLength)
</del><ins>+void ApplicationCacheGroup::didReceiveData(ResourceHandle* handle, const char* data, unsigned length, int encodedDataLength)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(encodedDataLength);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> virtual bool shouldUseCredentialStorage(ResourceHandle*) OVERRIDE { return true; }
</span><span class="cx">
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE;
</span><del>- virtual void didReceiveData(ResourceHandle*, const char*, int length, int encodedDataLength) OVERRIDE;
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned length, int encodedDataLength) OVERRIDE;
</ins><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double finishTime) OVERRIDE;
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadermacResourceLoaderMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> CFIndex arrayCount = CFArrayGetCount(dataArray);
</span><span class="cx"> for (CFIndex i = 0; i < arrayCount; ++i) {
</span><span class="cx"> CFDataRef data = static_cast<CFDataRef>(CFArrayGetValueAtIndex(dataArray, i));
</span><del>- int dataLen = static_cast<int>(CFDataGetLength(data));
</del><ins>+ unsigned dataLen = static_cast<unsigned>(CFDataGetLength(data));
</ins><span class="cx">
</span><span class="cx"> if (m_options.dataBufferingPolicy == BufferData) {
</span><span class="cx"> if (!m_resourceData)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SharedBuffer::SharedBuffer(size_t size)
</del><ins>+SharedBuffer::SharedBuffer(unsigned size)
</ins><span class="cx"> : m_size(size)
</span><span class="cx"> , m_buffer(size)
</span><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SharedBuffer::SharedBuffer(const char* data, int size)
</del><ins>+SharedBuffer::SharedBuffer(const char* data, unsigned size)
</ins><span class="cx"> : m_size(0)
</span><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> , m_isMemoryMapped(false)
</span><span class="lines">@@ -96,14 +96,10 @@
</span><span class="cx"> , m_notifyMemoryMappedCallbackData(nullptr)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- // FIXME: Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
- if (size < 0)
- CRASH();
-
</del><span class="cx"> append(data, size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SharedBuffer::SharedBuffer(const unsigned char* data, int size)
</del><ins>+SharedBuffer::SharedBuffer(const unsigned char* data, unsigned size)
</ins><span class="cx"> : m_size(0)
</span><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> , m_isMemoryMapped(false)
</span><span class="lines">@@ -112,10 +108,6 @@
</span><span class="cx"> , m_notifyMemoryMappedCallbackData(nullptr)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- // FIXME: Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
- if (size < 0)
- CRASH();
-
</del><span class="cx"> append(reinterpret_cast<const char*>(data), size);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.h (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.h 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -52,9 +52,9 @@
</span><span class="cx"> class SharedBuffer : public RefCounted<SharedBuffer> {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<SharedBuffer> create() { return adoptRef(new SharedBuffer); }
</span><del>- static PassRefPtr<SharedBuffer> create(size_t size) { return adoptRef(new SharedBuffer(size)); }
- static PassRefPtr<SharedBuffer> create(const char* c, int i) { return adoptRef(new SharedBuffer(c, i)); }
- static PassRefPtr<SharedBuffer> create(const unsigned char* c, int i) { return adoptRef(new SharedBuffer(c, i)); }
</del><ins>+ static PassRefPtr<SharedBuffer> create(unsigned size) { return adoptRef(new SharedBuffer(size)); }
+ static PassRefPtr<SharedBuffer> create(const char* c, unsigned i) { return adoptRef(new SharedBuffer(c, i)); }
+ static PassRefPtr<SharedBuffer> create(const unsigned char* c, unsigned i) { return adoptRef(new SharedBuffer(c, i)); }
</ins><span class="cx">
</span><span class="cx"> static PassRefPtr<SharedBuffer> createWithContentsOfFile(const String& filePath);
</span><span class="cx">
</span><span class="lines">@@ -168,9 +168,9 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> SharedBuffer();
</span><del>- explicit SharedBuffer(size_t);
- SharedBuffer(const char*, int);
- SharedBuffer(const unsigned char*, int);
</del><ins>+ explicit SharedBuffer(unsigned);
+ SharedBuffer(const char*, unsigned);
+ SharedBuffer(const unsigned char*, unsigned);
</ins><span class="cx">
</span><span class="cx"> // Calling this function will force internal segmented buffers
</span><span class="cx"> // to be merged into a flat buffer. Use getSomeData() whenever possible
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> virtual char* getOrCreateReadBuffer(size_t requestedSize, size_t& actualSize);
</span><span class="cx"> virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse&);
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
</span><del>- virtual void didReceiveData(ResourceHandle*, const char*, int, int);
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int);
</ins><span class="cx"> virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedLength);
</span><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/);
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&);
</span><span class="lines">@@ -1117,7 +1117,7 @@
</span><span class="cx"> handleResponseReceived(response);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceHandleStreamingClient::didReceiveData(ResourceHandle*, const char* data, int length, int)
</del><ins>+void ResourceHandleStreamingClient::didReceiveData(ResourceHandle*, const char* data, unsigned length, int)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> BlobResourceSynchronousLoader(ResourceError&, ResourceResponse&, Vector<char>&);
</span><span class="cx">
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE;
</span><del>- virtual void didReceiveData(ResourceHandle*, const char*, int, int /*encodedDataLength*/) OVERRIDE;
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) OVERRIDE;
</ins><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/) OVERRIDE;
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE;
</span><span class="cx">
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> static_cast<BlobResourceHandle*>(handle)->readSync(m_data.data(), static_cast<int>(m_data.size()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BlobResourceSynchronousLoader::didReceiveData(ResourceHandle*, const char*, int, int)
</del><ins>+void BlobResourceSynchronousLoader::didReceiveData(ResourceHandle*, const char*, unsigned, int)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleClient.h (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) { }
</span><span class="cx">
</span><del>- virtual void didReceiveData(ResourceHandle*, const char*, int, int /*encodedDataLength*/) { }
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) { }
</ins><span class="cx"> virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer>, int encodedDataLength);
</span><span class="cx">
</span><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/) { }
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx">
</span><span class="cx"> #elif PLATFORM(MAC)
</span><span class="cx"> virtual NSCachedURLResponse *willCacheResponse(ResourceHandle*, NSCachedURLResponse *response) { return response; }
</span><del>- virtual void willStopBufferingData(ResourceHandle*, const char*, int) { }
</del><ins>+ virtual void willStopBufferingData(ResourceHandle*, const char*, unsigned) { }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSynchronousLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SynchronousLoaderClient.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SynchronousLoaderClient.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/network/SynchronousLoaderClient.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> m_response = response;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SynchronousLoaderClient::didReceiveData(ResourceHandle*, const char* data, int length, int /*encodedDataLength*/)
</del><ins>+void SynchronousLoaderClient::didReceiveData(ResourceHandle*, const char* data, unsigned length, int /*encodedDataLength*/)
</ins><span class="cx"> {
</span><span class="cx"> m_data.append(data, length);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkSynchronousLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/SynchronousLoaderClient.h (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/SynchronousLoaderClient.h 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/network/SynchronousLoaderClient.h 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> virtual bool shouldUseCredentialStorage(ResourceHandle*) OVERRIDE;
</span><span class="cx"> virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge&) OVERRIDE;
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) OVERRIDE;
</span><del>- virtual void didReceiveData(ResourceHandle*, const char*, int, int /*encodedDataLength*/) OVERRIDE;
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int /*encodedDataLength*/) OVERRIDE;
</ins><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/) OVERRIDE;
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE;
</span><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkblackberryBlobStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/blackberry/BlobStream.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/blackberry/BlobStream.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/network/blackberry/BlobStream.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BlobStream::didReceiveData(ResourceHandle*, const char* data, int len, int)
</del><ins>+void BlobStream::didReceiveData(ResourceHandle*, const char* data, unsigned len, int)
</ins><span class="cx"> {
</span><span class="cx"> notifyDataReceived(BlackBerry::Platform::createNetworkBufferByWrappingData(data, len));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkblackberryBlobStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/blackberry/BlobStream.h (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/blackberry/BlobStream.h 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/network/blackberry/BlobStream.h 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> virtual const BlackBerry::Platform::String mimeType() const OVERRIDE;
</span><span class="cx">
</span><span class="cx"> // From class ResourceHandleClient.
</span><del>- virtual void didReceiveData(ResourceHandle*, const char*, int, int) OVERRIDE;
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int) OVERRIDE;
</ins><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double) OVERRIDE;
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkblackberryResourceHandleBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> WebCoreSynchronousLoader();
</span><span class="cx">
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
</span><del>- virtual void didReceiveData(ResourceHandle*, const char*, int, int);
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int);
</ins><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double);
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&);
</span><span class="cx">
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> m_response = response;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, int length, int)
</del><ins>+void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int)
</ins><span class="cx"> {
</span><span class="cx"> m_data.append(data, length);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> WebCoreSynchronousLoader();
</span><span class="cx">
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
</span><del>- virtual void didReceiveData(ResourceHandle*, const char*, int, int encodedDataLength);
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int encodedDataLength);
</ins><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/);
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&);
</span><span class="cx">
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> m_response = response;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, int length, int)
</del><ins>+void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int)
</ins><span class="cx"> {
</span><span class="cx"> m_data.append(data, length);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> // FIXME: If we get a resource with more than 2B bytes, this code won't do the right thing.
</span><span class="cx"> // However, with today's computers and networking speeds, this won't happen in practice.
</span><span class="cx"> // Could be an issue with a giant local file.
</span><del>- m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<int>([data length]));
</del><ins>+ m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<unsigned>([data length]));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)connection:(NSURLConnection *)connection didSendBodyData:(NSInteger)bytesWritten totalBytesWritten:(NSInteger)totalBytesWritten totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> // FIXME: If we get a resource with more than 2B bytes, this code won't do the right thing.
</span><span class="cx"> // However, with today's computers and networking speeds, this won't happen in practice.
</span><span class="cx"> // Could be an issue with a giant local file.
</span><del>- m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<int>([data length]));
</del><ins>+ m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<unsigned>([data length]));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> m_response = response;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void didReceiveData(ResourceHandle*, const char* /* data */, int /* length */, int)
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char* /* data */, unsigned /* length */, int)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinResourceHandleWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> HINTERNET internetHandle() const { return m_internetHandle; }
</span><span class="cx">
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
</span><del>- virtual void didReceiveData(ResourceHandle*, const char*, int, int encodedDataLength);
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int encodedDataLength);
</ins><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double /*finishTime*/);
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&);
</span><span class="cx">
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> m_response = response;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, int length, int)
</del><ins>+void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int)
</ins><span class="cx"> {
</span><span class="cx"> m_data.append(data, length);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-06 László Langó <lango@inf.u-szeged.hu>
+
+ Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
+ https://bugs.webkit.org/show_bug.cgi?id=124579
+
+ Reviewed by Anders Carlsson.
+
+ * webkit/webkitdownload.cpp:
+ (DownloadClient::didReceiveData):
+
</ins><span class="cx"> 2014-01-02 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r160304): [GTK] Disable libtool fast install
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitdownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitdownload.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitdownload.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebKit/gtk/webkit/webkitdownload.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> DownloadClient(WebKitDownload*);
</span><span class="cx">
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
</span><del>- virtual void didReceiveData(ResourceHandle*, const char*, int, int);
</del><ins>+ virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int);
</ins><span class="cx"> virtual void didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer> buffer, int encodedLength);
</span><span class="cx"> virtual void didFinishLoading(ResourceHandle*, double);
</span><span class="cx"> virtual void didFail(ResourceHandle*, const ResourceError&);
</span><span class="lines">@@ -941,7 +941,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DownloadClient::didReceiveData(ResourceHandle*, const char* data, int length, int encodedDataLength)
</del><ins>+void DownloadClient::didReceiveData(ResourceHandle*, const char* data, unsigned length, int encodedDataLength)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebKit/win/ChangeLog 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-06 László Langó <lango@inf.u-szeged.hu>
+
+ Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
+ https://bugs.webkit.org/show_bug.cgi?id=124579
+
+ Reviewed by Anders Carlsson.
+
+ * WebKitDLL.cpp:
+ (loadResourceIntoBuffer):
+
</ins><span class="cx"> 2013-12-30 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Cleanup static_cast<HTMLFormElement*> by using toHTMLFormElement()
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitDLLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitDLL.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitDLL.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebKit/win/WebKitDLL.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> void* resource = LockResource(res);
</span><span class="cx"> if (!resource)
</span><span class="cx"> return 0;
</span><del>- int size = SizeofResource(gInstance, resInfo);
</del><ins>+ unsigned size = SizeofResource(gInstance, resInfo);
</ins><span class="cx">
</span><span class="cx"> return WebCore::SharedBuffer::create(reinterpret_cast<const char*>(resource), size);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-01-06 László Langó <lango@inf.u-szeged.hu>
+
+ Use unsigned consistently, and check for invalid casts when calling into SharedBuffer from other code.
+ https://bugs.webkit.org/show_bug.cgi?id=124579
+
+ Reviewed by Anders Carlsson.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::didReceiveData):
+ (WebKit::NetworkResourceLoader::willStopBufferingData):
+ * NetworkProcess/NetworkResourceLoader.h:
+ * Shared/Downloads/soup/DownloadSoup.cpp:
+ (WebKit::DownloadClient::didReceiveData):
+
</ins><span class="cx"> 2014-01-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add encoding of ViewportConstraint and ScrollingParameter types
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkResourceLoader::didReceiveData(ResourceHandle*, const char* data, int length, int encodedDataLength)
</del><ins>+void NetworkResourceLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int encodedDataLength)
</ins><span class="cx"> {
</span><span class="cx"> // The NetworkProcess should never get a didReceiveData callback.
</span><span class="cx"> // We should always be using didReceiveBuffer.
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-void NetworkResourceLoader::willStopBufferingData(ResourceHandle*, const char*, int)
</del><ins>+void NetworkResourceLoader::willStopBufferingData(ResourceHandle*, const char*, unsigned)
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> virtual void willSendRequestAsync(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) OVERRIDE;
</span><span class="cx"> virtual void didSendData(WebCore::ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
</span><span class="cx"> virtual void didReceiveResponseAsync(WebCore::ResourceHandle*, const WebCore::ResourceResponse&) OVERRIDE;
</span><del>- virtual void didReceiveData(WebCore::ResourceHandle*, const char*, int, int encodedDataLength) OVERRIDE;
</del><ins>+ virtual void didReceiveData(WebCore::ResourceHandle*, const char*, unsigned, int encodedDataLength) OVERRIDE;
</ins><span class="cx"> virtual void didReceiveBuffer(WebCore::ResourceHandle*, PassRefPtr<WebCore::SharedBuffer>, int encodedDataLength) OVERRIDE;
</span><span class="cx"> virtual void didFinishLoading(WebCore::ResourceHandle*, double finishTime) OVERRIDE;
</span><span class="cx"> virtual void didFail(WebCore::ResourceHandle*, const WebCore::ResourceError&) OVERRIDE;
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> virtual void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) OVERRIDE;
</span><span class="cx"> #endif
</span><del>- virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, int) OVERRIDE;
</del><ins>+ virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, unsigned) OVERRIDE;
</ins><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadssoupDownloadSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp (161337 => 161338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp 2014-01-06 10:39:36 UTC (rev 161337)
+++ trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp 2014-01-06 11:17:46 UTC (rev 161338)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> m_download->didCreateDestination(destinationURI);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void didReceiveData(ResourceHandle*, const char* data, int length, int /*encodedDataLength*/)
</del><ins>+ void didReceiveData(ResourceHandle*, const char* data, unsigned length, int /*encodedDataLength*/)
</ins><span class="cx"> {
</span><span class="cx"> if (m_handleResponseLaterID) {
</span><span class="cx"> g_source_remove(m_handleResponseLaterID);
</span></span></pre>
</div>
</div>
</body>
</html>