<!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>[174197] 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/174197">174197</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-01 21:10:35 -0700 (Wed, 01 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for File
https://bugs.webkit.org/show_bug.cgi?id=137318
Reviewed by Gyuyoung Kim.
Use is<>() / downcast<>() for File instead of isFile() / toFile().
No new tests, no behavior change.
* fileapi/Blob.h:
* fileapi/File.h:
(isType):
* fileapi/FileReader.cpp:
(WebCore::FileReader::readAsArrayBuffer):
(WebCore::FileReader::readAsBinaryString):
(WebCore::FileReader::readAsText):
(WebCore::FileReader::readAsDataURL):
* platform/network/FormData.cpp:
(WebCore::FormData::appendKeyValuePairItems):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorefileapiBlobh">trunk/Source/WebCore/fileapi/Blob.h</a></li>
<li><a href="#trunkSourceWebCorefileapiFileh">trunk/Source/WebCore/fileapi/File.h</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReadercpp">trunk/Source/WebCore/fileapi/FileReader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkFormDatacpp">trunk/Source/WebCore/platform/network/FormData.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174196 => 174197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-02 02:19:43 UTC (rev 174196)
+++ trunk/Source/WebCore/ChangeLog 2014-10-02 04:10:35 UTC (rev 174197)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-10-01 Christophe Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for File
+ https://bugs.webkit.org/show_bug.cgi?id=137318
+
+ Reviewed by Gyuyoung Kim.
+
+ Use is<>() / downcast<>() for File instead of isFile() / toFile().
+
+ No new tests, no behavior change.
+
+ * fileapi/Blob.h:
+ * fileapi/File.h:
+ (isType):
+ * fileapi/FileReader.cpp:
+ (WebCore::FileReader::readAsArrayBuffer):
+ (WebCore::FileReader::readAsBinaryString):
+ (WebCore::FileReader::readAsText):
+ (WebCore::FileReader::readAsDataURL):
+ * platform/network/FormData.cpp:
+ (WebCore::FormData::appendKeyValuePairItems):
+
</ins><span class="cx"> 2014-10-01 Rik Cabanier <cabanier@adobe.com>
</span><span class="cx">
</span><span class="cx"> Add support for midpoint to CSS gradients
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiBlobh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/Blob.h (174196 => 174197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/Blob.h 2014-10-02 02:19:43 UTC (rev 174196)
+++ trunk/Source/WebCore/fileapi/Blob.h 2014-10-02 04:10:35 UTC (rev 174197)
</span><span class="lines">@@ -112,9 +112,6 @@
</span><span class="cx"> mutable long long m_size;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define BLOB_TYPE_CASTS(ToValueTypeName, predicate) \
- TYPE_CASTS_BASE(ToValueTypeName, Blob, blob, blob->predicate, blob.predicate)
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // Blob_h
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/File.h (174196 => 174197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/File.h 2014-10-02 02:19:43 UTC (rev 174196)
+++ trunk/Source/WebCore/fileapi/File.h 2014-10-02 04:10:35 UTC (rev 174197)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Blob.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -83,8 +84,10 @@
</span><span class="cx"> String m_name;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-BLOB_TYPE_CASTS(File, isFile())
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::File)
+ static bool isType(const WebCore::Blob& blob) { return blob.isFile(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #endif // File_h
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReader.cpp (174196 => 174197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReader.cpp 2014-10-02 02:19:43 UTC (rev 174196)
+++ trunk/Source/WebCore/fileapi/FileReader.cpp 2014-10-02 04:10:35 UTC (rev 174197)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> if (!blob)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- LOG(FileAPI, "FileReader: reading as array buffer: %s %s\n", blob->url().string().utf8().data(), blob->isFile() ? toFile(blob)->path().utf8().data() : "");
</del><ins>+ LOG(FileAPI, "FileReader: reading as array buffer: %s %s\n", blob->url().string().utf8().data(), is<File>(blob) ? downcast<File>(*blob).path().utf8().data() : "");
</ins><span class="cx">
</span><span class="cx"> readInternal(blob, FileReaderLoader::ReadAsArrayBuffer, ec);
</span><span class="cx"> }
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> if (!blob)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- LOG(FileAPI, "FileReader: reading as binary: %s %s\n", blob->url().string().utf8().data(), blob->isFile() ? toFile(blob)->path().utf8().data() : "");
</del><ins>+ LOG(FileAPI, "FileReader: reading as binary: %s %s\n", blob->url().string().utf8().data(), is<File>(blob) ? downcast<File>(*blob).path().utf8().data() : "");
</ins><span class="cx">
</span><span class="cx"> readInternal(blob, FileReaderLoader::ReadAsBinaryString, ec);
</span><span class="cx"> }
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> if (!blob)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- LOG(FileAPI, "FileReader: reading as text: %s %s\n", blob->url().string().utf8().data(), blob->isFile() ? toFile(blob)->path().utf8().data() : "");
</del><ins>+ LOG(FileAPI, "FileReader: reading as text: %s %s\n", blob->url().string().utf8().data(), is<File>(blob) ? downcast<File>(*blob).path().utf8().data() : "");
</ins><span class="cx">
</span><span class="cx"> m_encoding = encoding;
</span><span class="cx"> readInternal(blob, FileReaderLoader::ReadAsText, ec);
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> if (!blob)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- LOG(FileAPI, "FileReader: reading as data URL: %s %s\n", blob->url().string().utf8().data(), blob->isFile() ? toFile(blob)->path().utf8().data() : "");
</del><ins>+ LOG(FileAPI, "FileReader: reading as data URL: %s %s\n", blob->url().string().utf8().data(), is<File>(blob) ? downcast<File>(*blob).path().utf8().data() : "");
</ins><span class="cx">
</span><span class="cx"> readInternal(blob, FileReaderLoader::ReadAsDataURL, ec);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkFormDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/FormData.cpp (174196 => 174197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/FormData.cpp 2014-10-02 02:19:43 UTC (rev 174196)
+++ trunk/Source/WebCore/platform/network/FormData.cpp 2014-10-02 04:10:35 UTC (rev 174197)
</span><span class="lines">@@ -180,11 +180,11 @@
</span><span class="cx"> // If the current type is blob, then we also need to include the filename
</span><span class="cx"> if (value.blob()) {
</span><span class="cx"> String name;
</span><del>- if (value.blob()->isFile()) {
- File* file = toFile(value.blob());
- name = file->name();
</del><ins>+ if (is<File>(value.blob())) {
+ File& file = downcast<File>(*value.blob());
+ name = file.name();
</ins><span class="cx"> // Let the application specify a filename if it's going to generate a replacement file for the upload.
</span><del>- const String& path = file->path();
</del><ins>+ const String& path = file.path();
</ins><span class="cx"> if (!path.isEmpty()) {
</span><span class="cx"> if (Page* page = document->page()) {
</span><span class="cx"> String generatedFileName;
</span><span class="lines">@@ -221,11 +221,11 @@
</span><span class="cx"> // Append body
</span><span class="cx"> appendData(header.data(), header.size());
</span><span class="cx"> if (value.blob()) {
</span><del>- if (value.blob()->isFile()) {
- File* file = toFile(value.blob());
</del><ins>+ if (is<File>(value.blob())) {
+ File& file = downcast<File>(*value.blob());
</ins><span class="cx"> // Do not add the file if the path is empty.
</span><del>- if (!file->path().isEmpty())
- appendFile(file->path(), shouldGenerateFile);
</del><ins>+ if (!file.path().isEmpty())
+ appendFile(file.path(), shouldGenerateFile);
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> appendBlob(value.blob()->url());
</span></span></pre>
</div>
</div>
</body>
</html>