| 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 6faf1fd1a74b1f341785338b47552f416c3af8e8..402d8dd2f47c63a006e214409d3935d7004a9a56 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSFontFace.cpp
|
| +++ b/third_party/WebKit/Source/core/css/CSSFontFace.cpp
|
| @@ -37,7 +37,7 @@
|
|
|
| namespace blink {
|
|
|
| -void CSSFontFace::addSource(PassOwnPtrWillBeRawPtr<CSSFontFaceSource> source)
|
| +void CSSFontFace::addSource(RawPtr<CSSFontFaceSource> source)
|
| {
|
| source->setFontFace(this);
|
| m_sources.append(source);
|
| @@ -90,7 +90,7 @@ PassRefPtr<SimpleFontData> CSSFontFace::getFontData(const FontDescription& fontD
|
| return nullptr;
|
|
|
| while (!m_sources.isEmpty()) {
|
| - OwnPtrWillBeMember<CSSFontFaceSource>& source = m_sources.first();
|
| + Member<CSSFontFaceSource>& source = m_sources.first();
|
| if (RefPtr<SimpleFontData> result = source->getFontData(fontDescription)) {
|
| if (loadStatus() == FontFace::Unloaded && (source->isLoading() || source->isLoaded()))
|
| setLoadStatus(FontFace::Loading);
|
| @@ -146,7 +146,7 @@ void CSSFontFace::load(const FontDescription& fontDescription)
|
| ASSERT(loadStatus() == FontFace::Loading);
|
|
|
| while (!m_sources.isEmpty()) {
|
| - OwnPtrWillBeMember<CSSFontFaceSource>& source = m_sources.first();
|
| + Member<CSSFontFaceSource>& source = m_sources.first();
|
| if (source->isValid()) {
|
| if (source->isLocal()) {
|
| if (source->isLocalFontAvailable(fontDescription)) {
|
|
|