Changeset 153352 in webkit

Timestamp:

Jul 25, 2013 3:36:33 PM (11 years ago)

Author:

kseo@webkit.org

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/FileAPI/BlobRegistrationData.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-07-25  Kwang Yul Seo  <skyul@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  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp

@@ -89 +89 @@
             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;
@@ -139 +139 @@
         }
         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;
@@ -155 +155 @@
         }
         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;