Shape unicode-range: font faces in only one iteration

third_party/WebKit/Source/core/css/CSSFontFace.cpp

 /*
  * Copyright (C) 2007, 2008, 2011 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 92 matching lines @@
 
     if (loadStatus() == FontFace::Unloaded)
         setLoadStatus(FontFace::Loading);
     if (loadStatus() == FontFace::Loading)
         setLoadStatus(FontFace::Error);
     return nullptr;
 }
 
 bool CSSFontFace::maybeScheduleFontLoad(const FontDescription& fontDescription, UChar32 character)
 {
-    if (m_ranges.contains(character)) {
+    if (m_ranges->contains(character)) {
         if (loadStatus() == FontFace::Unloaded)
             load(fontDescription);
         return true;
     }
     return false;
 }
 
-bool CSSFontFace::maybeScheduleFontLoad(const FontDescription& fontDescription, const FontDataRange& range)
+bool CSSFontFace::maybeScheduleFontLoad(const FontDescription& fontDescription, const FontDataForRangeSet& rangeSet)
 {
-    if (m_ranges.contains(range) || (range.isEntireRange() && m_ranges.isEntireRange())) {
+    if (m_ranges == rangeSet.ranges()) {
         if (loadStatus() == FontFace::Unloaded) {
             load(fontDescription);
         }
         return true;
     }
     return false;
 }
 
 void CSSFontFace::load()
 {
@@ skipping 62 matching lines @@
 }
 
 DEFINE_TRACE(CSSFontFace)
 {
     visitor->trace(m_segmentedFontFace);
     visitor->trace(m_sources);
     visitor->trace(m_fontFace);
 }
 
 } // namespace blink