<!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>[160581] trunk</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/160581">160581</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 19:14:12 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore: [Win] Remove pre-VS2013 support code.
https://bugs.webkit.org/show_bug.cgi?id=125693
Reviewed by Darin Adler.
* Modules/webdatabase/DatabaseTracker.cpp:
(WebCore::DatabaseTracker::setQuota): Use C99 format arguments
* loader/FTPDirectoryParser.cpp:
(WebCore::parseOneFTPLine): Ditto
* loader/icon/IconDatabase.cpp:
(WebCore::IconDatabase::pruneUnretainedIcons): Ditto
* platform/sql/SQLiteDatabase.cpp:
(WebCore::SQLiteDatabase::setMaximumSize): Ditto
Source/WTF: [Win] Remove Pre-VS2013 support code.
https://bugs.webkit.org/show_bug.cgi?id=125693
Reviewed by Darin Adler.
* wtf/StringPrintStream.cpp:
(WTF::StringPrintStream::vprintf): Use va_copy, like a civilized person.
Tools: [Win] Remove Pre-VS2013 support code.
https://bugs.webkit.org/show_bug.cgi?id=125693
Reviewed by Darin Adler.
* DumpRenderTree/cg/ImageDiffCG.cpp: Remove strtof stub now supplied by
the math library.
* DumpRenderTree/win/ImageDiffCairo.cpp: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfStringPrintStreamcpp">trunk/Source/WTF/wtf/StringPrintStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFTPDirectoryParsercpp">trunk/Source/WebCore/loader/FTPDirectoryParser.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabasecpp">trunk/Source/WebCore/loader/icon/IconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteDatabasecpp">trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreecgImageDiffCGcpp">trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinImageDiffCairocpp">trunk/Tools/DumpRenderTree/win/ImageDiffCairo.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160580 => 160581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-14 02:53:52 UTC (rev 160580)
+++ trunk/Source/WTF/ChangeLog 2013-12-14 03:14:12 UTC (rev 160581)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-13 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove Pre-VS2013 support code.
+ https://bugs.webkit.org/show_bug.cgi?id=125693
+
+ Reviewed by Darin Adler.
+
+ * wtf/StringPrintStream.cpp:
+ (WTF::StringPrintStream::vprintf): Use va_copy, like a civilized person.
+
</ins><span class="cx"> 2013-12-12 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Incorrect handling of non-ASCII characters in WTF::base64DecodeInternal
</span></span></pre></div>
<a id="trunkSourceWTFwtfStringPrintStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StringPrintStream.cpp (160580 => 160581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StringPrintStream.cpp 2013-12-14 02:53:52 UTC (rev 160580)
+++ trunk/Source/WTF/wtf/StringPrintStream.cpp 2013-12-14 03:14:12 UTC (rev 160581)
</span><span class="lines">@@ -54,11 +54,7 @@
</span><span class="cx"> ASSERT(!m_buffer[m_next]);
</span><span class="cx">
</span><span class="cx"> va_list firstPassArgList;
</span><del>-#if OS(WINDOWS)
- firstPassArgList = argList;
-#else
</del><span class="cx"> va_copy(firstPassArgList, argList);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> int numberOfBytesNotIncludingTerminatorThatWouldHaveBeenWritten =
</span><span class="cx"> vsnprintf(m_buffer + m_next, m_size - m_next, format, firstPassArgList);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160580 => 160581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-14 02:53:52 UTC (rev 160580)
+++ trunk/Source/WebCore/ChangeLog 2013-12-14 03:14:12 UTC (rev 160581)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2013-12-13 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ [Win] Remove pre-VS2013 support code.
+ https://bugs.webkit.org/show_bug.cgi?id=125693
+
+ Reviewed by Darin Adler.
+
+ * Modules/webdatabase/DatabaseTracker.cpp:
+ (WebCore::DatabaseTracker::setQuota): Use C99 format arguments
+ * loader/FTPDirectoryParser.cpp:
+ (WebCore::parseOneFTPLine): Ditto
+ * loader/icon/IconDatabase.cpp:
+ (WebCore::IconDatabase::pruneUnretainedIcons): Ditto
+ * platform/sql/SQLiteDatabase.cpp:
+ (WebCore::SQLiteDatabase::setMaximumSize): Ditto
+
+2013-12-13 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> SVG bindings are improperly being generated with "fastGetAttribute"
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125670
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp (160580 => 160581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2013-12-14 02:53:52 UTC (rev 160580)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2013-12-14 03:14:12 UTC (rev 160581)
</span><span class="lines">@@ -765,11 +765,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (error)
</span><del>-#if OS(WINDOWS)
- LOG_ERROR("Failed to set quota %I64u in tracker database for origin %s", quota, origin->databaseIdentifier().ascii().data());
-#else
</del><span class="cx"> LOG_ERROR("Failed to set quota %llu in tracker database for origin %s", quota, origin->databaseIdentifier().ascii().data());
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_client)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFTPDirectoryParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FTPDirectoryParser.cpp (160580 => 160581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FTPDirectoryParser.cpp 2013-12-14 02:53:52 UTC (rev 160580)
+++ trunk/Source/WebCore/loader/FTPDirectoryParser.cpp 2013-12-14 03:14:12 UTC (rev 160581)
</span><span class="lines">@@ -155,11 +155,7 @@
</span><span class="cx"> if (pos < linelen && line[pos] == ',')
</span><span class="cx"> {
</span><span class="cx"> unsigned long long seconds = 0;
</span><del>-#if OS(WINDOWS)
- sscanf(p + 1, "%I64u", &seconds);
-#else
</del><span class="cx"> sscanf(p + 1, "%llu", &seconds);
</span><del>-#endif
</del><span class="cx"> time_t t = static_cast<time_t>(seconds);
</span><span class="cx">
</span><span class="cx"> // FIXME: This code has the year 2038 bug
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (160580 => 160581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2013-12-14 02:53:52 UTC (rev 160580)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2013-12-14 03:14:12 UTC (rev 160581)
</span><span class="lines">@@ -1712,19 +1712,11 @@
</span><span class="cx"> SQLiteStatement pageDeleteSQL(m_syncDB, "DELETE FROM PageURL WHERE rowid = (?);");
</span><span class="cx"> pageDeleteSQL.prepare();
</span><span class="cx"> for (size_t i = 0; i < numToDelete; ++i) {
</span><del>-#if OS(WINDOWS)
- LOG(IconDatabase, "Pruning page with rowid %I64i from disk", static_cast<long long>(pageIDsToDelete[i]));
-#else
</del><span class="cx"> LOG(IconDatabase, "Pruning page with rowid %lli from disk", static_cast<long long>(pageIDsToDelete[i]));
</span><del>-#endif
</del><span class="cx"> pageDeleteSQL.bindInt64(1, pageIDsToDelete[i]);
</span><span class="cx"> int result = pageDeleteSQL.step();
</span><span class="cx"> if (result != SQLResultDone)
</span><del>-#if OS(WINDOWS)
- LOG_ERROR("Unabled to delete page with id %I64i from disk", static_cast<long long>(pageIDsToDelete[i]));
-#else
</del><span class="cx"> LOG_ERROR("Unabled to delete page with id %lli from disk", static_cast<long long>(pageIDsToDelete[i]));
</span><del>-#endif
</del><span class="cx"> pageDeleteSQL.reset();
</span><span class="cx">
</span><span class="cx"> // If the thread was asked to terminate, we should commit what pruning we've done so far, figuring we can
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp (160580 => 160581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2013-12-14 02:53:52 UTC (rev 160580)
+++ trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2013-12-14 03:14:12 UTC (rev 160581)
</span><span class="lines">@@ -191,11 +191,7 @@
</span><span class="cx"> SQLiteStatement statement(*this, "PRAGMA max_page_count = " + String::number(newMaxPageCount));
</span><span class="cx"> statement.prepare();
</span><span class="cx"> if (statement.step() != SQLResultRow)
</span><del>-#if OS(WINDOWS)
- LOG_ERROR("Failed to set maximum size of database to %I64i bytes", static_cast<long long>(size));
-#else
</del><span class="cx"> LOG_ERROR("Failed to set maximum size of database to %lli bytes", static_cast<long long>(size));
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> enableAuthorizer(true);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160580 => 160581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-14 02:53:52 UTC (rev 160580)
+++ trunk/Tools/ChangeLog 2013-12-14 03:14:12 UTC (rev 160581)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-13 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove Pre-VS2013 support code.
+ https://bugs.webkit.org/show_bug.cgi?id=125693
+
+ Reviewed by Darin Adler.
+
+ * DumpRenderTree/cg/ImageDiffCG.cpp: Remove strtof stub now supplied by
+ the math library.
+ * DumpRenderTree/win/ImageDiffCairo.cpp: Ditto.
+
</ins><span class="cx"> 2013-12-13 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Update Webkit bots.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreecgImageDiffCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp (160580 => 160581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2013-12-14 02:53:52 UTC (rev 160580)
+++ trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2013-12-14 03:14:12 UTC (rev 160581)
</span><span class="lines">@@ -60,10 +60,6 @@
</span><span class="cx"> using namespace std;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>-static inline float strtof(const char *nptr, char **endptr)
-{
- return strtod(nptr, endptr);
-}
</del><span class="cx"> static const CFStringRef kUTTypePNG = CFSTR("public.png");
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinImageDiffCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/ImageDiffCairo.cpp (160580 => 160581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/ImageDiffCairo.cpp 2013-12-14 02:53:52 UTC (rev 160580)
+++ trunk/Tools/DumpRenderTree/win/ImageDiffCairo.cpp 2013-12-14 03:14:12 UTC (rev 160581)
</span><span class="lines">@@ -49,13 +49,6 @@
</span><span class="cx"> static cairo_user_data_key_t s_imageDataKey;
</span><span class="cx">
</span><span class="cx">
</span><del>-#if PLATFORM(WIN)
-static inline float strtof(const char* inputString, char** endptr)
-{
- return strtod(inputString, endptr);
-}
-#endif
-
</del><span class="cx"> static cairo_status_t readFromData(void* closure, unsigned char* data, unsigned int length)
</span><span class="cx"> {
</span><span class="cx"> CFMutableDataRef dataSource = reinterpret_cast<CFMutableDataRef>(closure);
</span></span></pre>
</div>
</div>
</body>
</html>