| Index: third_party/WebKit/Source/wtf/text/TextPosition.h
|
| diff --git a/third_party/WebKit/Source/wtf/text/TextPosition.h b/third_party/WebKit/Source/wtf/text/TextPosition.h
|
| index e31480743844a2f8d4abaccf3517d8976bcbd4de..ca8c6db139c17f099ace66fa6378496bf454b1a6 100644
|
| --- a/third_party/WebKit/Source/wtf/text/TextPosition.h
|
| +++ b/third_party/WebKit/Source/wtf/text/TextPosition.h
|
| @@ -4,22 +4,23 @@
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions
|
| * are met:
|
| - * 1. Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * 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.
|
| + * 1. Redistributions of source code must retain the above copyright
|
| + * notice, this list of conditions and the following disclaimer.
|
| + * 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.
|
| *
|
| - * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
|
| - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
| - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
| - * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
|
| - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
| - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
| - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
| - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
| - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
|
| + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
| + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
| + * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE
|
| + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
| + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
| + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
| + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
| + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
| + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
|
| + * DAMAGE.
|
| */
|
|
|
| #ifndef TextPosition_h
|
| @@ -34,9 +35,10 @@
|
|
|
| namespace WTF {
|
|
|
| -// An abstract number of element in a sequence. The sequence has a first element.
|
| -// This type should be used instead of integer because 2 contradicting traditions can
|
| -// call a first element '0' or '1' which makes integer type ambiguous.
|
| +// An abstract number of element in a sequence. The sequence has a first
|
| +// element. This type should be used instead of integer because 2
|
| +// contradicting traditions can call a first element '0' or '1' which makes
|
| +// integer type ambiguous.
|
| class OrdinalNumber final {
|
| DISALLOW_NEW();
|
|
|
| @@ -65,7 +67,8 @@ class OrdinalNumber final {
|
| int m_zeroBasedValue;
|
| };
|
|
|
| -// TextPosition structure specifies coordinates within an text resource. It is used mostly
|
| +// TextPosition structure specifies coordinates within an text resource. It is
|
| +// used mostly
|
| // for saving script source position.
|
| class TextPosition final {
|
| DISALLOW_NEW();
|
| @@ -87,13 +90,15 @@ class TextPosition final {
|
| return TextPosition(OrdinalNumber::first(), OrdinalNumber::first());
|
| }
|
|
|
| - // A value with line value less than a minimum; used as an impossible position.
|
| + // A value with line value less than a minimum; used as an impossible
|
| + // position.
|
| static TextPosition belowRangePosition() {
|
| return TextPosition(OrdinalNumber::beforeFirst(),
|
| OrdinalNumber::beforeFirst());
|
| }
|
|
|
| - // A value corresponding to a position with given offset within text having the specified line ending offsets.
|
| + // A value corresponding to a position with given offset within text having
|
| + // the specified line ending offsets.
|
| WTF_EXPORT static TextPosition fromOffsetAndLineEndings(
|
| unsigned,
|
| const Vector<unsigned>&);
|
|
|