<!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>[213555] trunk/Tools</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/213555">213555</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2017-03-07 17:03:38 -0800 (Tue, 07 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the TestWebKitAPI build
Rubber-stamped by Anders Carlsson.
* TestWebKitAPI/Tests/WTF/MetaAllocator.cpp:
(TestWebKitAPI::TEST_F):
Fix a new warning about default argument promotion and va_start by
making this a enum class.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFMetaAllocatorcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (213554 => 213555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-08 00:59:46 UTC (rev 213554)
+++ trunk/Tools/ChangeLog 2017-03-08 01:03:38 UTC (rev 213555)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-07 Tim Horton <timothy_horton@apple.com>
+
+ Fix the TestWebKitAPI build
+
+ Rubber-stamped by Anders Carlsson.
+
+ * TestWebKitAPI/Tests/WTF/MetaAllocator.cpp:
+ (TestWebKitAPI::TEST_F):
+ Fix a new warning about default argument promotion and va_start by
+ making this a enum class.
+
</ins><span class="cx"> 2017-03-07 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Some platforms won't be able to create a GPUDevice
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFMetaAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp (213554 => 213555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp 2017-03-08 00:59:46 UTC (rev 213554)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp 2017-03-08 01:03:38 UTC (rev 213555)
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> free(thirdHandle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- enum TestFIFOAllocMode { FillAtEnd, EagerFill };
</del><ins>+ enum class TestFIFOAllocMode { FillAtEnd, EagerFill };
</ins><span class="cx"> void testFIFOAlloc(TestFIFOAllocMode mode, ...)
</span><span class="cx"> {
</span><span class="cx"> // This will test the simple case of no-coalesce (freeing the left-most
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> for (unsigned index = 0; index < handles.size(); ++index) {
</span><span class="cx"> sizeSoFar += handles.at(index)->sizeInBytes();
</span><span class="cx"> free(handles.at(index));
</span><del>- if (mode == EagerFill) {
</del><ins>+ if (mode == TestFIFOAllocMode::EagerFill) {
</ins><span class="cx"> MetaAllocatorHandle* handle = allocate(sizeSoFar);
</span><span class="cx"> EXPECT_EQ(handle->start(), reinterpret_cast<void*>(basePage * pageSize()));
</span><span class="cx"> EXPECT_EQ(handle->sizeInBytes(), sizeSoFar);
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx">
</span><span class="cx"> confirm(basePage * pageSize(), (basePage + defaultPagesInHeap) * pageSize(), false);
</span><span class="cx">
</span><del>- if (mode == FillAtEnd) {
</del><ins>+ if (mode == TestFIFOAllocMode::FillAtEnd) {
</ins><span class="cx"> MetaAllocatorHandle* finalHandle = allocate(totalSize);
</span><span class="cx"> EXPECT_EQ(finalHandle->start(), reinterpret_cast<void*>(basePage * pageSize()));
</span><span class="cx"> EXPECT_EQ(finalHandle->sizeInBytes(), totalSize);
</span><span class="lines">@@ -791,42 +791,42 @@
</span><span class="cx">
</span><span class="cx"> TEST_F(MetaAllocatorTest, FIFOAllocFillAtEnd32Twice)
</span><span class="cx"> {
</span><del>- testFIFOAlloc(FillAtEnd, 32, 32, 0);
</del><ins>+ testFIFOAlloc(TestFIFOAllocMode::FillAtEnd, 32, 32, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(MetaAllocatorTest, FIFOAllocFillAtEnd32Thrice)
</span><span class="cx"> {
</span><del>- testFIFOAlloc(FillAtEnd, 32, 32, 32, 0);
</del><ins>+ testFIFOAlloc(TestFIFOAllocMode::FillAtEnd, 32, 32, 32, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(MetaAllocatorTest, FIFOAllocFillAtEnd32FourTimes)
</span><span class="cx"> {
</span><del>- testFIFOAlloc(FillAtEnd, 32, 32, 32, 32, 0);
</del><ins>+ testFIFOAlloc(TestFIFOAllocMode::FillAtEnd, 32, 32, 32, 32, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(MetaAllocatorTest, FIFOAllocFillAtEndPageLess32Then32ThenPageLess64Then64)
</span><span class="cx"> {
</span><del>- testFIFOAlloc(FillAtEnd, static_cast<int>(pageSize() - 32), 32, static_cast<int>(pageSize() - 64), 64, 0);
</del><ins>+ testFIFOAlloc(TestFIFOAllocMode::FillAtEnd, static_cast<int>(pageSize() - 32), 32, static_cast<int>(pageSize() - 64), 64, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(MetaAllocatorTest, FIFOAllocEagerFill32Twice)
</span><span class="cx"> {
</span><del>- testFIFOAlloc(EagerFill, 32, 32, 0);
</del><ins>+ testFIFOAlloc(TestFIFOAllocMode::EagerFill, 32, 32, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(MetaAllocatorTest, FIFOAllocEagerFill32Thrice)
</span><span class="cx"> {
</span><del>- testFIFOAlloc(EagerFill, 32, 32, 32, 0);
</del><ins>+ testFIFOAlloc(TestFIFOAllocMode::EagerFill, 32, 32, 32, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(MetaAllocatorTest, FIFOAllocEagerFill32FourTimes)
</span><span class="cx"> {
</span><del>- testFIFOAlloc(EagerFill, 32, 32, 32, 32, 0);
</del><ins>+ testFIFOAlloc(TestFIFOAllocMode::EagerFill, 32, 32, 32, 32, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(MetaAllocatorTest, FIFOAllocEagerFillPageLess32Then32ThenPageLess64Then64)
</span><span class="cx"> {
</span><del>- testFIFOAlloc(EagerFill, static_cast<int>(pageSize() - 32), 32, static_cast<int>(pageSize() - 64), 64, 0);
</del><ins>+ testFIFOAlloc(TestFIFOAllocMode::EagerFill, static_cast<int>(pageSize() - 32), 32, static_cast<int>(pageSize() - 64), 64, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(MetaAllocatorTest, FillHeap32)
</span></span></pre>
</div>
</div>
</body>
</html>