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

Side by Side Diff: third_party/WebKit/Source/wtf/text/TextPosition.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) 2013, Google Inc. All rights reserved. 2 * Copyright (C) 2013, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #include "wtf/text/TextPosition.h" 25 #include "wtf/text/TextPosition.h"
26 26
27 #include "wtf/PassOwnPtr.h" 27 #include "wtf/PtrUtil.h"
28 #include "wtf/StdLibExtras.h" 28 #include "wtf/StdLibExtras.h"
29 #include <algorithm> 29 #include <algorithm>
30 #include <memory>
30 31
31 namespace WTF { 32 namespace WTF {
32 33
33 PassOwnPtr<Vector<unsigned>> lineEndings(const String& text) 34 std::unique_ptr<Vector<unsigned>> lineEndings(const String& text)
34 { 35 {
35 OwnPtr<Vector<unsigned>> result(adoptPtr(new Vector<unsigned>())); 36 std::unique_ptr<Vector<unsigned>> result(wrapUnique(new Vector<unsigned>())) ;
36 37
37 unsigned start = 0; 38 unsigned start = 0;
38 while (start < text.length()) { 39 while (start < text.length()) {
39 size_t lineEnd = text.find('\n', start); 40 size_t lineEnd = text.find('\n', start);
40 if (lineEnd == kNotFound) 41 if (lineEnd == kNotFound)
41 break; 42 break;
42 43
43 result->append(static_cast<unsigned>(lineEnd)); 44 result->append(static_cast<unsigned>(lineEnd));
44 start = lineEnd + 1; 45 start = lineEnd + 1;
45 } 46 }
(...skipping 11 matching lines...) Expand all
57 TextPosition TextPosition::fromOffsetAndLineEndings(unsigned offset, const Vecto r<unsigned>& lineEndings) 58 TextPosition TextPosition::fromOffsetAndLineEndings(unsigned offset, const Vecto r<unsigned>& lineEndings)
58 { 59 {
59 const unsigned* foundLineEnding = std::lower_bound(lineEndings.begin(), line Endings.end(), offset); 60 const unsigned* foundLineEnding = std::lower_bound(lineEndings.begin(), line Endings.end(), offset);
60 int lineIndex = foundLineEnding - &lineEndings.at(0); 61 int lineIndex = foundLineEnding - &lineEndings.at(0);
61 unsigned lineStartOffset = lineIndex > 0 ? lineEndings.at(lineIndex - 1) + 1 : 0; 62 unsigned lineStartOffset = lineIndex > 0 ? lineEndings.at(lineIndex - 1) + 1 : 0;
62 int column = offset - lineStartOffset; 63 int column = offset - lineStartOffset;
63 return TextPosition(OrdinalNumber::fromZeroBasedInt(lineIndex), OrdinalNumbe r::fromZeroBasedInt(column)); 64 return TextPosition(OrdinalNumber::fromZeroBasedInt(lineIndex), OrdinalNumbe r::fromZeroBasedInt(column));
64 } 65 }
65 66
66 } // namespace WTF 67 } // namespace WTF
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/text/TextPosition.h ('k') | third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698