Use NeverDestroyed instead of DEPRECATED_DEFINE_STATIC_LOCAL
[WebKit-https.git] / Source / WebCore / platform / graphics / SurrogatePairAwareTextIterator.h
index 1a715c0..85c9694 100644 (file)
@@ -30,7 +30,7 @@ class SurrogatePairAwareTextIterator {
 public:
     // The passed in UChar pointer starts at 'currentCharacter'. The iterator operatoes on the range [currentCharacter, lastCharacter].
     // 'endCharacter' denotes the maximum length of the UChar array, which might exceed 'lastCharacter'.
-    SurrogatePairAwareTextIterator(const UChar*, unsigned currentCharacter, unsigned lastCharacter, unsigned endCharacter);
+    SurrogatePairAwareTextIterator(const UChar*, int currentCharacter, int lastCharacter, int endCharacter);
 
     inline bool consume(UChar32& character, unsigned& clusterLength)
     {
@@ -52,7 +52,7 @@ public:
         m_currentCharacter += advanceLength;
     }
 
-    unsigned currentCharacter() const { return m_currentCharacter; }
+    int currentCharacter() const { return m_currentCharacter; }
     const UChar* characters() const { return m_characters; }
 
 private:
@@ -60,9 +60,9 @@ private:
     UChar32 normalizeVoicingMarks();
 
     const UChar* m_characters;
-    unsigned m_currentCharacter;
-    unsigned m_lastCharacter;
-    unsigned m_endCharacter;
+    int m_currentCharacter;
+    int m_lastCharacter;
+    int m_endCharacter;
 };
 
 }