Title: [149256] trunk/Source/WebKit2
- Revision
- 149256
- Author
- [email protected]
- Date
- 2013-04-27 21:53:52 -0700 (Sat, 27 Apr 2013)
Log Message
Build fix.
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::didReceiveBuffer):
Do not declare another variable with the same name.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (149255 => 149256)
--- trunk/Source/WebKit2/ChangeLog 2013-04-28 03:51:20 UTC (rev 149255)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-28 04:53:52 UTC (rev 149256)
@@ -1,3 +1,11 @@
+2013-04-27 Jessie Berlin <[email protected]>
+
+ Build fix.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::didReceiveBuffer):
+ Do not declare another variable with the same name.
+
2013-04-27 Darin Adler <[email protected]>
Move from constructor and member function adoptCF/NS to free function adoptCF/NS.
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (149255 => 149256)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-04-28 03:51:20 UTC (rev 149255)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2013-04-28 04:53:52 UTC (rev 149256)
@@ -183,12 +183,12 @@
m_bytesReceived += buffer->size();
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- ShareableResource::Handle handle;
- tryGetShareableHandleFromSharedBuffer(handle, buffer.get());
- if (!handle.isNull()) {
+ ShareableResource::Handle shareableResourceHandle;
+ tryGetShareableHandleFromSharedBuffer(shareableResourceHandle, buffer.get());
+ if (!shareableResourceHandle.isNull()) {
// Since we're delivering this resource by ourselves all at once, we'll abort the resource handle since we don't need anymore callbacks from ResourceHandle.
abortInProgressLoad();
- send(Messages::WebResourceLoader::DidReceiveResource(handle, currentTime()));
+ send(Messages::WebResourceLoader::DidReceiveResource(shareableResourceHandle, currentTime()));
return;
}
#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
