Title: [168413] trunk/Source/WebCore
- Revision
- 168413
- Author
- o...@webkit.org
- Date
- 2014-05-07 00:56:07 -0700 (Wed, 07 May 2014)
Log Message
Fix build errors for BlobDataItem after r168391.
https://bugs.webkit.org/show_bug.cgi?id=132643
Patch by Praveen R Jadhav <pravee...@samsung.com> on 2014-05-07
Reviewed by Carlos Garcia Campos.
Patch updates BlobDataItem params usage in ResourceHandleSoup.cpp
to be inline with r168391.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::blobIsOutOfDate): BlobDataItem class is updated in r168391.
Corresponding parameter changes are done to resolve build error.
(WebCore::addEncodedBlobItemToSoupMessageBody): BlobDataItem class is updated
in r168391. Corresponding parameter changes are done to resolve build error.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (168412 => 168413)
--- trunk/Source/WebCore/ChangeLog 2014-05-07 06:07:34 UTC (rev 168412)
+++ trunk/Source/WebCore/ChangeLog 2014-05-07 07:56:07 UTC (rev 168413)
@@ -1,3 +1,19 @@
+2014-05-07 Praveen R Jadhav <pravee...@samsung.com>
+
+ Fix build errors for BlobDataItem after r168391.
+ https://bugs.webkit.org/show_bug.cgi?id=132643
+
+ Reviewed by Carlos Garcia Campos.
+
+ Patch updates BlobDataItem params usage in ResourceHandleSoup.cpp
+ to be inline with r168391.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::blobIsOutOfDate): BlobDataItem class is updated in r168391.
+ Corresponding parameter changes are done to resolve build error.
+ (WebCore::addEncodedBlobItemToSoupMessageBody): BlobDataItem class is updated
+ in r168391. Corresponding parameter changes are done to resolve build error.
+
2014-05-06 Dean Jackson <d...@apple.com>
Clean up the difference between painting focus rings and adding PDF annotations
Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (168412 => 168413)
--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-05-07 06:07:34 UTC (rev 168412)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-05-07 07:56:07 UTC (rev 168413)
@@ -765,22 +765,21 @@
static bool blobIsOutOfDate(const BlobDataItem& blobItem)
{
ASSERT(blobItem.type == BlobDataItem::File);
- if (!isValidFileTime(blobItem.expectedModificationTime))
+ if (!isValidFileTime(blobItem.file->expectedModificationTime()))
return false;
time_t fileModificationTime;
- if (!getFileModificationTime(blobItem.path, fileModificationTime))
+ if (!getFileModificationTime(blobItem.file->path(), fileModificationTime))
return true;
- return fileModificationTime != static_cast<time_t>(blobItem.expectedModificationTime);
+ return fileModificationTime != static_cast<time_t>(blobItem.file->expectedModificationTime());
}
static void addEncodedBlobItemToSoupMessageBody(SoupMessage* message, const BlobDataItem& blobItem, unsigned long& totalBodySize)
{
if (blobItem.type == BlobDataItem::Data) {
- totalBodySize += blobItem.length;
- soup_message_body_append(message->request_body, SOUP_MEMORY_TEMPORARY,
- blobItem.data->data() + blobItem.offset, blobItem.length);
+ totalBodySize += blobItem.length();
+ soup_message_body_append(message->request_body, SOUP_MEMORY_TEMPORARY, blobItem.data->data() + blobItem.offset(), blobItem.length());
return;
}
@@ -788,11 +787,7 @@
if (blobIsOutOfDate(blobItem))
return;
- addFileToSoupMessageBody(message,
- blobItem.path,
- blobItem.offset,
- blobItem.length == BlobDataItem::toEndOfFile ? 0 : blobItem.length,
- totalBodySize);
+ addFileToSoupMessageBody(message, blobItem.file->path(), blobItem.offset(), blobItem.length() == BlobDataItem::toEndOfFile ? 0 : blobItem.length(), totalBodySize);
}
static void addEncodedBlobToSoupMessageBody(SoupMessage* message, const FormDataElement& element, unsigned long& totalBodySize)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
