<!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>[211173] 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/211173">211173</a></dd>
<dt>Author</dt> <dd>annulen@yandex.ru</dd>
<dt>Date</dt> <dd>2017-01-25 15:37:26 -0800 (Wed, 25 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removed leftovers of pre-2015 VisualStudio support
https://bugs.webkit.org/show_bug.cgi?id=167434
Reviewed by Alex Christensen.
Source/WebCore:
No new tests needed.
* platform/graphics/filters/FEConvolveMatrix.cpp: Replaced MSC_VER
usage with COMPILER(MSVC)
Source/WTF:
* wtf/Compiler.h:
* wtf/Platform.h:
* wtf/StringExtras.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCompilerh">trunk/Source/WTF/wtf/Compiler.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtfStringExtrash">trunk/Source/WTF/wtf/StringExtras.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFEConvolveMatrixcpp">trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (211172 => 211173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-01-25 23:20:45 UTC (rev 211172)
+++ trunk/Source/WTF/ChangeLog 2017-01-25 23:37:26 UTC (rev 211173)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-25 Konstantin Tokarev <annulen@yandex.ru>
+
+ Removed leftovers of pre-2015 VisualStudio support
+ https://bugs.webkit.org/show_bug.cgi?id=167434
+
+ Reviewed by Alex Christensen.
+
+ * wtf/Compiler.h:
+ * wtf/Platform.h:
+ * wtf/StringExtras.h:
+
</ins><span class="cx"> 2017-01-25 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable Download attribute support on iOS
</span></span></pre></div>
<a id="trunkSourceWTFwtfCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Compiler.h (211172 => 211173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Compiler.h 2017-01-25 23:20:45 UTC (rev 211172)
+++ trunk/Source/WTF/wtf/Compiler.h 2017-01-25 23:37:26 UTC (rev 211173)
</span><span class="lines">@@ -119,16 +119,14 @@
</span><span class="cx"> /* COMPILER(MSVC) - Microsoft Visual C++ */
</span><span class="cx">
</span><span class="cx"> #if defined(_MSC_VER)
</span><ins>+
</ins><span class="cx"> #define WTF_COMPILER_MSVC 1
</span><del>-
-#if _MSC_VER >= 1900
</del><span class="cx"> #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS 1
</span><del>-#endif
</del><span class="cx">
</span><ins>+#if _MSC_VER < 1900
+#error "Please use a newer version of Visual Studio. WebKit requires VS2015 or newer to compile."
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(_MSC_VER) && _MSC_VER < 1800
-#error "Please use a newer version of Visual Studio. WebKit requires VS2013 or newer to compile."
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* COMPILER(SUNCC) */
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (211172 => 211173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2017-01-25 23:20:45 UTC (rev 211172)
+++ trunk/Source/WTF/wtf/Platform.h 2017-01-25 23:37:26 UTC (rev 211173)
</span><span class="lines">@@ -1137,11 +1137,7 @@
</span><span class="cx"> #define __STDC_FORMAT_MACROS
</span><span class="cx"> #undef __STDC_LIMIT_MACROS
</span><span class="cx"> #define __STDC_LIMIT_MACROS
</span><del>-#if _MSC_VER < 1900
-#undef _HAS_EXCEPTIONS
-#define _HAS_EXCEPTIONS 1
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #define HAVE_NS_ACTIVITY 1
</span></span></pre></div>
<a id="trunkSourceWTFwtfStringExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StringExtras.h (211172 => 211173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StringExtras.h 2017-01-25 23:20:45 UTC (rev 211172)
+++ trunk/Source/WTF/wtf/StringExtras.h 2017-01-25 23:37:26 UTC (rev 211173)
</span><span class="lines">@@ -35,54 +35,6 @@
</span><span class="cx"> #include <strings.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if COMPILER(MSVC) && _MSC_VER < 1900
-
-// In versions of the Microsoft library before Visual Studio 2015, snprintf and vsnprintf
-// did not null-terminate when the result entirely filled the buffer. The following work
-// around that limitation. This means that any file using snprintf or vsnprintf needs to
-// include this header and use the global namespace style to invoke it, not the std
-// namespace style.
-
-#include <errno.h>
-
-inline int snprintf(char* buffer, size_t count, const char* format, ...)
-{
- int result;
- va_list args;
- va_start(args, format);
- result = _vsnprintf(buffer, count, format, args);
- if (result < 0 && errno != EINVAL)
- result = _vscprintf(format, args);
- va_end(args);
-
- // In the case where the string entirely filled the buffer, _vsnprintf will not
- // null-terminate it, but snprintf must.
- if (count > 0)
- buffer[count - 1] = '\0';
-
- return result;
-}
-
-inline double wtf_vsnprintf(char* buffer, size_t count, const char* format, va_list args)
-{
- int result = _vsnprintf(buffer, count, format, args);
- if (result < 0 && errno != EINVAL)
- result = _vscprintf(format, args);
-
- // In the case where the string entirely filled the buffer, _vsnprintf will not
- // null-terminate it, but vsnprintf must.
- if (count > 0)
- buffer[count - 1] = '\0';
-
- return result;
-}
-
-// Work around a difference in Microsoft's implementation of vsnprintf, where
-// vsnprintf does not null terminate the buffer. WebKit can rely on the null termination.
-#define vsnprintf(buffer, count, format, args) wtf_vsnprintf(buffer, count, format, args)
-
-#endif
-
</del><span class="cx"> #if COMPILER(MSVC)
</span><span class="cx">
</span><span class="cx"> // FIXME: We should stop using these entirely and use suitable versions of equalIgnoringASCIICase instead.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211172 => 211173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-25 23:20:45 UTC (rev 211172)
+++ trunk/Source/WebCore/ChangeLog 2017-01-25 23:37:26 UTC (rev 211173)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-25 Konstantin Tokarev <annulen@yandex.ru>
+
+ Removed leftovers of pre-2015 VisualStudio support
+ https://bugs.webkit.org/show_bug.cgi?id=167434
+
+ Reviewed by Alex Christensen.
+
+ No new tests needed.
+
+ * platform/graphics/filters/FEConvolveMatrix.cpp: Replaced MSC_VER
+ usage with COMPILER(MSVC)
+
</ins><span class="cx"> 2017-01-25 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixing typos in r211161
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFEConvolveMatrixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp (211172 => 211173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp 2017-01-25 23:20:45 UTC (rev 211172)
+++ trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp 2017-01-25 23:37:26 UTC (rev 211173)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> image->set(pixel++, maxAlpha);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if defined(_MSC_VER) && (_MSC_VER >= 1700)
</del><ins>+#if COMPILER(MSVC)
</ins><span class="cx"> // Incorrectly diagnosing overwrite of stack in |totals| due to |preserveAlphaValues|.
</span><span class="cx"> #pragma warning(push)
</span><span class="cx"> #pragma warning(disable: 4789)
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if defined(_MSC_VER) && (_MSC_VER >= 1700)
</del><ins>+#if COMPILER(MSVC)
</ins><span class="cx"> #pragma warning(pop) // Disable of 4789
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>