webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 4 insertions, 3 deletions

diff --git a/Tools/DumpRenderTree/WorkQueue.cpp b/Tools/DumpRenderTree/WorkQueue.cpp
index 0106fbac1..097f4cdd2 100644
--- a/Tools/DumpRenderTree/WorkQueue.cpp
+++ b/Tools/DumpRenderTree/WorkQueue.cpp
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission. 
  *
@@ -31,6 +31,7 @@
 
 #include "WorkQueueItem.h"
 #include <wtf/Assertions.h>
+#include <wtf/NeverDestroyed.h>
 
 static const unsigned queueLength = 1024;
 
@@ -38,9 +39,9 @@ static WorkQueueItem* theQueue[queueLength];
 static unsigned startOfQueue;
 static unsigned endOfQueue;
 
-WorkQueue* WorkQueue::shared()
+WorkQueue& WorkQueue::singleton()
 {
-    static WorkQueue* sharedInstance = new WorkQueue;
+    static NeverDestroyed<WorkQueue> sharedInstance;
     return sharedInstance;
 }