<!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>[165853] 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/165853">165853</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-03-18 15:56:26 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Begin cleaning up KeyedDecoder and KeyedEncoder
https://bugs.webkit.org/show_bug.cgi?id=130431
Reviewed by Tim Horton.
Source/WebCore:
Rename KeyedDecoder::decodeVerifiedEnum to decodeEnum to match the encode function,
and sort the decode functions to be in the same logical order as the encode functions.
* Modules/indexeddb/IDBKeyData.cpp:
(WebCore::IDBKeyData::decode):
* Modules/indexeddb/IDBKeyPath.cpp:
(WebCore::IDBKeyPath::decode):
* platform/KeyedCoding.h:
(WebCore::KeyedDecoder::decodeEnum):
Source/WebKit2:
* Shared/cf/KeyedDecoder.cpp:
(WebKit::KeyedDecoder::KeyedDecoder):
If we can't parse the property list data, just add an empty dictionary to the stack.
(WebKit::KeyedDecoder::decodeBool):
Remove unneeded m_dictionaryStack.last() null check. m_dictionaryStack would either be empty
or at least have a root element; it would never have a null element.
(WebKit::KeyedDecoder::decodeDouble):
Remove the same check as above and remove the CFNumberGetType checks since CFNumberGetValue will
do the type conversion for us and return false if it's lossy.
(WebKit::KeyedDecoder::decodeInt64):
Remove the m_dictionaryStack.last() check.
(WebKit::KeyedDecoder::decodeUInt32):
Ditto.
(WebKit::KeyedDecoder::decodeString):
Ditto.
(WebKit::KeyedDecoder::beginObject):
Ditto.
(WebKit::KeyedDecoder::beginArray):
Ditto.
(WebKit::KeyedDecoder::beginArrayElement):
Ditto.
* Shared/cf/KeyedDecoder.h:
Sort functions to be in the same logical order as the base class.
* Shared/cf/KeyedEncoder.cpp:
(WebKit::KeyedEncoder::finishEncoding):
Don't check for a non-null CFErrorRef here (which we incidentally never released on error). Instead,
just null check the returned CFDataRef object.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp</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>
<li><a href="#trunkSourceWebKit2SharedcfKeyedEncodercpp">trunk/Source/WebKit2/Shared/cf/KeyedEncoder.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165852 => 165853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-18 22:41:20 UTC (rev 165852)
+++ trunk/Source/WebCore/ChangeLog 2014-03-18 22:56:26 UTC (rev 165853)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-03-18 Anders Carlsson <andersca@apple.com>
+
+ Begin cleaning up KeyedDecoder and KeyedEncoder
+ https://bugs.webkit.org/show_bug.cgi?id=130431
+
+ Reviewed by Tim Horton.
+
+ Rename KeyedDecoder::decodeVerifiedEnum to decodeEnum to match the encode function,
+ and sort the decode functions to be in the same logical order as the encode functions.
+
+ * Modules/indexeddb/IDBKeyData.cpp:
+ (WebCore::IDBKeyData::decode):
+ * Modules/indexeddb/IDBKeyPath.cpp:
+ (WebCore::IDBKeyPath::decode):
+ * platform/KeyedCoding.h:
+ (WebCore::KeyedDecoder::decodeEnum):
+
</ins><span class="cx"> 2014-03-18 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Reduce use of deprecatedCharacters in WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp (165852 => 165853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2014-03-18 22:41:20 UTC (rev 165852)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2014-03-18 22:56:26 UTC (rev 165853)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> || value == IDBKey::NumberType
</span><span class="cx"> || value == IDBKey::MinType;
</span><span class="cx"> };
</span><del>- if (!decoder.decodeVerifiedEnum("type", result.type, enumFunction))
</del><ins>+ if (!decoder.decodeEnum("type", result.type, enumFunction))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (result.type == IDBKey::InvalidType)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp (165852 => 165853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2014-03-18 22:41:20 UTC (rev 165852)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp 2014-03-18 22:56:26 UTC (rev 165853)
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> return value == NullType || value == StringType || value == ArrayType;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- if (!decoder.decodeVerifiedEnum("type", result.m_type, enumFunction))
</del><ins>+ if (!decoder.decodeEnum("type", result.m_type, enumFunction))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (result.m_type == NullType)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformKeyedCodingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/KeyedCoding.h (165852 => 165853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/KeyedCoding.h 2014-03-18 22:41:20 UTC (rev 165852)
+++ trunk/Source/WebCore/platform/KeyedCoding.h 2014-03-18 22:56:26 UTC (rev 165853)
</span><span class="lines">@@ -40,13 +40,13 @@
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> virtual bool decodeBool(const String& key, bool&) = 0;
</span><ins>+ virtual bool decodeUInt32(const String& key, uint32_t&) = 0;
+ virtual bool decodeInt64(const String& key, int64_t&) = 0;
</ins><span class="cx"> virtual bool decodeDouble(const String& key, double&) = 0;
</span><del>- virtual bool decodeInt64(const String& key, int64_t&) = 0;
- virtual bool decodeUInt32(const String& key, uint32_t&) = 0;
</del><span class="cx"> virtual bool decodeString(const String& key, String&) = 0;
</span><span class="cx">
</span><span class="cx"> template<typename T, typename F>
</span><del>- bool decodeVerifiedEnum(const String& key, T& value, F&& function)
</del><ins>+ bool decodeEnum(const String& key, T& value, F&& isValidEnumFunction)
</ins><span class="cx"> {
</span><span class="cx"> static_assert(std::is_enum<T>::value, "T must be an enum type");
</span><span class="cx">
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> if (!decodeInt64(key, intValue))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!function(intValue))
</del><ins>+ if (!isValidEnumFunction(intValue))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> value = static_cast<T>(intValue);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165852 => 165853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-18 22:41:20 UTC (rev 165852)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-18 22:56:26 UTC (rev 165853)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-03-18 Anders Carlsson <andersca@apple.com>
+
+ Begin cleaning up KeyedDecoder and KeyedEncoder
+ https://bugs.webkit.org/show_bug.cgi?id=130431
+
+ Reviewed by Tim Horton.
+
+ * Shared/cf/KeyedDecoder.cpp:
+ (WebKit::KeyedDecoder::KeyedDecoder):
+ If we can't parse the property list data, just add an empty dictionary to the stack.
+
+ (WebKit::KeyedDecoder::decodeBool):
+ Remove unneeded m_dictionaryStack.last() null check. m_dictionaryStack would either be empty
+ or at least have a root element; it would never have a null element.
+
+ (WebKit::KeyedDecoder::decodeDouble):
+ Remove the same check as above and remove the CFNumberGetType checks since CFNumberGetValue will
+ do the type conversion for us and return false if it's lossy.
+
+ (WebKit::KeyedDecoder::decodeInt64):
+ Remove the m_dictionaryStack.last() check.
+
+ (WebKit::KeyedDecoder::decodeUInt32):
+ Ditto.
+
+ (WebKit::KeyedDecoder::decodeString):
+ Ditto.
+
+ (WebKit::KeyedDecoder::beginObject):
+ Ditto.
+
+ (WebKit::KeyedDecoder::beginArray):
+ Ditto.
+
+ (WebKit::KeyedDecoder::beginArrayElement):
+ Ditto.
+
+ * Shared/cf/KeyedDecoder.h:
+ Sort functions to be in the same logical order as the base class.
+
+ * Shared/cf/KeyedEncoder.cpp:
+ (WebKit::KeyedEncoder::finishEncoding):
+ Don't check for a non-null CFErrorRef here (which we incidentally never released on error). Instead,
+ just null check the returned CFDataRef object.
+
</ins><span class="cx"> 2014-03-18 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed typo build fix for r165846.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcfKeyedDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cf/KeyedDecoder.cpp (165852 => 165853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cf/KeyedDecoder.cpp 2014-03-18 22:41:20 UTC (rev 165852)
+++ trunk/Source/WebKit2/Shared/cf/KeyedDecoder.cpp 2014-03-18 22:56:26 UTC (rev 165853)
</span><span class="lines">@@ -32,14 +32,14 @@
</span><span class="cx">
</span><span class="cx"> KeyedDecoder::KeyedDecoder(const uint8_t* data, size_t size)
</span><span class="cx"> {
</span><del>- auto cfData = adoptCF(CFDataCreate(kCFAllocatorDefault, data, size));
- m_rootDictionary = adoptCF(static_cast<CFDictionaryRef>(CFPropertyListCreateWithData(kCFAllocatorDefault, cfData.get(), kCFPropertyListImmutable, 0, 0)));
</del><ins>+ auto cfData = adoptCF(CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, data, size, kCFAllocatorNull));
+ auto rootDictionary = adoptCF(CFPropertyListCreateWithData(kCFAllocatorDefault, cfData.get(), kCFPropertyListImmutable, nullptr, nullptr));
</ins><span class="cx">
</span><del>- if (m_rootDictionary && CFGetTypeID(m_rootDictionary.get()) != CFDictionaryGetTypeID())
- m_rootDictionary = nullptr;
-
- if (m_rootDictionary)
- m_dictionaryStack.append(m_rootDictionary.get());
</del><ins>+ if (rootDictionary && CFGetTypeID(rootDictionary.get()) == CFDictionaryGetTypeID())
+ m_rootDictionary = adoptCF(static_cast<CFDictionaryRef>(rootDictionary.leakRef()));
+ else
+ m_rootDictionary = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, nullptr, nullptr, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+ m_dictionaryStack.append(m_rootDictionary.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> KeyedDecoder::~KeyedDecoder()
</span><span class="lines">@@ -52,9 +52,6 @@
</span><span class="cx">
</span><span class="cx"> bool KeyedDecoder::decodeBool(const String& key, bool& result)
</span><span class="cx"> {
</span><del>- if (!m_dictionaryStack.last())
- return false;
-
</del><span class="cx"> CFBooleanRef boolean = static_cast<CFBooleanRef>(CFDictionaryGetValue(m_dictionaryStack.last(), key.createCFString().get()));
</span><span class="cx"> if (!boolean || CFGetTypeID(boolean) != CFBooleanGetTypeID())
</span><span class="cx"> return false;
</span><span class="lines">@@ -63,47 +60,35 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool KeyedDecoder::decodeDouble(const String& key, double& result)
</del><ins>+bool KeyedDecoder::decodeUInt32(const String& key, uint32_t& result)
</ins><span class="cx"> {
</span><del>- if (!m_dictionaryStack.last())
- return false;
-
</del><span class="cx"> CFNumberRef number = static_cast<CFNumberRef>(CFDictionaryGetValue(m_dictionaryStack.last(), key.createCFString().get()));
</span><del>- if (!number || CFGetTypeID(number) != CFNumberGetTypeID() || (CFNumberGetType(number) != kCFNumberDoubleType && CFNumberGetType(number) != kCFNumberFloat64Type))
</del><ins>+ if (!number || CFGetTypeID(number) != CFNumberGetTypeID())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- return CFNumberGetValue(number, kCFNumberDoubleType, &result);
</del><ins>+ return CFNumberGetValue(number, kCFNumberSInt32Type, &result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool KeyedDecoder::decodeInt64(const String& key, int64_t& result)
</span><span class="cx"> {
</span><del>- if (!m_dictionaryStack.last())
- return false;
-
</del><span class="cx"> CFNumberRef number = static_cast<CFNumberRef>(CFDictionaryGetValue(m_dictionaryStack.last(), key.createCFString().get()));
</span><del>- if (!number || CFGetTypeID(number) != CFNumberGetTypeID() || CFNumberGetType(number) != kCFNumberSInt64Type)
</del><ins>+ if (!number || CFGetTypeID(number) != CFNumberGetTypeID())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return CFNumberGetValue(number, kCFNumberSInt64Type, &result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool KeyedDecoder::decodeUInt32(const String& key, uint32_t& result)
</del><ins>+bool KeyedDecoder::decodeDouble(const String& key, double& result)
</ins><span class="cx"> {
</span><del>- if (!m_dictionaryStack.last())
- return false;
-
</del><span class="cx"> CFNumberRef number = static_cast<CFNumberRef>(CFDictionaryGetValue(m_dictionaryStack.last(), key.createCFString().get()));
</span><del>- if (!number || CFGetTypeID(number) != CFNumberGetTypeID() || CFNumberGetType(number) != kCFNumberSInt32Type)
</del><ins>+ if (!number || CFGetTypeID(number) != CFNumberGetTypeID())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- return CFNumberGetValue(number, kCFNumberSInt32Type, &result);
</del><ins>+ return CFNumberGetValue(number, kCFNumberDoubleType, &result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool KeyedDecoder::decodeString(const String& key, String& result)
</span><span class="cx"> {
</span><del>- if (!m_dictionaryStack.last())
- return false;
-
</del><span class="cx"> CFStringRef string = static_cast<CFStringRef>(CFDictionaryGetValue(m_dictionaryStack.last(), key.createCFString().get()));
</span><span class="cx"> if (!string || CFGetTypeID(string) != CFStringGetTypeID())
</span><span class="cx"> return false;
</span><span class="lines">@@ -114,9 +99,6 @@
</span><span class="cx">
</span><span class="cx"> bool KeyedDecoder::beginObject(const String& key)
</span><span class="cx"> {
</span><del>- if (!m_dictionaryStack.last())
- return false;
-
</del><span class="cx"> CFDictionaryRef dictionary = static_cast<CFDictionaryRef>(CFDictionaryGetValue(m_dictionaryStack.last(), key.createCFString().get()));
</span><span class="cx"> if (!dictionary || CFGetTypeID(dictionary) != CFDictionaryGetTypeID())
</span><span class="cx"> return false;
</span><span class="lines">@@ -132,9 +114,6 @@
</span><span class="cx">
</span><span class="cx"> bool KeyedDecoder::beginArray(const String& key)
</span><span class="cx"> {
</span><del>- if (!m_dictionaryStack.last())
- return false;
-
</del><span class="cx"> CFArrayRef array = static_cast<CFArrayRef>(CFDictionaryGetValue(m_dictionaryStack.last(), key.createCFString().get()));
</span><span class="cx"> if (!array || CFGetTypeID(array) != CFArrayGetTypeID())
</span><span class="cx"> return false;
</span><span class="lines">@@ -152,8 +131,6 @@
</span><span class="cx">
</span><span class="cx"> bool KeyedDecoder::beginArrayElement()
</span><span class="cx"> {
</span><del>- ASSERT(m_dictionaryStack.last());
-
</del><span class="cx"> if (m_arrayIndexStack.last() >= CFArrayGetCount(m_arrayStack.last()))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcfKeyedDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cf/KeyedDecoder.h (165852 => 165853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cf/KeyedDecoder.h 2014-03-18 22:41:20 UTC (rev 165852)
+++ trunk/Source/WebKit2/Shared/cf/KeyedDecoder.h 2014-03-18 22:56:26 UTC (rev 165853)
</span><span class="lines">@@ -39,9 +39,9 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual bool decodeBool(const String& key, bool&) override;
</span><ins>+ virtual bool decodeUInt32(const String& key, uint32_t&) override;
+ virtual bool decodeInt64(const String& key, int64_t&) override;
</ins><span class="cx"> virtual bool decodeDouble(const String& key, double&) override;
</span><del>- virtual bool decodeInt64(const String& key, int64_t&) override;
- virtual bool decodeUInt32(const String& key, uint32_t&) override;
</del><span class="cx"> virtual bool decodeString(const String& key, String&) override;
</span><span class="cx">
</span><span class="cx"> virtual bool beginObject(const String& key) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcfKeyedEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cf/KeyedEncoder.cpp (165852 => 165853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cf/KeyedEncoder.cpp 2014-03-18 22:41:20 UTC (rev 165852)
+++ trunk/Source/WebKit2/Shared/cf/KeyedEncoder.cpp 2014-03-18 22:56:26 UTC (rev 165853)
</span><span class="lines">@@ -139,9 +139,8 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SharedBuffer> KeyedEncoder::finishEncoding()
</span><span class="cx"> {
</span><del>- CFErrorRef error = nullptr;
- RetainPtr<CFDataRef> data = adoptCF(CFPropertyListCreateData(kCFAllocatorDefault, m_rootDictionary.get(), kCFPropertyListBinaryFormat_v1_0, 0, &error));
- if (error)
</del><ins>+ RetainPtr<CFDataRef> data = adoptCF(CFPropertyListCreateData(kCFAllocatorDefault, m_rootDictionary.get(), kCFPropertyListBinaryFormat_v1_0, 0, nullptr));
+ if (!data)
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> return SharedBuffer::wrapCFData(data.get());
</span></span></pre>
</div>
</div>
</body>
</html>