<!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>[190202] trunk/Source/WebCore</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/190202">190202</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-24 07:56:52 -0700 (Thu, 24 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce almost uses of PassRefPtr in Webcore/testing
https://bugs.webkit.org/show_bug.cgi?id=149449
Reviewed by Darin Adler.
This patch removes all uses of PassRefPtr except for Internals::serializeObject() and Internals::deserializeObject().
It will be removed by upcoming patch.
* Modules/encryptedmedia/CDMSessionClearKey.cpp:
(WebCore::CDMSessionClearKey::generateKeyRequest):
* Modules/encryptedmedia/CDMSessionClearKey.h:
* bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
(WebCore::jsTestOverrideBuiltinsPrototypeFunctionNamedItem):
* platform/graphics/CDMSession.h:
* platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
(WebCore::CDMSessionAVFoundationCF::generateKeyRequest):
* platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h:
* platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
(WebCore::CDMSessionAVFoundationObjC::generateKeyRequest):
* platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
(WebCore::CDMSessionMediaSourceAVFObjC::generateKeyRequest):
* testing/InternalSettings.h:
(WebCore::InternalSettings::create):
* testing/Internals.cpp:
(WebCore::Internals::create):
(WebCore::Internals::computedStyleIncludingVisitedInfo):
(WebCore::Internals::markerRangeForNode):
(WebCore::Internals::rangeFromLocationAndLength):
(WebCore::Internals::subrange):
(WebCore::Internals::nodesFromRect):
(WebCore::Internals::mallocStatistics):
(WebCore::Internals::typeConversions):
(WebCore::Internals::memoryInfo):
(WebCore::Internals::serializeObject):
(WebCore::Internals::deserializeBuffer):
(WebCore::Internals::createTimeRanges):
* testing/Internals.h:
* testing/MallocStatistics.h:
(WebCore::MallocStatistics::create):
* testing/MemoryInfo.h:
(WebCore::MemoryInfo::create):
* testing/MockCDM.cpp:
(WebCore::MockCDMSession::generateKeyRequest):
* testing/TypeConversions.h:
(WebCore::TypeConversions::create):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMSessionClearKeycpp">trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMSessionClearKeyh">trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsCDMSessionh">trunk/Source/WebCore/platform/graphics/CDMSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfCDMSessionAVFoundationCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfCDMSessionAVFoundationCFh">trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsh">trunk/Source/WebCore/testing/InternalSettings.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingMallocStatisticsh">trunk/Source/WebCore/testing/MallocStatistics.h</a></li>
<li><a href="#trunkSourceWebCoretestingMemoryInfoh">trunk/Source/WebCore/testing/MemoryInfo.h</a></li>
<li><a href="#trunkSourceWebCoretestingMockCDMcpp">trunk/Source/WebCore/testing/MockCDM.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingTypeConversionsh">trunk/Source/WebCore/testing/TypeConversions.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/ChangeLog 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2015-09-24 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ Reduce almost uses of PassRefPtr in Webcore/testing
+ https://bugs.webkit.org/show_bug.cgi?id=149449
+
+ Reviewed by Darin Adler.
+
+ This patch removes all uses of PassRefPtr except for Internals::serializeObject() and Internals::deserializeObject().
+ It will be removed by upcoming patch.
+
+ * Modules/encryptedmedia/CDMSessionClearKey.cpp:
+ (WebCore::CDMSessionClearKey::generateKeyRequest):
+ * Modules/encryptedmedia/CDMSessionClearKey.h:
+ * bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
+ (WebCore::jsTestOverrideBuiltinsPrototypeFunctionNamedItem):
+ * platform/graphics/CDMSession.h:
+ * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
+ (WebCore::CDMSessionAVFoundationCF::generateKeyRequest):
+ * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h:
+ * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
+ (WebCore::CDMSessionAVFoundationObjC::generateKeyRequest):
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+ (WebCore::CDMSessionMediaSourceAVFObjC::generateKeyRequest):
+ * testing/InternalSettings.h:
+ (WebCore::InternalSettings::create):
+ * testing/Internals.cpp:
+ (WebCore::Internals::create):
+ (WebCore::Internals::computedStyleIncludingVisitedInfo):
+ (WebCore::Internals::markerRangeForNode):
+ (WebCore::Internals::rangeFromLocationAndLength):
+ (WebCore::Internals::subrange):
+ (WebCore::Internals::nodesFromRect):
+ (WebCore::Internals::mallocStatistics):
+ (WebCore::Internals::typeConversions):
+ (WebCore::Internals::memoryInfo):
+ (WebCore::Internals::serializeObject):
+ (WebCore::Internals::deserializeBuffer):
+ (WebCore::Internals::createTimeRanges):
+ * testing/Internals.h:
+ * testing/MallocStatistics.h:
+ (WebCore::MallocStatistics::create):
+ * testing/MemoryInfo.h:
+ (WebCore::MemoryInfo::create):
+ * testing/MockCDM.cpp:
+ (WebCore::MockCDMSession::generateKeyRequest):
+ * testing/TypeConversions.h:
+ (WebCore::TypeConversions::create):
+
</ins><span class="cx"> 2015-09-24 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Ran sort-Xcode-project-file.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMSessionClearKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Uint8Array> CDMSessionClearKey::generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode)
</del><ins>+RefPtr<Uint8Array> CDMSessionClearKey::generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(mimeType);
</span><span class="cx"> UNUSED_PARAM(destinationURL);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMSessionClearKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.h (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.h 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.h 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> virtual CDMSessionType type() override { return CDMSessionTypeClearKey; }
</span><span class="cx"> virtual void setClient(CDMSessionClient* client) override { m_client = client; }
</span><span class="cx"> virtual const String& sessionId() const override { return m_sessionId; }
</span><del>- virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array*, String&, unsigned short&, unsigned long&) override;
</del><ins>+ virtual RefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array*, String&, unsigned short&, unsigned long&) override;
</ins><span class="cx"> virtual void releaseKeys() override;
</span><span class="cx"> virtual bool update(Uint8Array*, RefPtr<Uint8Array>&, unsigned short&, unsigned long&) override;
</span><span class="cx"> virtual RefPtr<ArrayBuffer> cachedKeyForKeyID(const String&) const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsCDMSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/CDMSession.h (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/CDMSession.h 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/platform/graphics/CDMSession.h 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> virtual CDMSessionType type() { return CDMSessionTypeUnknown; }
</span><span class="cx"> virtual void setClient(CDMSessionClient*) = 0;
</span><span class="cx"> virtual const String& sessionId() const = 0;
</span><del>- virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) = 0;
</del><ins>+ virtual RefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) = 0;
</ins><span class="cx"> virtual void releaseKeys() = 0;
</span><span class="cx"> virtual bool update(Uint8Array*, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode) = 0;
</span><span class="cx"> virtual RefPtr<ArrayBuffer> cachedKeyForKeyID(const String&) const { return nullptr; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfCDMSessionAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Uint8Array> CDMSessionAVFoundationCF::generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode)
</del><ins>+RefPtr<Uint8Array> CDMSessionAVFoundationCF::generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(mimeType);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfCDMSessionAVFoundationCFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setClient(CDMSessionClient* client) override { m_client = client; }
</span><span class="cx"> virtual const String& sessionId() const override { return m_sessionId; }
</span><del>- virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) override;
</del><ins>+ virtual RefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) override;
</ins><span class="cx"> virtual void releaseKeys() override;
</span><span class="cx"> virtual bool update(Uint8Array*, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> virtual CDMSessionType type() override { return CDMSessionTypeAVFoundationObjC; }
</span><span class="cx"> virtual void setClient(CDMSessionClient* client) override { m_client = client; }
</span><span class="cx"> virtual const String& sessionId() const override { return m_sessionId; }
</span><del>- virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) override;
</del><ins>+ virtual RefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) override;
</ins><span class="cx"> virtual void releaseKeys() override;
</span><span class="cx"> virtual bool update(Uint8Array*, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Uint8Array> CDMSessionAVFoundationObjC::generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode)
</del><ins>+RefPtr<Uint8Array> CDMSessionAVFoundationObjC::generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(mimeType);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> virtual CDMSessionType type() override { return CDMSessionTypeMediaSourceAVFObjC; }
</span><span class="cx"> virtual void setClient(CDMSessionClient* client) override { m_client = client; }
</span><span class="cx"> virtual const String& sessionId() const override { return m_sessionId; }
</span><del>- virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) override;
</del><ins>+ virtual RefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) override;
</ins><span class="cx"> virtual void releaseKeys() override;
</span><span class="cx"> virtual bool update(Uint8Array*, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> setStreamSession(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Uint8Array> CDMSessionMediaSourceAVFObjC::generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode)
</del><ins>+RefPtr<Uint8Array> CDMSessionMediaSourceAVFObjC::generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(mimeType);
</span><span class="cx"> UNUSED_PARAM(destinationURL);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.h (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.h 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include "InternalSettingsGenerated.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -103,9 +102,9 @@
</span><span class="cx"> bool m_inlineMediaPlaybackRequiresPlaysInlineAttribute;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static PassRefPtr<InternalSettings> create(Page* page)
</del><ins>+ static Ref<InternalSettings> create(Page* page)
</ins><span class="cx"> {
</span><del>- return adoptRef(new InternalSettings(page));
</del><ins>+ return adoptRef(*new InternalSettings(page));
</ins><span class="cx"> }
</span><span class="cx"> static InternalSettings* from(Page*);
</span><span class="cx"> void hostDestroyed() { m_page = 0; }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -317,9 +317,9 @@
</span><span class="cx">
</span><span class="cx"> const char* Internals::internalsId = "internals";
</span><span class="cx">
</span><del>-PassRefPtr<Internals> Internals::create(Document* document)
</del><ins>+Ref<Internals> Internals::create(Document* document)
</ins><span class="cx"> {
</span><del>- return adoptRef(new Internals(document));
</del><ins>+ return adoptRef(*new Internals(document));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Internals::~Internals()
</span><span class="lines">@@ -739,11 +739,11 @@
</span><span class="cx"> return element->renderer() && element->renderer()->hasPausedImageAnimations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<CSSComputedStyleDeclaration> Internals::computedStyleIncludingVisitedInfo(Node* node, ExceptionCode& ec) const
</del><ins>+RefPtr<CSSComputedStyleDeclaration> Internals::computedStyleIncludingVisitedInfo(Node* node, ExceptionCode& ec) const
</ins><span class="cx"> {
</span><span class="cx"> if (!node) {
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool allowVisitedStyle = true;
</span><span class="lines">@@ -1029,7 +1029,7 @@
</span><span class="cx"> return markers[index];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> Internals::markerRangeForNode(Node* node, const String& markerType, unsigned index, ExceptionCode& ec)
</del><ins>+RefPtr<Range> Internals::markerRangeForNode(Node* node, const String& markerType, unsigned index, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> RenderedDocumentMarker* marker = markerAt(node, markerType, index, ec);
</span><span class="cx"> if (!marker)
</span><span class="lines">@@ -1235,11 +1235,11 @@
</span><span class="cx"> frameView->paintControlTints();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> Internals::rangeFromLocationAndLength(Element* scope, int rangeLocation, int rangeLength, ExceptionCode& ec)
</del><ins>+RefPtr<Range> Internals::rangeFromLocationAndLength(Element* scope, int rangeLocation, int rangeLength, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (!scope) {
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return TextIterator::rangeFromLocationAndLength(scope, rangeLocation, rangeLength);
</span><span class="lines">@@ -1281,11 +1281,11 @@
</span><span class="cx"> return range->text();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> Internals::subrange(Range* range, int rangeLocation, int rangeLength, ExceptionCode& ec)
</del><ins>+RefPtr<Range> Internals::subrange(Range* range, int rangeLocation, int rangeLength, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (!range) {
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return TextIterator::subrange(range, rangeLocation, rangeLength);
</span><span class="lines">@@ -1407,19 +1407,19 @@
</span><span class="cx"> // contextDocument(), with the exception of a few tests that pass a
</span><span class="cx"> // different document, and could just make the call through another Internals
</span><span class="cx"> // instance instead.
</span><del>-PassRefPtr<NodeList> Internals::nodesFromRect(Document* document, int centerX, int centerY, unsigned topPadding, unsigned rightPadding,
</del><ins>+RefPtr<NodeList> Internals::nodesFromRect(Document* document, int centerX, int centerY, unsigned topPadding, unsigned rightPadding,
</ins><span class="cx"> unsigned bottomPadding, unsigned leftPadding, bool ignoreClipping, bool allowShadowContent, bool allowChildFrameContent, ExceptionCode& ec) const
</span><span class="cx"> {
</span><span class="cx"> if (!document || !document->frame() || !document->frame()->view()) {
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Frame* frame = document->frame();
</span><span class="cx"> FrameView* frameView = document->view();
</span><span class="cx"> RenderView* renderView = document->renderView();
</span><span class="cx"> if (!renderView)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> document->updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><span class="lines">@@ -1438,7 +1438,7 @@
</span><span class="cx">
</span><span class="cx"> // When ignoreClipping is false, this method returns null for coordinates outside of the viewport.
</span><span class="cx"> if (!request.ignoreClipping() && !frameView->visibleContentRect().intersects(HitTestLocation::rectForPoint(point, topPadding, rightPadding, bottomPadding, leftPadding)))
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> Vector<Ref<Node>> matches;
</span><span class="cx">
</span><span class="lines">@@ -2152,17 +2152,17 @@
</span><span class="cx"> SchemeRegistry::removeURLSchemeRegisteredAsBypassingContentSecurityPolicy(scheme);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<MallocStatistics> Internals::mallocStatistics() const
</del><ins>+Ref<MallocStatistics> Internals::mallocStatistics() const
</ins><span class="cx"> {
</span><span class="cx"> return MallocStatistics::create();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<TypeConversions> Internals::typeConversions() const
</del><ins>+Ref<TypeConversions> Internals::typeConversions() const
</ins><span class="cx"> {
</span><span class="cx"> return TypeConversions::create();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<MemoryInfo> Internals::memoryInfo() const
</del><ins>+Ref<MemoryInfo> Internals::memoryInfo() const
</ins><span class="cx"> {
</span><span class="cx"> return MemoryInfo::create();
</span><span class="cx"> }
</span><span class="lines">@@ -2385,13 +2385,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ArrayBuffer> Internals::serializeObject(PassRefPtr<SerializedScriptValue> value) const
</del><ins>+RefPtr<ArrayBuffer> Internals::serializeObject(PassRefPtr<SerializedScriptValue> value) const
</ins><span class="cx"> {
</span><span class="cx"> Vector<uint8_t> bytes = value->data();
</span><span class="cx"> return ArrayBuffer::create(bytes.data(), bytes.size());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SerializedScriptValue> Internals::deserializeBuffer(PassRefPtr<ArrayBuffer> buffer) const
</del><ins>+RefPtr<SerializedScriptValue> Internals::deserializeBuffer(PassRefPtr<ArrayBuffer> buffer) const
</ins><span class="cx"> {
</span><span class="cx"> Vector<uint8_t> bytes;
</span><span class="cx"> bytes.append(static_cast<const uint8_t*>(buffer->data()), buffer->byteLength());
</span><span class="lines">@@ -2575,11 +2575,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>-PassRefPtr<TimeRanges> Internals::createTimeRanges(Float32Array* startTimes, Float32Array* endTimes)
</del><ins>+Ref<TimeRanges> Internals::createTimeRanges(Float32Array* startTimes, Float32Array* endTimes)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(startTimes && endTimes);
</span><span class="cx"> ASSERT(startTimes->length() == endTimes->length());
</span><del>- RefPtr<TimeRanges> ranges = TimeRanges::create();
</del><ins>+ Ref<TimeRanges> ranges = TimeRanges::create();
</ins><span class="cx">
</span><span class="cx"> unsigned count = std::min(startTimes->length(), endTimes->length());
</span><span class="cx"> for (unsigned i = 0; i < count; ++i)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/testing/Internals.h 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><span class="cx"> #include <runtime/Float32Array.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -78,7 +77,7 @@
</span><span class="cx"> class Internals : public RefCounted<Internals>
</span><span class="cx"> , public ContextDestructionObserver {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<Internals> create(Document*);
</del><ins>+ static Ref<Internals> create(Document*);
</ins><span class="cx"> virtual ~Internals();
</span><span class="cx">
</span><span class="cx"> static void resetToConsistentState(Page*);
</span><span class="lines">@@ -106,7 +105,7 @@
</span><span class="cx"> void clearPageCache();
</span><span class="cx"> unsigned pageCacheSize() const;
</span><span class="cx">
</span><del>- PassRefPtr<CSSComputedStyleDeclaration> computedStyleIncludingVisitedInfo(Node*, ExceptionCode&) const;
</del><ins>+ RefPtr<CSSComputedStyleDeclaration> computedStyleIncludingVisitedInfo(Node*, ExceptionCode&) const;
</ins><span class="cx">
</span><span class="cx"> Node* ensureShadowRoot(Element* host, ExceptionCode&);
</span><span class="cx"> Node* ensureUserAgentShadowRoot(Element* host, ExceptionCode&);
</span><span class="lines">@@ -157,7 +156,7 @@
</span><span class="cx"> String inspectorHighlightObject(ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> unsigned markerCountForNode(Node*, const String&, ExceptionCode&);
</span><del>- PassRefPtr<Range> markerRangeForNode(Node*, const String& markerType, unsigned index, ExceptionCode&);
</del><ins>+ RefPtr<Range> markerRangeForNode(Node*, const String& markerType, unsigned index, ExceptionCode&);
</ins><span class="cx"> String markerDescriptionForNode(Node*, const String& markerType, unsigned index, ExceptionCode&);
</span><span class="cx"> void addTextMatchMarker(const Range*, bool isActive);
</span><span class="cx"> void setMarkedTextMatchesAreHighlighted(bool, ExceptionCode&);
</span><span class="lines">@@ -180,11 +179,11 @@
</span><span class="cx">
</span><span class="cx"> void paintControlTints(ExceptionCode&);
</span><span class="cx">
</span><del>- PassRefPtr<Range> rangeFromLocationAndLength(Element* scope, int rangeLocation, int rangeLength, ExceptionCode&);
</del><ins>+ RefPtr<Range> rangeFromLocationAndLength(Element* scope, int rangeLocation, int rangeLength, ExceptionCode&);
</ins><span class="cx"> unsigned locationFromRange(Element* scope, const Range*, ExceptionCode&);
</span><span class="cx"> unsigned lengthFromRange(Element* scope, const Range*, ExceptionCode&);
</span><span class="cx"> String rangeAsText(const Range*, ExceptionCode&);
</span><del>- PassRefPtr<Range> subrange(Range* range, int rangeLocation, int rangeLength, ExceptionCode&);
</del><ins>+ RefPtr<Range> subrange(Range*, int rangeLocation, int rangeLength, ExceptionCode&);
</ins><span class="cx"> RefPtr<Range> rangeForDictionaryLookupAtLocation(int x, int y, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> void setDelegatesScrolling(bool enabled, ExceptionCode&);
</span><span class="lines">@@ -201,7 +200,7 @@
</span><span class="cx"> unsigned wheelEventHandlerCount(ExceptionCode&);
</span><span class="cx"> unsigned touchEventHandlerCount(ExceptionCode&);
</span><span class="cx">
</span><del>- PassRefPtr<NodeList> nodesFromRect(Document*, int x, int y, unsigned topPadding, unsigned rightPadding,
</del><ins>+ RefPtr<NodeList> nodesFromRect(Document*, int x, int y, unsigned topPadding, unsigned rightPadding,
</ins><span class="cx"> unsigned bottomPadding, unsigned leftPadding, bool ignoreClipping, bool allowShadowContent, bool allowChildFrameContent, ExceptionCode&) const;
</span><span class="cx">
</span><span class="cx"> String parserMetaData(Deprecated::ScriptValue = Deprecated::ScriptValue());
</span><span class="lines">@@ -302,9 +301,9 @@
</span><span class="cx"> void registerURLSchemeAsBypassingContentSecurityPolicy(const String& scheme);
</span><span class="cx"> void removeURLSchemeRegisteredAsBypassingContentSecurityPolicy(const String& scheme);
</span><span class="cx">
</span><del>- PassRefPtr<MallocStatistics> mallocStatistics() const;
- PassRefPtr<TypeConversions> typeConversions() const;
- PassRefPtr<MemoryInfo> memoryInfo() const;
</del><ins>+ Ref<MallocStatistics> mallocStatistics() const;
+ Ref<TypeConversions> typeConversions() const;
+ Ref<MemoryInfo> memoryInfo() const;
</ins><span class="cx">
</span><span class="cx"> Vector<String> getReferencedFilePaths() const;
</span><span class="cx">
</span><span class="lines">@@ -324,8 +323,8 @@
</span><span class="cx"> void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(Node*, ExceptionCode&);
</span><span class="cx"> unsigned layoutCount() const;
</span><span class="cx">
</span><del>- PassRefPtr<ArrayBuffer> serializeObject(PassRefPtr<SerializedScriptValue>) const;
- PassRefPtr<SerializedScriptValue> deserializeBuffer(PassRefPtr<ArrayBuffer>) const;
</del><ins>+ RefPtr<ArrayBuffer> serializeObject(PassRefPtr<SerializedScriptValue>) const;
+ RefPtr<SerializedScriptValue> deserializeBuffer(PassRefPtr<ArrayBuffer>) const;
</ins><span class="cx">
</span><span class="cx"> bool isFromCurrentWorld(Deprecated::ScriptValue) const;
</span><span class="cx">
</span><span class="lines">@@ -366,7 +365,7 @@
</span><span class="cx"> void setCaptionDisplayMode(const String&, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>- PassRefPtr<TimeRanges> createTimeRanges(Float32Array* startTimes, Float32Array* endTimes);
</del><ins>+ Ref<TimeRanges> createTimeRanges(Float32Array* startTimes, Float32Array* endTimes);
</ins><span class="cx"> double closestTimeToTimeRanges(double time, TimeRanges*);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMallocStatisticsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MallocStatistics.h (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MallocStatistics.h 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/testing/MallocStatistics.h 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -27,14 +27,13 @@
</span><span class="cx"> #define MallocStatistics_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/FastMalloc.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class MallocStatistics : public RefCounted<MallocStatistics> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<MallocStatistics> create() { return adoptRef(new MallocStatistics()); }
</del><ins>+ static Ref<MallocStatistics> create() { return adoptRef(*new MallocStatistics); }
</ins><span class="cx">
</span><span class="cx"> size_t reservedVMBytes() const { return m_stats.reservedVMBytes; }
</span><span class="cx"> size_t committedVMBytes() const { return m_stats.committedVMBytes; }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMemoryInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MemoryInfo.h (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MemoryInfo.h 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/testing/MemoryInfo.h 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -32,14 +32,13 @@
</span><span class="cx"> #define MemoryInfo_h
</span><span class="cx">
</span><span class="cx"> #include "JSDOMWindow.h"
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class MemoryInfo : public RefCounted<MemoryInfo> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<MemoryInfo> create() { return adoptRef(new MemoryInfo); }
</del><ins>+ static Ref<MemoryInfo> create() { return adoptRef(*new MemoryInfo); }
</ins><span class="cx">
</span><span class="cx"> size_t usedJSHeapSize() const { return m_usedJSHeapSize; }
</span><span class="cx"> size_t totalJSHeapSize() const { return m_totalJSHeapSize; }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockCDMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockCDM.cpp (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockCDM.cpp 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/testing/MockCDM.cpp 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setClient(CDMSessionClient* client) override { m_client = client; }
</span><span class="cx"> virtual const String& sessionId() const override { return m_sessionId; }
</span><del>- virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) override;
</del><ins>+ virtual RefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) override;
</ins><span class="cx"> virtual void releaseKeys() override;
</span><span class="cx"> virtual bool update(Uint8Array*, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode) override;
</span><span class="cx">
</span><span class="lines">@@ -111,12 +111,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Uint8Array> MockCDMSession::generateKeyRequest(const String&, Uint8Array* initData, String&, unsigned short& errorCode, unsigned long&)
</del><ins>+RefPtr<Uint8Array> MockCDMSession::generateKeyRequest(const String&, Uint8Array* initData, String&, unsigned short& errorCode, unsigned long&)
</ins><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < initDataPrefix()->length(); ++i) {
</span><span class="cx"> if (!initData || i >= initData->length() || initData->item(i) != initDataPrefix()->item(i)) {
</span><span class="cx"> errorCode = MediaKeyError::MEDIA_KEYERR_UNKNOWN;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return keyRequest();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingTypeConversionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/TypeConversions.h (190201 => 190202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/TypeConversions.h 2015-09-24 14:26:50 UTC (rev 190201)
+++ trunk/Source/WebCore/testing/TypeConversions.h 2015-09-24 14:56:52 UTC (rev 190202)
</span><span class="lines">@@ -27,14 +27,13 @@
</span><span class="cx"> #define TypeConversions_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/FastMalloc.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class TypeConversions : public RefCounted<TypeConversions> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<TypeConversions> create() { return adoptRef(new TypeConversions()); }
</del><ins>+ static Ref<TypeConversions> create() { return adoptRef(*new TypeConversions()); }
</ins><span class="cx">
</span><span class="cx"> long testLong() { return m_long; }
</span><span class="cx"> void setTestLong(long value) { m_long = value; }
</span></span></pre>
</div>
</div>
</body>
</html>