- Revision
- 209618
- Author
- gga...@apple.com
- Date
- 2016-12-09 11:22:44 -0800 (Fri, 09 Dec 2016)
Log Message
Moved OrdinalNumber into its own file
https://bugs.webkit.org/show_bug.cgi?id=165663
Reviewed by Saam Barati.
* WTF.xcodeproj/project.pbxproj:
* wtf/text/OrdinalNumber.h: Copied from Source/WTF/wtf/text/TextPosition.h.
(WTF::TextPosition::TextPosition): Deleted.
(WTF::TextPosition::operator==): Deleted.
(WTF::TextPosition::operator!=): Deleted.
(WTF::TextPosition::minimumPosition): Deleted.
(WTF::TextPosition::belowRangePosition): Deleted.
* wtf/text/TextPosition.h:
(WTF::OrdinalNumber::fromZeroBasedInt): Deleted.
(WTF::OrdinalNumber::fromOneBasedInt): Deleted.
(WTF::OrdinalNumber::OrdinalNumber): Deleted.
(WTF::OrdinalNumber::zeroBasedInt): Deleted.
(WTF::OrdinalNumber::oneBasedInt): Deleted.
(WTF::OrdinalNumber::operator==): Deleted.
(WTF::OrdinalNumber::operator!=): Deleted.
(WTF::OrdinalNumber::first): Deleted.
(WTF::OrdinalNumber::beforeFirst): Deleted.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (209617 => 209618)
--- trunk/Source/WTF/ChangeLog 2016-12-09 18:50:34 UTC (rev 209617)
+++ trunk/Source/WTF/ChangeLog 2016-12-09 19:22:44 UTC (rev 209618)
@@ -1,3 +1,28 @@
+2016-12-09 Geoffrey Garen <gga...@apple.com>
+
+ Moved OrdinalNumber into its own file
+ https://bugs.webkit.org/show_bug.cgi?id=165663
+
+ Reviewed by Saam Barati.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/text/OrdinalNumber.h: Copied from Source/WTF/wtf/text/TextPosition.h.
+ (WTF::TextPosition::TextPosition): Deleted.
+ (WTF::TextPosition::operator==): Deleted.
+ (WTF::TextPosition::operator!=): Deleted.
+ (WTF::TextPosition::minimumPosition): Deleted.
+ (WTF::TextPosition::belowRangePosition): Deleted.
+ * wtf/text/TextPosition.h:
+ (WTF::OrdinalNumber::fromZeroBasedInt): Deleted.
+ (WTF::OrdinalNumber::fromOneBasedInt): Deleted.
+ (WTF::OrdinalNumber::OrdinalNumber): Deleted.
+ (WTF::OrdinalNumber::zeroBasedInt): Deleted.
+ (WTF::OrdinalNumber::oneBasedInt): Deleted.
+ (WTF::OrdinalNumber::operator==): Deleted.
+ (WTF::OrdinalNumber::operator!=): Deleted.
+ (WTF::OrdinalNumber::first): Deleted.
+ (WTF::OrdinalNumber::beforeFirst): Deleted.
+
2016-12-08 David Kilzer <ddkil...@apple.com>
Always check the return value of pthread_key_create()
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (209617 => 209618)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-12-09 18:50:34 UTC (rev 209617)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-12-09 19:22:44 UTC (rev 209618)
@@ -90,6 +90,7 @@
1469419C16EAB10A0024E146 /* AutodrainedPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1469419A16EAB10A0024E146 /* AutodrainedPool.h */; };
1469419D16EAB10A0024E146 /* AutodrainedPoolMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1469419B16EAB10A0024E146 /* AutodrainedPoolMac.mm */; };
149EF16316BBFE0D000A4331 /* TriState.h in Headers */ = {isa = PBXBuildFile; fileRef = 149EF16216BBFE0D000A4331 /* TriState.h */; settings = {ATTRIBUTES = (); }; };
+ 14E785E81DFB330100209BD1 /* OrdinalNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 14E785E71DFB330100209BD1 /* OrdinalNumber.h */; settings = {ATTRIBUTES = (Private, ); }; };
14F3B0F715E45E4600210069 /* SaturatedArithmetic.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F3B0F615E45E4600210069 /* SaturatedArithmetic.h */; settings = {ATTRIBUTES = (); }; };
1A1D8B9C173186CE00141DA4 /* FunctionDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1D8B9B173186CE00141DA4 /* FunctionDispatcher.h */; };
1A1D8B9E1731879800141DA4 /* FunctionDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1D8B9D1731879800141DA4 /* FunctionDispatcher.cpp */; };
@@ -448,6 +449,7 @@
1469419B16EAB10A0024E146 /* AutodrainedPoolMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AutodrainedPoolMac.mm; sourceTree = "<group>"; };
149EF16216BBFE0D000A4331 /* TriState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriState.h; sourceTree = "<group>"; };
14C8279718FDD73400E1800C /* mbmalloc.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = mbmalloc.xcconfig; sourceTree = "<group>"; };
+ 14E785E71DFB330100209BD1 /* OrdinalNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrdinalNumber.h; sourceTree = "<group>"; };
14F3B0F615E45E4600210069 /* SaturatedArithmetic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SaturatedArithmetic.h; sourceTree = "<group>"; };
1A1D8B9B173186CE00141DA4 /* FunctionDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FunctionDispatcher.h; sourceTree = "<group>"; };
1A1D8B9D1731879800141DA4 /* FunctionDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FunctionDispatcher.cpp; sourceTree = "<group>"; };
@@ -1170,6 +1172,7 @@
26147B0815DDCCDC00DDB907 /* IntegerToStringConversion.h */,
93AC91A718942FC400244939 /* LChar.h */,
1C181C811D30797C00F5FA16 /* LineBreakIteratorPoolICU.h */,
+ 14E785E71DFB330100209BD1 /* OrdinalNumber.h */,
A8A47323151A825B004123FF /* StringBuffer.h */,
A8A47324151A825B004123FF /* StringBuilder.cpp */,
A8A47325151A825B004123FF /* StringBuilder.h */,
@@ -1446,6 +1449,7 @@
14F3B0F715E45E4600210069 /* SaturatedArithmetic.h in Headers */,
1469419616EAAFF80024E146 /* SchedulePair.h in Headers */,
1A3524AB1D63A2FF0031729B /* Scope.h in Headers */,
+ 14E785E81DFB330100209BD1 /* OrdinalNumber.h in Headers */,
0F66B28D1DC97BAB004A1D3F /* MonotonicTime.h in Headers */,
0FEC84B11BDACD390080FF74 /* ScopedLambda.h in Headers */,
A5098B021C16A4F900087797 /* SecuritySPI.h in Headers */,
Copied: trunk/Source/WTF/wtf/text/OrdinalNumber.h (from rev 209500, trunk/Source/WTF/wtf/text/TextPosition.h) (0 => 209618)
--- trunk/Source/WTF/wtf/text/OrdinalNumber.h (rev 0)
+++ trunk/Source/WTF/wtf/text/OrdinalNumber.h 2016-12-09 19:22:44 UTC (rev 209618)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2010, Google Inc. All rights reserved.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#pragma once
+
+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.
+class OrdinalNumber {
+public:
+ static OrdinalNumber fromZeroBasedInt(int zeroBasedInt) { return OrdinalNumber(zeroBasedInt); }
+ static OrdinalNumber fromOneBasedInt(int oneBasedInt) { return OrdinalNumber(oneBasedInt - 1); }
+ OrdinalNumber() : m_zeroBasedValue(0) { }
+
+ int zeroBasedInt() const { return m_zeroBasedValue; }
+ int oneBasedInt() const { return m_zeroBasedValue + 1; }
+
+ bool operator==(OrdinalNumber other) { return m_zeroBasedValue == other.m_zeroBasedValue; }
+ bool operator!=(OrdinalNumber other) { return !((*this) == other); }
+
+ static OrdinalNumber first() { return OrdinalNumber(0); }
+ static OrdinalNumber beforeFirst() { return OrdinalNumber(-1); }
+
+private:
+ OrdinalNumber(int zeroBasedInt) : m_zeroBasedValue(zeroBasedInt) { }
+ int m_zeroBasedValue;
+};
+
+}
+
+using WTF::OrdinalNumber;
Modified: trunk/Source/WTF/wtf/text/TextPosition.h (209617 => 209618)
--- trunk/Source/WTF/wtf/text/TextPosition.h 2016-12-09 18:50:34 UTC (rev 209617)
+++ trunk/Source/WTF/wtf/text/TextPosition.h 2016-12-09 19:22:44 UTC (rev 209618)
@@ -22,37 +22,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef TextPosition_h
-#define TextPosition_h
+#pragma once
-#include <wtf/Assertions.h>
+#include "OrdinalNumber.h"
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.
-class OrdinalNumber {
-public:
- static OrdinalNumber fromZeroBasedInt(int zeroBasedInt) { return OrdinalNumber(zeroBasedInt); }
- static OrdinalNumber fromOneBasedInt(int oneBasedInt) { return OrdinalNumber(oneBasedInt - 1); }
- OrdinalNumber() : m_zeroBasedValue(0) { }
-
- int zeroBasedInt() const { return m_zeroBasedValue; }
- int oneBasedInt() const { return m_zeroBasedValue + 1; }
-
- bool operator==(OrdinalNumber other) { return m_zeroBasedValue == other.m_zeroBasedValue; }
- bool operator!=(OrdinalNumber other) { return !((*this) == other); }
-
- static OrdinalNumber first() { return OrdinalNumber(0); }
- static OrdinalNumber beforeFirst() { return OrdinalNumber(-1); }
-
-private:
- OrdinalNumber(int zeroBasedInt) : m_zeroBasedValue(zeroBasedInt) { }
- int m_zeroBasedValue;
-};
-
-
// TextPosition structure specifies coordinates within an text resource. It is used mostly
// for saving script source position.
class TextPosition {
@@ -78,8 +53,4 @@
}
-using WTF::OrdinalNumber;
-
using WTF::TextPosition;
-
-#endif // TextPosition_h
