<!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>[168181] 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/168181">168181</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-05-02 12:34:33 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add and implement KeyedDecoder::decodeBytes
https://bugs.webkit.org/show_bug.cgi?id=132479
Reviewed by Tim Horton.
Source/WebCore:
* platform/KeyedCoding.h:
(WebCore::KeyedDecoder::decodeBytes):
Source/WebKit2:
* Shared/cf/KeyedDecoder.cpp:
(WebKit::KeyedDecoder::decodeBytes):
* 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 (168180 => 168181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-02 19:28:30 UTC (rev 168180)
+++ trunk/Source/WebCore/ChangeLog 2014-05-02 19:34:33 UTC (rev 168181)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-02 Anders Carlsson <andersca@apple.com>
+
+ Add and implement KeyedDecoder::decodeBytes
+ https://bugs.webkit.org/show_bug.cgi?id=132479
+
+ Reviewed by Tim Horton.
+
+ * platform/KeyedCoding.h:
+ (WebCore::KeyedDecoder::decodeBytes):
+
</ins><span class="cx"> 2014-05-02 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] WebKit2 File Upload Support
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformKeyedCodingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/KeyedCoding.h (168180 => 168181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/KeyedCoding.h 2014-05-02 19:28:30 UTC (rev 168180)
+++ trunk/Source/WebCore/platform/KeyedCoding.h 2014-05-02 19:34:33 UTC (rev 168181)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> virtual ~KeyedDecoder() { }
</span><span class="cx">
</span><span class="cx"> public:
</span><ins>+ virtual bool decodeBytes(const String& key, const uint8_t*&, size_t&) = 0;
</ins><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><span class="cx"> virtual bool decodeInt32(const String& key, int32_t&) = 0;
</span><span class="lines">@@ -47,6 +48,21 @@
</span><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><ins>+ template<typename T>
+ bool decodeBytes(const String& key, Vector<T>& vector)
+ {
+ static_assert(sizeof(T) == 1, "");
+
+ size_t size;
+ const uint8_t* bytes;
+ if (!decodeBytes(key, bytes, size))
+ return false;
+
+ vector.resize(size);
+ std::copy(bytes, bytes + size, vector.data());
+ return true;
+ }
+
</ins><span class="cx"> template<typename T, typename F>
</span><span class="cx"> bool decodeEnum(const String& key, T& value, F&& isValidEnumFunction)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168180 => 168181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-02 19:28:30 UTC (rev 168180)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-02 19:34:33 UTC (rev 168181)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-02 Anders Carlsson <andersca@apple.com>
+
+ Add and implement KeyedDecoder::decodeBytes
+ https://bugs.webkit.org/show_bug.cgi?id=132479
+
+ Reviewed by Tim Horton.
+
+ * Shared/cf/KeyedDecoder.cpp:
+ (WebKit::KeyedDecoder::decodeBytes):
+ * Shared/cf/KeyedDecoder.h:
+
</ins><span class="cx"> 2014-05-02 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] WebKit2 File Upload Support
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcfKeyedDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cf/KeyedDecoder.cpp (168180 => 168181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cf/KeyedDecoder.cpp 2014-05-02 19:28:30 UTC (rev 168180)
+++ trunk/Source/WebKit2/Shared/cf/KeyedDecoder.cpp 2014-05-02 19:34:33 UTC (rev 168181)
</span><span class="lines">@@ -50,6 +50,17 @@
</span><span class="cx"> ASSERT(m_arrayIndexStack.isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool KeyedDecoder::decodeBytes(const String& key, const uint8_t*& bytes, size_t& size)
+{
+ CFDataRef data = static_cast<CFDataRef>(CFDictionaryGetValue(m_dictionaryStack.last(), key.createCFString().get()));
+ if (!data || CFGetTypeID(data) != CFDataGetTypeID())
+ return false;
+
+ bytes = CFDataGetBytePtr(data);
+ size = CFDataGetLength(data);
+ return true;
+}
+
</ins><span class="cx"> bool KeyedDecoder::decodeBool(const String& key, bool& result)
</span><span class="cx"> {
</span><span class="cx"> CFBooleanRef boolean = static_cast<CFBooleanRef>(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 (168180 => 168181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cf/KeyedDecoder.h 2014-05-02 19:28:30 UTC (rev 168180)
+++ trunk/Source/WebKit2/Shared/cf/KeyedDecoder.h 2014-05-02 19:34:33 UTC (rev 168181)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> virtual ~KeyedDecoder() override;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ virtual bool decodeBytes(const String& key, const uint8_t*&, size_t&) override;
</ins><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><span class="cx"> virtual bool decodeInt32(const String& key, int32_t&) override;
</span></span></pre>
</div>
</div>
</body>
</html>