<!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>[189485] 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/189485">189485</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-08 03:50:42 -0700 (Tue, 08 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce uses of PassRefPtr in fileapi
https://bugs.webkit.org/show_bug.cgi?id=148952
Reviewed by Andreas Kling.
Remove all uses of PassRefPtr in return type. Argument uses of PassRefPtr will be
removed in near future.
* fileapi/FileError.h:
(WebCore::FileError::create):
* fileapi/FileReader.cpp:
(WebCore::FileReader::arrayBufferResult):
* fileapi/FileReader.h:
* fileapi/FileReaderLoader.cpp:
(WebCore::FileReaderLoader::arrayBufferResult):
* fileapi/FileReaderLoader.h:
* fileapi/FileReaderSync.cpp:
(WebCore::FileReaderSync::readAsArrayBuffer):
* fileapi/FileReaderSync.h:
* fileapi/ThreadableBlobRegistry.cpp:
(WebCore::ThreadableBlobRegistry::getCachedOrigin):
* fileapi/ThreadableBlobRegistry.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorefileapiFileErrorh">trunk/Source/WebCore/fileapi/FileError.h</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReadercpp">trunk/Source/WebCore/fileapi/FileReader.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReaderh">trunk/Source/WebCore/fileapi/FileReader.h</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReaderLoadercpp">trunk/Source/WebCore/fileapi/FileReaderLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReaderLoaderh">trunk/Source/WebCore/fileapi/FileReaderLoader.h</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReaderSynccpp">trunk/Source/WebCore/fileapi/FileReaderSync.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReaderSynch">trunk/Source/WebCore/fileapi/FileReaderSync.h</a></li>
<li><a href="#trunkSourceWebCorefileapiThreadableBlobRegistrycpp">trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiThreadableBlobRegistryh">trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189484 => 189485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-08 06:48:54 UTC (rev 189484)
+++ trunk/Source/WebCore/ChangeLog 2015-09-08 10:50:42 UTC (rev 189485)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-09-08 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ Reduce uses of PassRefPtr in fileapi
+ https://bugs.webkit.org/show_bug.cgi?id=148952
+
+ Reviewed by Andreas Kling.
+
+ Remove all uses of PassRefPtr in return type. Argument uses of PassRefPtr will be
+ removed in near future.
+
+ * fileapi/FileError.h:
+ (WebCore::FileError::create):
+ * fileapi/FileReader.cpp:
+ (WebCore::FileReader::arrayBufferResult):
+ * fileapi/FileReader.h:
+ * fileapi/FileReaderLoader.cpp:
+ (WebCore::FileReaderLoader::arrayBufferResult):
+ * fileapi/FileReaderLoader.h:
+ * fileapi/FileReaderSync.cpp:
+ (WebCore::FileReaderSync::readAsArrayBuffer):
+ * fileapi/FileReaderSync.h:
+ * fileapi/ThreadableBlobRegistry.cpp:
+ (WebCore::ThreadableBlobRegistry::getCachedOrigin):
+ * fileapi/ThreadableBlobRegistry.h:
+
</ins><span class="cx"> 2015-09-07 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Mavericks: Text cursor does not move along with VoiceOver cursor for text fields
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileError.h (189484 => 189485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileError.h 2015-09-08 06:48:54 UTC (rev 189484)
+++ trunk/Source/WebCore/fileapi/FileError.h 2015-09-08 10:50:42 UTC (rev 189485)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef FileError_h
</span><span class="cx"> #define FileError_h
</span><span class="cx">
</span><del>-#include <wtf/PassRefPtr.h>
</del><ins>+#include <wtf/Ref.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> PATH_EXISTS_ERR = 12,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static PassRefPtr<FileError> create(ErrorCode code) { return adoptRef(new FileError(code)); }
</del><ins>+ static Ref<FileError> create(ErrorCode code) { return adoptRef(*new FileError(code)); }
</ins><span class="cx">
</span><span class="cx"> ErrorCode code() const { return m_code; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReader.cpp (189484 => 189485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReader.cpp 2015-09-08 06:48:54 UTC (rev 189484)
+++ trunk/Source/WebCore/fileapi/FileReader.cpp 2015-09-08 10:50:42 UTC (rev 189485)
</span><span class="lines">@@ -241,10 +241,10 @@
</span><span class="cx"> dispatchEvent(ProgressEvent::create(type, true, m_loader ? m_loader->bytesLoaded() : 0, m_loader ? m_loader->totalBytes() : 0));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ArrayBuffer> FileReader::arrayBufferResult() const
</del><ins>+RefPtr<ArrayBuffer> FileReader::arrayBufferResult() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_loader || m_error)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return m_loader->arrayBufferResult();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReader.h (189484 => 189485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReader.h 2015-09-08 06:48:54 UTC (rev 189484)
+++ trunk/Source/WebCore/fileapi/FileReader.h 2015-09-08 10:50:42 UTC (rev 189485)
</span><span class="lines">@@ -74,9 +74,9 @@
</span><span class="cx"> void doAbort();
</span><span class="cx">
</span><span class="cx"> ReadyState readyState() const { return m_state; }
</span><del>- PassRefPtr<FileError> error() { return m_error; }
</del><ins>+ RefPtr<FileError> error() { return m_error; }
</ins><span class="cx"> FileReaderLoader::ReadType readType() const { return m_readType; }
</span><del>- PassRefPtr<JSC::ArrayBuffer> arrayBufferResult() const;
</del><ins>+ RefPtr<JSC::ArrayBuffer> arrayBufferResult() const;
</ins><span class="cx"> String stringResult();
</span><span class="cx">
</span><span class="cx"> // EventTarget
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReaderLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReaderLoader.cpp (189484 => 189485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2015-09-08 06:48:54 UTC (rev 189484)
+++ trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2015-09-08 10:50:42 UTC (rev 189485)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include "ThreadableBlobRegistry.h"
</span><span class="cx"> #include "ThreadableLoader.h"
</span><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/Base64.h>
</span><span class="lines">@@ -264,13 +263,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ArrayBuffer> FileReaderLoader::arrayBufferResult() const
</del><ins>+RefPtr<ArrayBuffer> FileReaderLoader::arrayBufferResult() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_readType == ReadAsArrayBuffer);
</span><span class="cx">
</span><span class="cx"> // If the loading is not started or an error occurs, return an empty result.
</span><span class="cx"> if (!m_rawData || m_errorCode)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> // If completed, we can simply return our buffer.
</span><span class="cx"> if (isCompleted())
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReaderLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReaderLoader.h (189484 => 189485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReaderLoader.h 2015-09-08 06:48:54 UTC (rev 189484)
+++ trunk/Source/WebCore/fileapi/FileReaderLoader.h 2015-09-08 10:50:42 UTC (rev 189485)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> virtual void didFail(const ResourceError&);
</span><span class="cx">
</span><span class="cx"> String stringResult();
</span><del>- PassRefPtr<JSC::ArrayBuffer> arrayBufferResult() const;
</del><ins>+ RefPtr<JSC::ArrayBuffer> arrayBufferResult() const;
</ins><span class="cx"> unsigned bytesLoaded() const { return m_bytesLoaded; }
</span><span class="cx"> unsigned totalBytes() const { return m_totalBytes; }
</span><span class="cx"> int errorCode() const { return m_errorCode; }
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReaderSynccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReaderSync.cpp (189484 => 189485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReaderSync.cpp 2015-09-08 06:48:54 UTC (rev 189484)
+++ trunk/Source/WebCore/fileapi/FileReaderSync.cpp 2015-09-08 10:50:42 UTC (rev 189485)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "FileException.h"
</span><span class="cx"> #include "FileReaderLoader.h"
</span><span class="cx"> #include <runtime/ArrayBuffer.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">@@ -45,11 +44,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ArrayBuffer> FileReaderSync::readAsArrayBuffer(ScriptExecutionContext* scriptExecutionContext, Blob* blob, ExceptionCode& ec)
</del><ins>+RefPtr<ArrayBuffer> FileReaderSync::readAsArrayBuffer(ScriptExecutionContext* scriptExecutionContext, Blob* blob, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (!blob) {
</span><span class="cx"> ec = NOT_FOUND_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FileReaderLoader loader(FileReaderLoader::ReadAsArrayBuffer, 0);
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReaderSynch"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReaderSync.h (189484 => 189485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReaderSync.h 2015-09-08 06:48:54 UTC (rev 189484)
+++ trunk/Source/WebCore/fileapi/FileReaderSync.h 2015-09-08 10:50:42 UTC (rev 189485)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~FileReaderSync() { }
</span><span class="cx">
</span><del>- PassRefPtr<JSC::ArrayBuffer> readAsArrayBuffer(ScriptExecutionContext*, Blob*, ExceptionCode&);
</del><ins>+ RefPtr<JSC::ArrayBuffer> readAsArrayBuffer(ScriptExecutionContext*, Blob*, ExceptionCode&);
</ins><span class="cx"> String readAsBinaryString(ScriptExecutionContext*, Blob*, ExceptionCode&);
</span><span class="cx"> String readAsText(ScriptExecutionContext* scriptExecutionContext, Blob* blob, ExceptionCode& ec)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiThreadableBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp (189484 => 189485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2015-09-08 06:48:54 UTC (rev 189484)
+++ trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2015-09-08 10:50:42 UTC (rev 189485)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SecurityOrigin> ThreadableBlobRegistry::getCachedOrigin(const URL& url)
</del><ins>+RefPtr<SecurityOrigin> ThreadableBlobRegistry::getCachedOrigin(const URL& url)
</ins><span class="cx"> {
</span><span class="cx"> return originMap()->get(url.string());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiThreadableBlobRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.h (189484 => 189485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.h 2015-09-08 06:48:54 UTC (rev 189484)
+++ trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.h 2015-09-08 10:50:42 UTC (rev 189485)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> // Returns the origin for the given blob URL. This is because we are not able to embed the unique security origin or the origin of file URL
</span><span class="cx"> // in the blob URL.
</span><del>- static PassRefPtr<SecurityOrigin> getCachedOrigin(const URL&);
</del><ins>+ static RefPtr<SecurityOrigin> getCachedOrigin(const URL&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>