Changeset 175920 in webkit

Timestamp:

Nov 11, 2014, 7:10:50 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r175299 - Cast std::chrono::duration.count() to int64_t in ArgumentCoder
​https://bugs.webkit.org/show_bug.cgi?id=136981

Patch by Ting-Wei Lan <Ting-Wei Lan> on 2014-10-28
Reviewed by Alexey Proskuryakov.

Explicitly cast the return value of std::chrono::duration.count() to
a fixed-size interger type, which prevents compilation error when
the return value type matches neither int32_t nor int64_t.

• Platform/IPC/ArgumentCoders.h:

Location:

releases/WebKitGTK/webkit-2.6/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/IPC/ArgumentCoders.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-10-28  Ting-Wei Lan  <lantw44@gmail.com>
+
+        Cast std::chrono::duration.count() to int64_t in ArgumentCoder
+        https://bugs.webkit.org/show_bug.cgi?id=136981
+
+        Reviewed by Alexey Proskuryakov.
+
+        Explicitly cast the return value of std::chrono::duration.count() to
+        a fixed-size interger type, which prevents compilation error when
+        the return value type matches neither int32_t nor int64_t.
+
+        * Platform/IPC/ArgumentCoders.h:
+
 2014-10-27  Chris Dumez  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.6/Source/WebKit2/Platform/IPC/ArgumentCoders.h

@@ -108 +108 @@
     static void encode(ArgumentEncoder& encoder, const std::chrono::duration<Rep, Period>& duration)
     {
-        encoder << duration.count();
+        static_assert(std::is_integral<Rep>::value && std::is_signed<Rep>::value && sizeof(Rep) <= sizeof(int64_t), "Serialization of this Rep type is not supported yet. Only signed integer type which can be fit in an int64_t is currently supported.");
+        encoder << static_cast<int64_t>(duration.count());
     }
 
     static bool decode(ArgumentDecoder& decoder, std::chrono::duration<Rep, Period>& result)
     {
-        Rep count;
+        int64_t count;
         if (!decoder.decode(count))
             return false;
-        result = std::chrono::duration<Rep, Period>(count);
+        result = std::chrono::duration<Rep, Period>(static_cast<Rep>(count));
         return true;
     }