<!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>[183186] 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/183186">183186</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-23 08:52:20 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use std::unique_ptr instead of OwnPtr in ThreadGlobalData
https://bugs.webkit.org/show_bug.cgi?id=141950
Patch by Joonghun Park <jh718.park@samsung.com> on 2015-04-23
Reviewed by Darin Adler.
No new tests, no behavior changes.
* dom/EventNames.h:
(WebCore::EventNames::create):
* loader/cache/CachedResourceRequestInitiators.h:
* platform/ThreadGlobalData.cpp:
(WebCore::ThreadGlobalData::ThreadGlobalData):
(WebCore::ThreadGlobalData::destroy):
* platform/ThreadGlobalData.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomEventNamesh">trunk/Source/WebCore/dom/EventNames.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequestInitiatorsh">trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h</a></li>
<li><a href="#trunkSourceWebCoreplatformThreadGlobalDatacpp">trunk/Source/WebCore/platform/ThreadGlobalData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformThreadGlobalDatah">trunk/Source/WebCore/platform/ThreadGlobalData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183185 => 183186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-23 15:49:47 UTC (rev 183185)
+++ trunk/Source/WebCore/ChangeLog 2015-04-23 15:52:20 UTC (rev 183186)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-04-23 Joonghun Park <jh718.park@samsung.com>
+
+ Use std::unique_ptr instead of OwnPtr in ThreadGlobalData
+ https://bugs.webkit.org/show_bug.cgi?id=141950
+
+ Reviewed by Darin Adler.
+
+ No new tests, no behavior changes.
+
+ * dom/EventNames.h:
+ (WebCore::EventNames::create):
+ * loader/cache/CachedResourceRequestInitiators.h:
+ * platform/ThreadGlobalData.cpp:
+ (WebCore::ThreadGlobalData::ThreadGlobalData):
+ (WebCore::ThreadGlobalData::destroy):
+ * platform/ThreadGlobalData.h:
+
</ins><span class="cx"> 2015-04-23 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Some media tests assert after r183096
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventNames.h (183185 => 183186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventNames.h 2015-04-23 15:49:47 UTC (rev 183185)
+++ trunk/Source/WebCore/dom/EventNames.h 2015-04-23 15:52:20 UTC (rev 183186)
</span><span class="lines">@@ -267,6 +267,20 @@
</span><span class="cx"> DOM_EVENT_NAMES_FOR_EACH(DOM_EVENT_NAMES_DECLARE)
</span><span class="cx"> #undef DOM_EVENT_NAMES_DECLARE
</span><span class="cx">
</span><ins>+ // FIXME: The friend declaration to std::make_unique below does not work in windows port.
+ //
+ // template<class T, class... Args>
+ // friend typename std::_Unique_if<T>::_Single_object std::make_unique(Args&&...);
+ //
+ // This create function should be deleted later and is only for keeping EventNames as private.
+ // std::make_unique should be used instead.
+ //
+ template<class... Args>
+ static std::unique_ptr<EventNames> create(Args&&... args)
+ {
+ return std::unique_ptr<EventNames>(new EventNames(std::forward<Args>(args)...));
+ }
+
</ins><span class="cx"> // FIXME: Inelegant to call these both event names and event types.
</span><span class="cx"> // We should choose one term and stick to it.
</span><span class="cx"> bool isWheelEventType(const AtomicString& eventType) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequestInitiatorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h (183185 => 183186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h 2015-04-23 15:49:47 UTC (rev 183185)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h 2015-04-23 15:52:20 UTC (rev 183186)
</span><span class="lines">@@ -32,12 +32,13 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> struct CachedResourceRequestInitiators {
</span><ins>+ CachedResourceRequestInitiators();
+
</ins><span class="cx"> const AtomicString css;
</span><span class="cx"> const AtomicString icon;
</span><span class="cx"> const AtomicString xmlhttprequest;
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CachedResourceRequestInitiators); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> private:
</span><del>- CachedResourceRequestInitiators();
</del><span class="cx"> friend class ThreadGlobalData;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThreadGlobalDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ThreadGlobalData.cpp (183185 => 183186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2015-04-23 15:49:47 UTC (rev 183185)
+++ trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2015-04-23 15:52:20 UTC (rev 183186)
</span><span class="lines">@@ -49,15 +49,15 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ThreadGlobalData::ThreadGlobalData()
</span><del>- : m_cachedResourceRequestInitiators(adoptPtr(new CachedResourceRequestInitiators))
- , m_eventNames(adoptPtr(new EventNames))
- , m_threadTimers(adoptPtr(new ThreadTimers))
</del><ins>+ : m_cachedResourceRequestInitiators(std::make_unique<CachedResourceRequestInitiators>())
+ , m_eventNames(EventNames::create())
+ , m_threadTimers(std::make_unique<ThreadTimers>())
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_isMainThread(isMainThread())
</span><span class="cx"> #endif
</span><del>- , m_cachedConverterICU(adoptPtr(new ICUConverterWrapper))
</del><ins>+ , m_cachedConverterICU(std::make_unique<ICUConverterWrapper>())
</ins><span class="cx"> #if PLATFORM(MAC)
</span><del>- , m_cachedConverterTEC(adoptPtr(new TECConverterWrapper))
</del><ins>+ , m_cachedConverterTEC(std::make_unique<TECConverterWrapper>())
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> // This constructor will have been called on the main thread before being called on
</span><span class="lines">@@ -75,13 +75,13 @@
</span><span class="cx"> void ThreadGlobalData::destroy()
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- m_cachedConverterTEC.clear();
</del><ins>+ m_cachedConverterTEC = nullptr;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_cachedConverterICU.clear();
</del><ins>+ m_cachedConverterICU = nullptr;
</ins><span class="cx">
</span><del>- m_eventNames.clear();
- m_threadTimers.clear();
</del><ins>+ m_eventNames = nullptr;
+ m_threadTimers = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(WEB_THREAD)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThreadGlobalDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ThreadGlobalData.h (183185 => 183186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ThreadGlobalData.h 2015-04-23 15:49:47 UTC (rev 183185)
+++ trunk/Source/WebCore/platform/ThreadGlobalData.h 2015-04-23 15:52:20 UTC (rev 183186)
</span><span class="lines">@@ -68,18 +68,18 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- OwnPtr<CachedResourceRequestInitiators> m_cachedResourceRequestInitiators;
- OwnPtr<EventNames> m_eventNames;
- OwnPtr<ThreadTimers> m_threadTimers;
</del><ins>+ std::unique_ptr<CachedResourceRequestInitiators> m_cachedResourceRequestInitiators;
+ std::unique_ptr<EventNames> m_eventNames;
+ std::unique_ptr<ThreadTimers> m_threadTimers;
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> bool m_isMainThread;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- OwnPtr<ICUConverterWrapper> m_cachedConverterICU;
</del><ins>+ std::unique_ptr<ICUConverterWrapper> m_cachedConverterICU;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- OwnPtr<TECConverterWrapper> m_cachedConverterTEC;
</del><ins>+ std::unique_ptr<TECConverterWrapper> m_cachedConverterTEC;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static ThreadSpecific<ThreadGlobalData>* staticData;
</span></span></pre>
</div>
</div>
</body>
</html>