<!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>[165900] 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/165900">165900</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-03-19 10:36:37 -0700 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add new functionality that will be required by the history item decoding
https://bugs.webkit.org/show_bug.cgi?id=130433
Reviewed by Sam Weinig.
Source/WebCore:
* platform/KeyedCoding.h:
(WebCore::KeyedDecoder::decodeConditionalObject):
Source/WebKit2:
* Shared/cf/KeyedDecoder.cpp:
(WebKit::KeyedDecoder::decodeUInt32):
(WebKit::KeyedDecoder::decodeInt32):
(WebKit::KeyedDecoder::decodeFloat):
* Shared/cf/KeyedDecoder.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformKeyedCodingh">trunk/Source/WebCore/platform/KeyedCoding.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedcfKeyedDecodercpp">trunk/Source/WebKit2/Shared/cf/KeyedDecoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedcfKeyedDecoderh">trunk/Source/WebKit2/Shared/cf/KeyedDecoder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165899 => 165900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-19 17:27:24 UTC (rev 165899)
+++ trunk/Source/WebCore/ChangeLog 2014-03-19 17:36:37 UTC (rev 165900)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-18 Anders Carlsson <andersca@apple.com>
+
+ Add new functionality that will be required by the history item decoding
+ https://bugs.webkit.org/show_bug.cgi?id=130433
+
+ Reviewed by Sam Weinig.
+
+ * platform/KeyedCoding.h:
+ (WebCore::KeyedDecoder::decodeConditionalObject):
+
</ins><span class="cx"> 2014-03-19 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformKeyedCodingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/KeyedCoding.h (165899 => 165900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/KeyedCoding.h 2014-03-19 17:27:24 UTC (rev 165899)
+++ trunk/Source/WebCore/platform/KeyedCoding.h 2014-03-19 17:36:37 UTC (rev 165900)
</span><span class="lines">@@ -41,7 +41,9 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual bool decodeBool(const String& key, bool&) = 0;
</span><span class="cx"> virtual bool decodeUInt32(const String& key, uint32_t&) = 0;
</span><ins>+ virtual bool decodeInt32(const String& key, int32_t&) = 0;
</ins><span class="cx"> virtual bool decodeInt64(const String& key, int64_t&) = 0;
</span><ins>+ virtual bool decodeFloat(const String& key, float&) = 0;
</ins><span class="cx"> virtual bool decodeDouble(const String& key, double&) = 0;
</span><span class="cx"> virtual bool decodeString(const String& key, String&) = 0;
</span><span class="cx">
</span><span class="lines">@@ -72,6 +74,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename F>
</span><ins>+ bool decodeConditionalObject(const String& key, T& object, F&& function)
+ {
+ // FIXME: beginObject can return false for two reasons: either the
+ // key doesn't exist or the key refers to something that isn't an object.
+ // Because of this, decodeConditionalObject won't distinguish between a
+ // missing object or a value that isn't an object.
+ if (!beginObject(key))
+ return true;
+
+ bool result = function(*this, object);
+ endObject();
+ return result;
+ }
+
+ template<typename T, typename F>
</ins><span class="cx"> bool decodeObjects(const String& key, Vector<T>& objects, F&& function)
</span><span class="cx"> {
</span><span class="cx"> if (!beginArray(key))
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165899 => 165900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-19 17:27:24 UTC (rev 165899)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-19 17:36:37 UTC (rev 165900)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-18 Anders Carlsson <andersca@apple.com>
+
+ Add new functionality that will be required by the history item decoding
+ https://bugs.webkit.org/show_bug.cgi?id=130433
+
+ Reviewed by Sam Weinig.
+
+ * Shared/cf/KeyedDecoder.cpp:
+ (WebKit::KeyedDecoder::decodeUInt32):
+ (WebKit::KeyedDecoder::decodeInt32):
+ (WebKit::KeyedDecoder::decodeFloat):
+ * Shared/cf/KeyedDecoder.h:
+
</ins><span class="cx"> 2014-03-19 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] WebPDFViewPlaceholder divides-by-zero with an empty document
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcfKeyedDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cf/KeyedDecoder.cpp (165899 => 165900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cf/KeyedDecoder.cpp 2014-03-19 17:27:24 UTC (rev 165899)
+++ trunk/Source/WebKit2/Shared/cf/KeyedDecoder.cpp 2014-03-19 17:36:37 UTC (rev 165900)
</span><span class="lines">@@ -62,6 +62,11 @@
</span><span class="cx">
</span><span class="cx"> bool KeyedDecoder::decodeUInt32(const String& key, uint32_t& result)
</span><span class="cx"> {
</span><ins>+ return decodeInt32(key, reinterpret_cast<int32_t&>(result));
+}
+
+bool KeyedDecoder::decodeInt32(const String& key, int32_t& result)
+{
</ins><span class="cx"> CFNumberRef number = static_cast<CFNumberRef>(CFDictionaryGetValue(m_dictionaryStack.last(), key.createCFString().get()));
</span><span class="cx"> if (!number || CFGetTypeID(number) != CFNumberGetTypeID())
</span><span class="cx"> return false;
</span><span class="lines">@@ -78,6 +83,15 @@
</span><span class="cx"> return CFNumberGetValue(number, kCFNumberSInt64Type, &result);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool KeyedDecoder::decodeFloat(const String& key, float& result)
+{
+ CFNumberRef number = static_cast<CFNumberRef>(CFDictionaryGetValue(m_dictionaryStack.last(), key.createCFString().get()));
+ if (!number || CFGetTypeID(number) != CFNumberGetTypeID())
+ return false;
+
+ return CFNumberGetValue(number, kCFNumberFloatType, &result);
+}
+
</ins><span class="cx"> bool KeyedDecoder::decodeDouble(const String& key, double& result)
</span><span class="cx"> {
</span><span class="cx"> CFNumberRef number = static_cast<CFNumberRef>(CFDictionaryGetValue(m_dictionaryStack.last(), key.createCFString().get()));
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcfKeyedDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cf/KeyedDecoder.h (165899 => 165900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cf/KeyedDecoder.h 2014-03-19 17:27:24 UTC (rev 165899)
+++ trunk/Source/WebKit2/Shared/cf/KeyedDecoder.h 2014-03-19 17:36:37 UTC (rev 165900)
</span><span class="lines">@@ -40,7 +40,9 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual bool decodeBool(const String& key, bool&) override;
</span><span class="cx"> virtual bool decodeUInt32(const String& key, uint32_t&) override;
</span><ins>+ virtual bool decodeInt32(const String& key, int32_t&) override;
</ins><span class="cx"> virtual bool decodeInt64(const String& key, int64_t&) override;
</span><ins>+ virtual bool decodeFloat(const String& key, float&) override;
</ins><span class="cx"> virtual bool decodeDouble(const String& key, double&) override;
</span><span class="cx"> virtual bool decodeString(const String& key, String&) override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>