<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170799] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170799">170799</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-07-04 01:50:56 -0700 (Fri, 04 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore: Unreviewed. Fixing the build after <a href="http://trac.webkit.org/projects/webkit/changeset/170795">r170795</a>.
Mac didn't like that change as it seems to properly typedef long long to int64_t.
That's not the case on 64-bit Linux (for some reason), so I'm changing the type of
the two long long variables in FormDataElement to int64_t to avoid any further trouble.
* platform/network/FormData.h:
Source/WebKit2: Unreviewed. Reverting the bad changes introduced in <a href="http://trac.webkit.org/projects/webkit/changeset/170795">r170795</a>.
* Platform/IPC/ArgumentDecoder.cpp:
(IPC::ArgumentDecoder::decode): Deleted.
* Platform/IPC/ArgumentDecoder.h:
* Platform/IPC/ArgumentEncoder.cpp:
(IPC::ArgumentEncoder::encode): Deleted.
* Platform/IPC/ArgumentEncoder.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkFormDatah">trunk/Source/WebCore/platform/network/FormData.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentDecodercpp">trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentDecoderh">trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentEncodercpp">trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentEncoderh">trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170798 => 170799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-04 08:48:58 UTC (rev 170798)
+++ trunk/Source/WebCore/ChangeLog 2014-07-04 08:50:56 UTC (rev 170799)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-07-04 Zan Dobersek <zdobersek@igalia.com>
+
+ Unreviewed. Fixing the build after r170795.
+
+ Mac didn't like that change as it seems to properly typedef long long to int64_t.
+ That's not the case on 64-bit Linux (for some reason), so I'm changing the type of
+ the two long long variables in FormDataElement to int64_t to avoid any further trouble.
+
+ * platform/network/FormData.h:
+
</ins><span class="cx"> 2014-07-03 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> When showing the selection menu, include menu options for all selected phone numbers.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkFormDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/FormData.h (170798 => 170799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/FormData.h 2014-07-04 08:48:58 UTC (rev 170798)
+++ trunk/Source/WebCore/platform/network/FormData.h 2014-07-04 08:50:56 UTC (rev 170799)
</span><span class="lines">@@ -78,8 +78,8 @@
</span><span class="cx"> Vector<char> m_data;
</span><span class="cx"> String m_filename;
</span><span class="cx"> URL m_url; // For Blob or URL.
</span><del>- long long m_fileStart;
- long long m_fileLength;
</del><ins>+ int64_t m_fileStart;
+ int64_t m_fileLength;
</ins><span class="cx"> double m_expectedFileModificationTime;
</span><span class="cx"> // FIXME: Generated file support in FormData is almost identical to Blob, they should be merged.
</span><span class="cx"> // We can't just switch to using Blobs for all files for two reasons:
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170798 => 170799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-04 08:48:58 UTC (rev 170798)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-04 08:50:56 UTC (rev 170799)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-07-04 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ Unreviewed. Reverting the bad changes introduced in r170795.
+
+ * Platform/IPC/ArgumentDecoder.cpp:
+ (IPC::ArgumentDecoder::decode): Deleted.
+ * Platform/IPC/ArgumentDecoder.h:
+ * Platform/IPC/ArgumentEncoder.cpp:
+ (IPC::ArgumentEncoder::encode): Deleted.
+ * Platform/IPC/ArgumentEncoder.h:
+
+2014-07-04 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> Unreviewed. Fixing the build for ports on 64-bit Linux.
</span><span class="cx">
</span><span class="cx"> Add IPC encoding and decoding overloads for the long long type, needed
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp (170798 => 170799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp 2014-07-04 08:48:58 UTC (rev 170798)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.cpp 2014-07-04 08:50:56 UTC (rev 170799)
</span><span class="lines">@@ -214,15 +214,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentDecoder::decode(long long& result)
-{
- if (!alignBufferPosition(sizeof(result), sizeof(result)))
- return false;
-
- decodeValueFromBuffer(result, m_bufferPos);
- return true;
-}
-
</del><span class="cx"> bool ArgumentDecoder::removeAttachment(Attachment& attachment)
</span><span class="cx"> {
</span><span class="cx"> if (m_attachments.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.h (170798 => 170799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.h 2014-07-04 08:48:58 UTC (rev 170798)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentDecoder.h 2014-07-04 08:50:56 UTC (rev 170799)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> bool decode(int64_t&);
</span><span class="cx"> bool decode(float&);
</span><span class="cx"> bool decode(double&);
</span><del>- bool decode(long long&);
</del><span class="cx">
</span><span class="cx"> template<typename T> bool decodeEnum(T& result)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp (170798 => 170799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp 2014-07-04 08:48:58 UTC (rev 170798)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.cpp 2014-07-04 08:50:56 UTC (rev 170799)
</span><span class="lines">@@ -188,12 +188,6 @@
</span><span class="cx"> copyValueToBuffer(n, buffer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentEncoder::encode(long long n)
-{
- uint8_t* buffer = grow(sizeof(n), sizeof(n));
- copyValueToBuffer(n, buffer);
-}
-
</del><span class="cx"> void ArgumentEncoder::addAttachment(const Attachment& attachment)
</span><span class="cx"> {
</span><span class="cx"> m_attachments.append(attachment);
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentEncoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h (170798 => 170799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h 2014-07-04 08:48:58 UTC (rev 170798)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentEncoder.h 2014-07-04 08:50:56 UTC (rev 170799)
</span><span class="lines">@@ -79,7 +79,6 @@
</span><span class="cx"> void encode(int64_t);
</span><span class="cx"> void encode(float);
</span><span class="cx"> void encode(double);
</span><del>- void encode(long long);
</del><span class="cx">
</span><span class="cx"> uint8_t* grow(unsigned alignment, size_t size);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>