Title: [153352] trunk/Source/WebKit2
- Revision
- 153352
- Author
- k...@webkit.org
- Date
- 2013-07-25 15:36:33 -0700 (Thu, 25 Jul 2013)
Log Message
Build fix: use of long long in CoreIPC::ArgumentEncoder and CoreIPC::ArgumentDecoder
https://bugs.webkit.org/show_bug.cgi?id=118228
Reviewed by Anders Carlsson.
Build fails on some platforms where int64_t and long long are different types.
* Shared/FileAPI/BlobRegistrationData.cpp:
(WebKit::BlobRegistrationData::encode):
Add explicit casts to int64_t.
(WebKit::BlobRegistrationData::decode):
Use int64_t instead of long long.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (153351 => 153352)
--- trunk/Source/WebKit2/ChangeLog 2013-07-25 22:33:08 UTC (rev 153351)
+++ trunk/Source/WebKit2/ChangeLog 2013-07-25 22:36:33 UTC (rev 153352)
@@ -1,3 +1,18 @@
+2013-07-25 Kwang Yul Seo <sk...@company100.net>
+
+ Build fix: use of long long in CoreIPC::ArgumentEncoder and CoreIPC::ArgumentDecoder
+ https://bugs.webkit.org/show_bug.cgi?id=118228
+
+ Reviewed by Anders Carlsson.
+
+ Build fails on some platforms where int64_t and long long are different types.
+
+ * Shared/FileAPI/BlobRegistrationData.cpp:
+ (WebKit::BlobRegistrationData::encode):
+ Add explicit casts to int64_t.
+ (WebKit::BlobRegistrationData::decode):
+ Use int64_t instead of long long.
+
2013-07-25 Anders Carlsson <ander...@apple.com>
Remove lastModifiedDate from ResourceResponse
Modified: trunk/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp (153351 => 153352)
--- trunk/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp 2013-07-25 22:33:08 UTC (rev 153351)
+++ trunk/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp 2013-07-25 22:36:33 UTC (rev 153352)
@@ -88,14 +88,14 @@
encoder << CoreIPC::DataReference(reinterpret_cast<const uint8_t*>(item.data->data()), item.data->length());
break;
case BlobDataItem::File:
- encoder << item.offset;
- encoder << item.length;
+ encoder << static_cast<int64_t>(item.offset);
+ encoder << static_cast<int64_t>(item.length);
encoder << item.expectedModificationTime;
encoder << item.path;
break;
case BlobDataItem::Blob:
- encoder << item.offset;
- encoder << item.length;
+ encoder << static_cast<int64_t>(item.offset);
+ encoder << static_cast<int64_t>(item.length);
encoder << item.url;
break;
}
@@ -138,10 +138,10 @@
break;
}
case BlobDataItem::File: {
- long long offset;
+ int64_t offset;
if (!decoder.decode(offset))
return false;
- long long length;
+ int64_t length;
if (!decoder.decode(length))
return false;
double expectedModificationTime;
@@ -154,10 +154,10 @@
break;
}
case BlobDataItem::Blob: {
- long long offset;
+ int64_t offset;
if (!decoder.decode(offset))
return false;
- long long length;
+ int64_t length;
if (!decoder.decode(length))
return false;
String url;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
