<!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>[177749] trunk/Source/WebKit2</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/177749">177749</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-26 12:24:34 -0800 (Fri, 26 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move handle encoding functions to their respective implementation files
https://bugs.webkit.org/show_bug.cgi?id=139957
Reviewed by Dan Bernstein.
* Shared/API/APIFrameHandle.cpp:
(API::FrameHandle::encode):
(API::FrameHandle::decode):
* Shared/API/APIFrameHandle.h:
* Shared/API/APIPageGroupHandle.cpp:
(API::PageGroupHandle::PageGroupHandle):
(API::PageGroupHandle::encode):
(API::PageGroupHandle::decode):
* Shared/API/APIPageGroupHandle.h:
* Shared/API/APIPageHandle.cpp:
(API::PageHandle::encode):
(API::PageHandle::decode):
* Shared/API/APIPageHandle.h:
* Shared/UserData.cpp:
(WebKit::UserData::encode):
(WebKit::UserData::decode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIFrameHandlecpp">trunk/Source/WebKit2/Shared/API/APIFrameHandle.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIFrameHandleh">trunk/Source/WebKit2/Shared/API/APIFrameHandle.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIPageGroupHandlecpp">trunk/Source/WebKit2/Shared/API/APIPageGroupHandle.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIPageGroupHandleh">trunk/Source/WebKit2/Shared/API/APIPageGroupHandle.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIPageHandlecpp">trunk/Source/WebKit2/Shared/API/APIPageHandle.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIPageHandleh">trunk/Source/WebKit2/Shared/API/APIPageHandle.h</a></li>
<li><a href="#trunkSourceWebKit2SharedUserDatacpp">trunk/Source/WebKit2/Shared/UserData.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177748 => 177749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-26 19:26:53 UTC (rev 177748)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-26 20:24:34 UTC (rev 177749)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-12-26 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Move handle encoding functions to their respective implementation files
+ https://bugs.webkit.org/show_bug.cgi?id=139957
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/API/APIFrameHandle.cpp:
+ (API::FrameHandle::encode):
+ (API::FrameHandle::decode):
+ * Shared/API/APIFrameHandle.h:
+ * Shared/API/APIPageGroupHandle.cpp:
+ (API::PageGroupHandle::PageGroupHandle):
+ (API::PageGroupHandle::encode):
+ (API::PageGroupHandle::decode):
+ * Shared/API/APIPageGroupHandle.h:
+ * Shared/API/APIPageHandle.cpp:
+ (API::PageHandle::encode):
+ (API::PageHandle::decode):
+ * Shared/API/APIPageHandle.h:
+ * Shared/UserData.cpp:
+ (WebKit::UserData::encode):
+ (WebKit::UserData::decode):
+
+2014-12-26 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Add the notion of auto-converting page and frame handles
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139954
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIFrameHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIFrameHandle.cpp (177748 => 177749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIFrameHandle.cpp 2014-12-26 19:26:53 UTC (rev 177748)
+++ trunk/Source/WebKit2/Shared/API/APIFrameHandle.cpp 2014-12-26 20:24:34 UTC (rev 177749)
</span><span class="lines">@@ -26,6 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "APIFrameHandle.h"
</span><span class="cx">
</span><ins>+#include "ArgumentDecoder.h"
+#include "ArgumentEncoder.h"
+
</ins><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="cx"> Ref<FrameHandle> FrameHandle::create(uint64_t frameID)
</span><span class="lines">@@ -48,4 +51,24 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FrameHandle::encode(IPC::ArgumentEncoder& encoder) const
+{
+ encoder << m_frameID;
+ encoder << m_isAutoconverting;
+}
+
+bool FrameHandle::decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+{
+ uint64_t frameID;
+ if (!decoder.decode(frameID))
+ return false;
+
+ bool isAutoconverting;
+ if (!decoder.decode(isAutoconverting))
+ return false;
+
+ result = isAutoconverting ? createAutoconverting(frameID) : create(frameID);
+ return true;
+}
+
</ins><span class="cx"> } // namespace API
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIFrameHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIFrameHandle.h (177748 => 177749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIFrameHandle.h 2014-12-26 19:26:53 UTC (rev 177748)
+++ trunk/Source/WebKit2/Shared/API/APIFrameHandle.h 2014-12-26 20:24:34 UTC (rev 177749)
</span><span class="lines">@@ -29,19 +29,27 @@
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span><ins>+namespace IPC {
+class ArgumentDecoder;
+class ArgumentEncoder;
+}
+
</ins><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="cx"> class FrameHandle : public ObjectImpl<Object::Type::FrameHandle> {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<FrameHandle> create(uint64_t frameID);
</span><span class="cx"> static Ref<FrameHandle> createAutoconverting(uint64_t frameID);
</span><ins>+
</ins><span class="cx"> explicit FrameHandle(uint64_t frameID, bool isAutoconverting);
</span><del>-
</del><span class="cx"> virtual ~FrameHandle();
</span><span class="cx">
</span><span class="cx"> uint64_t frameID() const { return m_frameID; }
</span><span class="cx"> bool isAutoconverting() const { return m_isAutoconverting; }
</span><span class="cx">
</span><ins>+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, RefPtr<Object>&);
+
</ins><span class="cx"> private:
</span><span class="cx"> const uint64_t m_frameID;
</span><span class="cx"> const bool m_isAutoconverting;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIPageGroupHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIPageGroupHandle.cpp (177748 => 177749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIPageGroupHandle.cpp 2014-12-26 19:26:53 UTC (rev 177748)
+++ trunk/Source/WebKit2/Shared/API/APIPageGroupHandle.cpp 2014-12-26 20:24:34 UTC (rev 177749)
</span><span class="lines">@@ -26,6 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "APIPageGroupHandle.h"
</span><span class="cx">
</span><ins>+#include "ArgumentDecoder.h"
+#include "ArgumentEncoder.h"
+
</ins><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="cx"> Ref<PageGroupHandle> PageGroupHandle::create(WebKit::WebPageGroupData&& webPageGroupData)
</span><span class="lines">@@ -33,13 +36,28 @@
</span><span class="cx"> return adoptRef(*new PageGroupHandle(WTF::move(webPageGroupData)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PageGroupHandle::PageGroupHandle(WebKit::WebPageGroupData&& webPageGroupData)
+ : m_webPageGroupData(WTF::move(webPageGroupData))
+{
+}
+
</ins><span class="cx"> PageGroupHandle::~PageGroupHandle()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PageGroupHandle::PageGroupHandle(WebKit::WebPageGroupData&& webPageGroupData)
- : m_webPageGroupData(WTF::move(webPageGroupData))
</del><ins>+void PageGroupHandle::encode(IPC::ArgumentEncoder& encoder) const
</ins><span class="cx"> {
</span><ins>+ encoder << m_webPageGroupData;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PageGroupHandle::decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+{
+ WebKit::WebPageGroupData webPageGroupData;
+ if (!decoder.decode(webPageGroupData))
+ return false;
+
+ result = create(WTF::move(webPageGroupData));
+ return true;
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIPageGroupHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIPageGroupHandle.h (177748 => 177749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIPageGroupHandle.h 2014-12-26 19:26:53 UTC (rev 177748)
+++ trunk/Source/WebKit2/Shared/API/APIPageGroupHandle.h 2014-12-26 20:24:34 UTC (rev 177749)
</span><span class="lines">@@ -30,6 +30,11 @@
</span><span class="cx"> #include "WebPageGroupData.h"
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><ins>+namespace IPC {
+class ArgumentDecoder;
+class ArgumentEncoder;
+}
+
</ins><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="cx"> class PageGroupHandle : public ObjectImpl<Object::Type::PageGroupHandle> {
</span><span class="lines">@@ -39,6 +44,9 @@
</span><span class="cx">
</span><span class="cx"> const WebKit::WebPageGroupData& webPageGroupData() const { return m_webPageGroupData; }
</span><span class="cx">
</span><ins>+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, RefPtr<Object>&);
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit PageGroupHandle(WebKit::WebPageGroupData&&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIPageHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIPageHandle.cpp (177748 => 177749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIPageHandle.cpp 2014-12-26 19:26:53 UTC (rev 177748)
+++ trunk/Source/WebKit2/Shared/API/APIPageHandle.cpp 2014-12-26 20:24:34 UTC (rev 177749)
</span><span class="lines">@@ -26,6 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "APIPageHandle.h"
</span><span class="cx">
</span><ins>+#include "ArgumentDecoder.h"
+#include "ArgumentEncoder.h"
+
</ins><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="cx"> Ref<PageHandle> PageHandle::create(uint64_t pageID)
</span><span class="lines">@@ -48,4 +51,24 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageHandle::encode(IPC::ArgumentEncoder& encoder) const
+{
+ encoder << m_pageID;
+ encoder << m_isAutoconverting;
+}
+
+bool PageHandle::decode(IPC::ArgumentDecoder& decoder, RefPtr<Object>& result)
+{
+ uint64_t pageID;
+ if (!decoder.decode(pageID))
+ return false;
+
+ bool isAutoconverting;
+ if (!decoder.decode(isAutoconverting))
+ return false;
+
+ result = isAutoconverting ? createAutoconverting(pageID) : create(pageID);
+ return true;
+}
+
</ins><span class="cx"> } // namespace API
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIPageHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIPageHandle.h (177748 => 177749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIPageHandle.h 2014-12-26 19:26:53 UTC (rev 177748)
+++ trunk/Source/WebKit2/Shared/API/APIPageHandle.h 2014-12-26 20:24:34 UTC (rev 177749)
</span><span class="lines">@@ -29,6 +29,11 @@
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span><ins>+namespace IPC {
+class ArgumentDecoder;
+class ArgumentEncoder;
+}
+
</ins><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="cx"> class PageHandle : public ObjectImpl<Object::Type::PageHandle> {
</span><span class="lines">@@ -40,6 +45,9 @@
</span><span class="cx"> uint64_t pageID() const { return m_pageID; }
</span><span class="cx"> bool isAutoconverting() const { return m_isAutoconverting; }
</span><span class="cx">
</span><ins>+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, RefPtr<Object>&);
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit PageHandle(uint64_t pageID, bool isAutoconverting);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.cpp (177748 => 177749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.cpp 2014-12-26 19:26:53 UTC (rev 177748)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2014-12-26 20:24:34 UTC (rev 177749)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "APIGeometry.h"
</span><span class="cx"> #include "APINumber.h"
</span><span class="cx"> #include "APIPageGroupHandle.h"
</span><ins>+#include "APIPageHandle.h"
</ins><span class="cx"> #include "APISerializedScriptValue.h"
</span><span class="cx"> #include "APIString.h"
</span><span class="cx"> #include "APIURL.h"
</span><span class="lines">@@ -192,18 +193,18 @@
</span><span class="cx"> static_cast<const API::Error&>(object).encode(encoder);
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case API::Object::Type::FrameHandle: {
- auto& frameHandle = static_cast<const API::FrameHandle&>(object);
- encoder << frameHandle.frameID();
</del><ins>+ case API::Object::Type::FrameHandle:
+ static_cast<const API::FrameHandle&>(object).encode(encoder);
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx">
</span><del>- case API::Object::Type::PageGroupHandle: {
- auto& pageGroupHandle = static_cast<const API::PageGroupHandle&>(object);
- encoder << pageGroupHandle.webPageGroupData();
</del><ins>+ case API::Object::Type::PageGroupHandle:
+ static_cast<const API::PageGroupHandle&>(object).encode(encoder);
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx">
</span><ins>+ case API::Object::Type::PageHandle:
+ static_cast<const API::PageHandle&>(object).encode(encoder);
+ break;
+
</ins><span class="cx"> case API::Object::Type::Point:
</span><span class="cx"> static_cast<const API::Point&>(object).encode(encoder);
</span><span class="cx"> break;
</span><span class="lines">@@ -228,10 +229,9 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case API::Object::Type::URL: {
</del><ins>+ case API::Object::Type::URL:
</ins><span class="cx"> static_cast<const API::URL&>(object).encode(encoder);
</span><span class="cx"> break;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> case API::Object::Type::URLRequest:
</span><span class="cx"> static_cast<const API::URLRequest&>(object).encode(encoder);
</span><span class="lines">@@ -318,28 +318,24 @@
</span><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case API::Object::Type::FrameHandle: {
- uint64_t frameID;
- if (!decoder.decode(frameID))
</del><ins>+ case API::Object::Type::FrameHandle:
+ if (!API::FrameHandle::decode(decoder, result))
</ins><span class="cx"> return false;
</span><del>-
- result = API::FrameHandle::create(frameID);
</del><span class="cx"> break;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> case API::Object::Type::Null:
</span><span class="cx"> result = nullptr;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case API::Object::Type::PageGroupHandle: {
- WebKit::WebPageGroupData webPageGroupData;
- if (!decoder.decode(webPageGroupData))
</del><ins>+ case API::Object::Type::PageGroupHandle:
+ if (!API::PageGroupHandle::decode(decoder, result))
</ins><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- result = API::PageGroupHandle::create(WTF::move(webPageGroupData));
</del><ins>+ case API::Object::Type::PageHandle:
+ if (!API::PageHandle::decode(decoder, result))
+ return false;
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> case API::Object::Type::Point:
</span><span class="cx"> if (!API::Point::decode(decoder, result))
</span></span></pre>
</div>
</div>
</body>
</html>