Changeset 92553 in webkit

Timestamp:

Aug 6, 2011, 10:00:48 AM (14 years ago)

Author:

mitz@apple.com

Message:

Move the shared LineBreakIteratorPool from ThreadGlobalData into its own ThreadSpecific
​https://bugs.webkit.org/show_bug.cgi?id=65809

Reviewed by Darin Adler and Sam Weinig.

• platform/ThreadGlobalData.cpp:

(WebCore::ThreadGlobalData::destroy): Removed code to clear the m_lineBreakIteratorPool member
variable, which was removed.

• platform/ThreadGlobalData.h: Removed lineBreakIteratorPool() and associated member variable.
• platform/text/LineBreakIteratorPoolICU.h:

(WebCore::LineBreakIteratorPool::sharedPool): Changed to return a thread-specific pool.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ThreadGlobalData.cpp (modified) (3 diffs)
• platform/ThreadGlobalData.h (modified) (3 diffs)
• platform/text/LineBreakIteratorPoolICU.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-06  Dan Bernstein  <mitz@apple.com>
+
+        Move the shared LineBreakIteratorPool from ThreadGlobalData into its own ThreadSpecific
+        https://bugs.webkit.org/show_bug.cgi?id=65809
+
+        Reviewed by Darin Adler and Sam Weinig.
+
+        * platform/ThreadGlobalData.cpp:
+        (WebCore::ThreadGlobalData::destroy): Removed code to clear the m_lineBreakIteratorPool member
+        variable, which was removed.
+        * platform/ThreadGlobalData.h: Removed lineBreakIteratorPool() and associated member variable.
+        * platform/text/LineBreakIteratorPoolICU.h:
+        (WebCore::LineBreakIteratorPool::sharedPool): Changed to return a thread-specific pool.
+
 2011-08-06  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/Source/WebCore/platform/ThreadGlobalData.cpp

@@ -36 +36 @@
 
 #if USE(ICU_UNICODE)
-#include "LineBreakIteratorPoolICU.h"
 #include "TextCodecICU.h"
 #endif
@@ -84 +83 @@
 }
 
-#if USE(ICU_UNICODE)
-LineBreakIteratorPool& ThreadGlobalData::lineBreakIteratorPool()
-{
-    if (!m_lineBreakIteratorPool)
-        m_lineBreakIteratorPool = LineBreakIteratorPool::create();
-    return *m_lineBreakIteratorPool;
-}
-#endif
-
 void ThreadGlobalData::destroy()
 {
@@ -103 +93 @@
     delete m_cachedConverterICU;
     m_cachedConverterICU = 0;
-    m_lineBreakIteratorPool = nullptr;
 #endif
 

trunk/Source/WebCore/platform/ThreadGlobalData.h

@@ -43 +43 @@
 
     class EventNames;
-    class LineBreakIteratorPool;
     class ThreadTimers;
 
@@ -61 +60 @@
 #if USE(ICU_UNICODE)
         ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU; }
-        LineBreakIteratorPool& lineBreakIteratorPool();
 #endif
 
@@ -78 +76 @@
 #if USE(ICU_UNICODE)
         ICUConverterWrapper* m_cachedConverterICU;
-        OwnPtr<LineBreakIteratorPool> m_lineBreakIteratorPool;
 #endif
 

trunk/Source/WebCore/platform/text/LineBreakIteratorPoolICU.h

@@ -28 +28 @@
 
 #include "TextBreakIteratorInternalICU.h"
-#include "ThreadGlobalData.h"
 #include <unicode/ubrk.h>
 #include <wtf/Assertions.h>
 #include <wtf/HashMap.h>
 #include <wtf/PassOwnPtr.h>
+#include <wtf/ThreadSpecific.h>
+#include <wtf/text/AtomicString.h>
 #include <wtf/text/CString.h>
 
@@ -42 +43 @@
     static LineBreakIteratorPool& sharedPool()
     {
-        return threadGlobalData().lineBreakIteratorPool();
+        static WTF::ThreadSpecific<LineBreakIteratorPool>* pool = new WTF::ThreadSpecific<LineBreakIteratorPool>;
+        return **pool;
     }
 
@@ -93 +95 @@
     Pool m_pool;
     HashMap<UBreakIterator*, AtomicString> m_vendedIterators;
+
+    friend WTF::ThreadSpecific<LineBreakIteratorPool>::operator LineBreakIteratorPool*();
 };