Move UnicodeRangeSet to platform/fonts

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

 /*
  * Copyright (C) 2007, 2008 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 13 matching lines @@
  */
 
 #ifndef CSSFontFace_h
 #define CSSFontFace_h
 
 #include "core/CoreExport.h"
 #include "core/css/CSSFontFaceSource.h"
 #include "core/css/CSSSegmentedFontFace.h"
 #include "core/css/FontFace.h"
 #include "platform/fonts/SegmentedFontData.h"
+#include "platform/fonts/UnicodeRangeSet.h"
 #include "wtf/Deque.h"
 #include "wtf/Forward.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class FontDescription;
 class RemoteFontFaceSource;
 class SimpleFontData;
 
 class CORE_EXPORT CSSFontFace final : public NoBaseWillBeGarbageCollectedFinalized<CSSFontFace> {
     USING_FAST_MALLOC_WILL_BE_REMOVED(CSSFontFace);
     WTF_MAKE_NONCOPYABLE(CSSFontFace);
 public:
-    struct UnicodeRange;
-    class UnicodeRangeSet;
-
     CSSFontFace(FontFace* fontFace, Vector<UnicodeRange>& ranges)
         : m_ranges(ranges)
         , m_segmentedFontFace(nullptr)
         , m_fontFace(fontFace)
     {
         ASSERT(m_fontFace);
     }
 
     FontFace* fontFace() const { return m_fontFace; }
 
     UnicodeRangeSet& ranges() { return m_ranges; }
 
     void setSegmentedFontFace(CSSSegmentedFontFace*);
     void clearSegmentedFontFace() { m_segmentedFontFace = nullptr; }
 
     bool isValid() const { return !m_sources.isEmpty(); }
 
     void addSource(PassOwnPtrWillBeRawPtr<CSSFontFaceSource>);
 
     void didBeginLoad();
     void fontLoaded(RemoteFontFaceSource*);
     void didBecomeVisibleFallback(RemoteFontFaceSource*);
 
     PassRefPtr<SimpleFontData> getFontData(const FontDescription&);
 
-    struct UnicodeRange {
-        DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
-        UnicodeRange(UChar32 from, UChar32 to)
-            : m_from(from)
-            , m_to(to)
-        {
-        }
-
-        UChar32 from() const { return m_from; }
-        UChar32 to() const { return m_to; }
-        bool contains(UChar32 c) const { return m_from <= c && c <= m_to; }
-        bool operator<(const UnicodeRange& other) const { return m_from < other.m_from; }
-        bool operator<(UChar32 c) const { return m_to < c; }
-        bool operator==(const FontDataRange& fontDataRange) const { return fontDataRange.from() == m_from && fontDataRange.to() == m_to; };
-
-    private:
-        UChar32 m_from;
-        UChar32 m_to;
-    };
-
-    class CORE_EXPORT UnicodeRangeSet {
-        DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
-    public:
-        explicit UnicodeRangeSet(const Vector<UnicodeRange>&);
-        bool contains(UChar32) const;
-        bool contains(const FontDataRange&) const;
-        bool intersectsWith(const String&) const;
-        bool isEntireRange() const { return m_ranges.isEmpty(); }
-        size_t size() const { return m_ranges.size(); }
-        const UnicodeRange& rangeAt(size_t i) const { return m_ranges[i]; }
-    private:
-        Vector<UnicodeRange> m_ranges; // If empty, represents the whole code space.
-    };
-
     FontFace::LoadStatusType loadStatus() const { return m_fontFace->loadStatus(); }
     bool maybeScheduleFontLoad(const FontDescription&, UChar32);
     bool maybeScheduleFontLoad(const FontDescription&, const FontDataRange&);
     void load();
     void load(const FontDescription&);
 
     bool hadBlankText() { return isValid() && m_sources.first()->hadBlankText(); }
 
     DECLARE_TRACE();
 
 private:
     void setLoadStatus(FontFace::LoadStatusType);
 
     UnicodeRangeSet m_ranges;
     RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace;
     WillBeHeapDeque<OwnPtrWillBeMember<CSSFontFaceSource>> m_sources;
     RawPtrWillBeMember<FontFace> m_fontFace;
 };
 
 } // namespace blink
 
 #endif