As suggested by Darin in https://bugs.webkit.org/show_bug.cgi?id=128173#c2. The recommended alternative is static NeverDestroyed.
Created attachment 226533 [details] Patch I removed the list of changes in the WebCore ChangeLog because it was huge
BTW I opened bug 130185 to start replacing them with static NeverDestroyed<T>
Created attachment 226588 [details] Patch
Comment on attachment 226588 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226588&action=review Did you use the do-webcore-rename script? It’s really good at doing changes like this one automatically. > Source/WTF/wtf/StdLibExtras.h:38 > -#ifndef DEFINE_STATIC_LOCAL > +#ifndef DEPRECATED_DEFINE_STATIC_LOCAL Should update the comment above to talk about using NeverDestroyed instead. > Tools/DumpRenderTree/JavaScriptThreading.cpp:49 > + DEPRECATED_DEFINE_STATIC_LOCAL(Mutex, staticMutex, ()); Note for the future: I’m surprised we need this at all in test tools. A plain old static should be OK in all the test tool cases. It’s only the frameworks themselves that have the “no static destructor” constraint. > Tools/Scripts/check-for-exit-time-destructors:100 > + print "ERROR: Use DEPRECATED_DEFINE_STATIC_LOCAL from <wtf/StdLibExtras.h>\n"; This is no longer correct advice. The message should mention NeverDestroyed instead. > Tools/TestWebKitAPI/Tests/WebKit2/SeccompFilters.cpp:45 > +DEPRECATED_DEFINE_STATIC_LOCAL(String, rootDir, (ASCIILiteral("/"))); Same thought here about test tools not needing this.
(In reply to comment #4) > (From update of attachment 226588 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=226588&action=review > > Did you use the do-webcore-rename script? It’s really good at doing changes like this one automatically. Oh, didn't know about it, I just cooked my own. > > Source/WTF/wtf/StdLibExtras.h:38 > > -#ifndef DEFINE_STATIC_LOCAL > > +#ifndef DEPRECATED_DEFINE_STATIC_LOCAL > > Should update the comment above to talk about using NeverDestroyed instead. Good point > > Tools/DumpRenderTree/JavaScriptThreading.cpp:49 > > + DEPRECATED_DEFINE_STATIC_LOCAL(Mutex, staticMutex, ()); > > Note for the future: I’m surprised we need this at all in test tools. A plain old static should be OK in all the test tool cases. It’s only the frameworks themselves that have the “no static destructor” constraint. Yep, I'll open a bug for that. > > Tools/Scripts/check-for-exit-time-destructors:100 > > + print "ERROR: Use DEPRECATED_DEFINE_STATIC_LOCAL from <wtf/StdLibExtras.h>\n"; > > This is no longer correct advice. The message should mention NeverDestroyed instead. Indeed
Committed r165607: <http://trac.webkit.org/changeset/165607>