Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 29 insertions, 5 deletions

diff --git a/Source/WebCore/platform/text/TextBreakIteratorICU.cpp b/Source/WebCore/platform/text/TextBreakIteratorICU.cpp
index f5575ee..3be2d88 100644
--- a/Source/WebCore/platform/text/TextBreakIteratorICU.cpp
+++ b/Source/WebCore/platform/text/TextBreakIteratorICU.cpp
@@ -27,6 +27,8 @@
 #include <unicode/ubrk.h>
 #include <wtf/Assertions.h>
 
+using namespace std;
+
 namespace WebCore {
 
 static TextBreakIterator* setUpIterator(bool& createdIterator, TextBreakIterator*& iterator,
@@ -68,12 +70,34 @@ TextBreakIterator* wordBreakIterator(const UChar* string, int length)
         staticWordBreakIterator, UBRK_WORD, string, length);
 }
 
-TextBreakIterator* lineBreakIterator(const UChar* string, int length)
+static bool createdLineBreakIterator = false;
+static TextBreakIterator* staticLineBreakIterator;
+
+TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length)
+{
+    TextBreakIterator* lineBreakIterator = 0;
+    if (!createdLineBreakIterator || staticLineBreakIterator) {
+        setUpIterator(createdLineBreakIterator, staticLineBreakIterator, UBRK_LINE, string, length);
+        swap(staticLineBreakIterator, lineBreakIterator);
+    }
+
+    if (!lineBreakIterator) {
+        bool createdNewLineBreakIterator = false;
+        setUpIterator(createdNewLineBreakIterator, lineBreakIterator, UBRK_LINE, string, length);
+    }
+
+    return lineBreakIterator;
+}
+
+void releaseLineBreakIterator(TextBreakIterator* iterator)
 {
-    static bool createdLineBreakIterator = false;
-    static TextBreakIterator* staticLineBreakIterator;
-    return setUpIterator(createdLineBreakIterator,
-        staticLineBreakIterator, UBRK_LINE, string, length);
+    ASSERT(createdLineBreakIterator);
+    ASSERT(iterator);
+
+    if (!staticLineBreakIterator)
+        staticLineBreakIterator = iterator;
+    else
+        ubrk_close(reinterpret_cast<UBreakIterator*>(iterator));
 }
 
 TextBreakIterator* sentenceBreakIterator(const UChar* string, int length)