Revert of Shape unicode-range: font faces in only one iteration

third_party/WebKit/Source/platform/fonts/SegmentedFontData.cpp

 /*
  * Copyright (C) 2008, 2009 Apple 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
@@ skipping 20 matching lines @@
 
 namespace blink {
 
 SegmentedFontData::~SegmentedFontData()
 {
     GlyphPageTreeNode::pruneTreeCustomFontData(this);
 }
 
 const SimpleFontData* SegmentedFontData::fontDataForCharacter(UChar32 c) const
 {
-    Vector<FontDataForRangeSet>::const_iterator end = m_faces.end();
-    for (Vector<FontDataForRangeSet>::const_iterator it = m_faces.begin(); it != end; ++it) {
-        if (it->contains(c))
+    Vector<FontDataRange>::const_iterator end = m_ranges.end();
+    for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
+        if (it->from() <= c && it->to() >= c)
             return it->fontData().get();
     }
-    return m_faces[0].fontData().get();
+    return m_ranges[0].fontData().get();
 }
 
 bool SegmentedFontData::containsCharacter(UChar32 c) const
 {
-    Vector<FontDataForRangeSet>::const_iterator end = m_faces.end();
-    for (Vector<FontDataForRangeSet>::const_iterator it = m_faces.begin(); it != end; ++it) {
-        if (it->contains(c))
+    Vector<FontDataRange>::const_iterator end = m_ranges.end();
+    for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
+        if (c >= it->from() && c <= it->to())
             return true;
     }
     return false;
 }
 
 bool SegmentedFontData::isCustomFont() const
 {
     // All segmented fonts are custom fonts.
     return true;
 }
 
 bool SegmentedFontData::isLoading() const
 {
-    Vector<FontDataForRangeSet>::const_iterator end = m_faces.end();
-    for (Vector<FontDataForRangeSet>::const_iterator it = m_faces.begin(); it != end; ++it) {
+    Vector<FontDataRange>::const_iterator end = m_ranges.end();
+    for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
         if (it->fontData()->isLoading())
             return true;
     }
     return false;
 }
 
 // Returns true if any of the sub fonts are loadingFallback.
 bool SegmentedFontData::isLoadingFallback() const
 {
-    Vector<FontDataForRangeSet>::const_iterator end = m_faces.end();
-    for (Vector<FontDataForRangeSet>::const_iterator it = m_faces.begin(); it != end; ++it) {
+    Vector<FontDataRange>::const_iterator end = m_ranges.end();
+    for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
         if (it->fontData()->isLoadingFallback())
             return true;
     }
     return false;
 }
 
 bool SegmentedFontData::isSegmented() const
 {
     return true;
 }
 
 bool SegmentedFontData::shouldSkipDrawing() const
 {
-    Vector<FontDataForRangeSet>::const_iterator end = m_faces.end();
-    for (Vector<FontDataForRangeSet>::const_iterator it = m_faces.begin(); it != end; ++it) {
+    Vector<FontDataRange>::const_iterator end = m_ranges.end();
+    for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
         if (it->fontData()->shouldSkipDrawing())
             return true;
     }
     return false;
 }
 
 } // namespace blink