Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: third_party/WebKit/Source/platform/text/TextBreakIteratorICU.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Lars Knoll <lars@trolltech.com> 2 * Copyright (C) 2006 Lars Knoll <lars@trolltech.com>
3 * Copyright (C) 2007, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2007, 2011, 2012 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "platform/text/TextBreakIterator.h" 22 #include "platform/text/TextBreakIterator.h"
23 23
24 #include "platform/text/TextBreakIteratorInternalICU.h" 24 #include "platform/text/TextBreakIteratorInternalICU.h"
25 #include "wtf/Assertions.h" 25 #include "wtf/Assertions.h"
26 #include "wtf/HashMap.h" 26 #include "wtf/HashMap.h"
27 #include "wtf/PassOwnPtr.h" 27 #include "wtf/PtrUtil.h"
28 #include "wtf/ThreadSpecific.h" 28 #include "wtf/ThreadSpecific.h"
29 #include "wtf/ThreadingPrimitives.h" 29 #include "wtf/ThreadingPrimitives.h"
30 #include "wtf/text/WTFString.h" 30 #include "wtf/text/WTFString.h"
31 #include <memory>
31 #include <unicode/rbbi.h> 32 #include <unicode/rbbi.h>
32 #include <unicode/ubrk.h> 33 #include <unicode/ubrk.h>
33 34
34 using namespace WTF; 35 using namespace WTF;
35 36
36 namespace blink { 37 namespace blink {
37 38
38 class LineBreakIteratorPool final { 39 class LineBreakIteratorPool final {
39 USING_FAST_MALLOC(LineBreakIteratorPool); 40 USING_FAST_MALLOC(LineBreakIteratorPool);
40 WTF_MAKE_NONCOPYABLE(LineBreakIteratorPool); 41 WTF_MAKE_NONCOPYABLE(LineBreakIteratorPool);
41 public: 42 public:
42 static LineBreakIteratorPool& sharedPool() 43 static LineBreakIteratorPool& sharedPool()
43 { 44 {
44 static WTF::ThreadSpecific<LineBreakIteratorPool>* pool = new WTF::Threa dSpecific<LineBreakIteratorPool>; 45 static WTF::ThreadSpecific<LineBreakIteratorPool>* pool = new WTF::Threa dSpecific<LineBreakIteratorPool>;
45 return **pool; 46 return **pool;
46 } 47 }
47 48
48 static PassOwnPtr<LineBreakIteratorPool> create() { return adoptPtr(new Line BreakIteratorPool); } 49 static std::unique_ptr<LineBreakIteratorPool> create() { return wrapUnique(n ew LineBreakIteratorPool); }
49 50
50 icu::BreakIterator* take(const AtomicString& locale) 51 icu::BreakIterator* take(const AtomicString& locale)
51 { 52 {
52 icu::BreakIterator* iterator = 0; 53 icu::BreakIterator* iterator = 0;
53 for (size_t i = 0; i < m_pool.size(); ++i) { 54 for (size_t i = 0; i < m_pool.size(); ++i) {
54 if (m_pool[i].first == locale) { 55 if (m_pool[i].first == locale) {
55 iterator = m_pool[i].second; 56 iterator = m_pool[i].second;
56 m_pool.remove(i); 57 m_pool.remove(i);
57 break; 58 break;
58 } 59 }
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
835 "$Tel1 $TelV $Tel0;" // Telugu Virama (backward) 836 "$Tel1 $TelV $Tel0;" // Telugu Virama (backward)
836 "$Kan1 $KanV $Kan0;" // Kannada Virama (backward) 837 "$Kan1 $KanV $Kan0;" // Kannada Virama (backward)
837 "$Mal1 $MalV $Mal0;" // Malayalam Virama (backward) 838 "$Mal1 $MalV $Mal0;" // Malayalam Virama (backward)
838 "!!safe_reverse;" 839 "!!safe_reverse;"
839 "!!safe_forward;"; 840 "!!safe_forward;";
840 841
841 return setUpIteratorWithRules(kRules, string, length); 842 return setUpIteratorWithRules(kRules, string, length);
842 } 843 }
843 844
844 } // namespace blink 845 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698