<!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>[242476] releases/WebKitGTK/webkit-2.24/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/242476">242476</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2019-03-05 09:21:23 -0800 (Tue, 05 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/242116">r242116</a> - Code quality cleanup in NeverDestroyed
https://bugs.webkit.org/show_bug.cgi?id=194824

Source/WebCore:

Reviewed by Mark Lam.

name_names.pl should not just assume the layout of LazyNeverDestroyed.

* dom/make_names.pl:
(printNamesCppFile):

Source/WTF:

Reviewed by Yusuke Suzuki.

First, move data members to the end of the class per WebKit
style. Also, add forbid heap allocation since we expect the
NeverDestroyed classes to be static.

* wtf/NeverDestroyed.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224SourceWTFChangeLog">releases/WebKitGTK/webkit-2.24/Source/WTF/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWTFwtfNeverDestroyedh">releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/NeverDestroyed.h</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoredommake_namespl">releases/WebKitGTK/webkit-2.24/Source/WebCore/dom/make_names.pl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit224SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WTF/ChangeLog (242475 => 242476)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WTF/ChangeLog      2019-03-05 17:21:19 UTC (rev 242475)
+++ releases/WebKitGTK/webkit-2.24/Source/WTF/ChangeLog 2019-03-05 17:21:23 UTC (rev 242476)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-02-26  Keith Miller  <keith_miller@apple.com>
+
+        Code quality cleanup in NeverDestroyed
+        https://bugs.webkit.org/show_bug.cgi?id=194824
+
+        Reviewed by Yusuke Suzuki.
+
+        First, move data members to the end of the class per WebKit
+        style. Also, add forbid heap allocation since we expect the
+        NeverDestroyed classes to be static.
+
+        * wtf/NeverDestroyed.h:
+
</ins><span class="cx"> 2019-02-25  Sam Weinig  <sam@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Update double-conversion to the latest version
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWTFwtfNeverDestroyedh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/NeverDestroyed.h (242475 => 242476)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/NeverDestroyed.h   2019-03-05 17:21:19 UTC (rev 242475)
+++ releases/WebKitGTK/webkit-2.24/Source/WTF/wtf/NeverDestroyed.h      2019-03-05 17:21:23 UTC (rev 242476)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include <type_traits>
</span><span class="cx"> #include <utility>
</span><ins>+#include <wtf/ForbidHeapAllocation.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> 
</span><span class="cx"> // NeverDestroyed is a smart-pointer-like class that ensures that the destructor
</span><span class="lines">@@ -43,8 +44,9 @@
</span><span class="cx"> 
</span><span class="cx"> template<typename T> class NeverDestroyed {
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(NeverDestroyed);
</span><ins>+    WTF_FORBID_HEAP_ALLOCATION;
+public:
</ins><span class="cx"> 
</span><del>-public:
</del><span class="cx">     template<typename... Args> NeverDestroyed(Args&&... args)
</span><span class="cx">     {
</span><span class="cx">         MaybeRelax<T>(new (storagePointer()) T(std::forward<Args>(args)...));
</span><span class="lines">@@ -66,10 +68,6 @@
</span><span class="cx"> 
</span><span class="cx">     PointerType storagePointer() const { return const_cast<PointerType>(reinterpret_cast<const T*>(&m_storage)); }
</span><span class="cx"> 
</span><del>-    // FIXME: Investigate whether we should allocate a hunk of virtual memory
-    // and hand out chunks of it to NeverDestroyed instead, to reduce fragmentation.
-    typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type m_storage;
-
</del><span class="cx">     template<typename PtrType, bool ShouldRelax = std::is_base_of<RefCountedBase, PtrType>::value> struct MaybeRelax {
</span><span class="cx">         explicit MaybeRelax(PtrType*) { }
</span><span class="cx">     };
</span><span class="lines">@@ -76,6 +74,10 @@
</span><span class="cx">     template<typename PtrType> struct MaybeRelax<PtrType, true> {
</span><span class="cx">         explicit MaybeRelax(PtrType* ptr) { ptr->relaxAdoptionRequirement(); }
</span><span class="cx">     };
</span><ins>+
+    // FIXME: Investigate whether we should allocate a hunk of virtual memory
+    // and hand out chunks of it to NeverDestroyed instead, to reduce fragmentation.
+    typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type m_storage;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> template<typename T> NeverDestroyed<T> makeNeverDestroyed(T&&);
</span><span class="lines">@@ -85,7 +87,7 @@
</span><span class="cx"> // share more of the code with the main NeverDestroyed above.
</span><span class="cx"> template<typename T> class LazyNeverDestroyed {
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(LazyNeverDestroyed);
</span><del>-
</del><ins>+    WTF_FORBID_HEAP_ALLOCATION;
</ins><span class="cx"> public:
</span><span class="cx">     LazyNeverDestroyed() = default;
</span><span class="cx"> 
</span><span class="lines">@@ -124,10 +126,6 @@
</span><span class="cx">         return const_cast<PointerType>(reinterpret_cast<const T*>(&m_storage));
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // FIXME: Investigate whether we should allocate a hunk of virtual memory
-    // and hand out chunks of it to NeverDestroyed instead, to reduce fragmentation.
-    typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type m_storage;
-
</del><span class="cx">     template<typename PtrType, bool ShouldRelax = std::is_base_of<RefCountedBase, PtrType>::value> struct MaybeRelax {
</span><span class="cx">         explicit MaybeRelax(PtrType*) { }
</span><span class="cx">     };
</span><span class="lines">@@ -140,6 +138,10 @@
</span><span class="cx">     // It must not be initialized dynamically; that would not be thread safe.
</span><span class="cx">     bool m_isConstructed;
</span><span class="cx"> #endif
</span><ins>+
+    // FIXME: Investigate whether we should allocate a hunk of virtual memory
+    // and hand out chunks of it to NeverDestroyed instead, to reduce fragmentation.
+    typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type m_storage;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> template<typename T> inline NeverDestroyed<T> makeNeverDestroyed(T&& argument)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (242475 => 242476)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog  2019-03-05 17:21:19 UTC (rev 242475)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog     2019-03-05 17:21:23 UTC (rev 242476)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-02-26  Keith Miller  <keith_miller@apple.com>
+
+        Code quality cleanup in NeverDestroyed
+        https://bugs.webkit.org/show_bug.cgi?id=194824
+
+        Reviewed by Mark Lam.
+
+        name_names.pl should not just assume the layout of LazyNeverDestroyed.
+
+        * dom/make_names.pl:
+        (printNamesCppFile):
+
</ins><span class="cx"> 2019-02-26  Sihui Liu  <sihui_liu@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Mac WK2] storage/indexeddb/IDBObject-leak.html is flaky
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoredommake_namespl"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/dom/make_names.pl (242475 => 242476)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/dom/make_names.pl  2019-03-05 17:21:19 UTC (rev 242475)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/dom/make_names.pl     2019-03-05 17:21:23 UTC (rev 242476)
</span><span class="lines">@@ -773,7 +773,7 @@
</span><span class="cx">         print F "\n\nconst WebCore::$parameters{namespace}QualifiedName* const* get$parameters{namespace}Tags()\n";
</span><span class="cx">         print F "{\n    static const WebCore::$parameters{namespace}QualifiedName* const $parameters{namespace}Tags[] = {\n";
</span><span class="cx">         for my $name (sort keys %allTags) {
</span><del>-            print F "        reinterpret_cast<const WebCore::$parameters{namespace}QualifiedName*>(&${name}Tag),\n";
</del><ins>+            print F "        &${name}Tag.get(),\n";
</ins><span class="cx">         }
</span><span class="cx">         print F "    };\n";
</span><span class="cx">         print F "    return $parameters{namespace}Tags;\n";
</span><span class="lines">@@ -788,7 +788,7 @@
</span><span class="cx">         print F "\n\nconst WebCore::QualifiedName* const* get$parameters{namespace}Attrs()\n";
</span><span class="cx">         print F "{\n    static const WebCore::QualifiedName* const $parameters{namespace}Attrs[] = {\n";
</span><span class="cx">         for my $name (sort keys %allAttrs) {
</span><del>-            print F "        reinterpret_cast<const WebCore::QualifiedName*>(&${name}Attr),\n";
</del><ins>+            print F "        &${name}Attr.get(),\n";
</ins><span class="cx">         }
</span><span class="cx">         print F "    };\n";
</span><span class="cx">         print F "    return $parameters{namespace}Attrs;\n";
</span></span></pre>
</div>
</div>

</body>
</html>