| Index: third_party/WebKit/Source/core/css/CSSFontFace.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/CSSFontFace.cpp b/third_party/WebKit/Source/core/css/CSSFontFace.cpp
|
| index a2a9e9f814260e731c8f62b334227562dd5ec721..6faf1fd1a74b1f341785338b47552f416c3af8e8 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSFontFace.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSFontFace.cpp
|
| @@ -110,7 +110,7 @@ PassRefPtr<SimpleFontData> CSSFontFace::getFontData(const FontDescription& fontD
|
|
|
| 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;
|
| @@ -118,9 +118,9 @@ bool CSSFontFace::maybeScheduleFontLoad(const FontDescription& fontDescription,
|
| 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);
|
| }
|
|
|