| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 575 | 575 |
| 576 for (int i = 0; i < srcLength; i++) { | 576 for (int i = 0; i < srcLength; i++) { |
| 577 // An item in the list either specifies a string (local font name) or a URL | 577 // An item in the list either specifies a string (local font name) or a URL |
| 578 // (remote font to download). | 578 // (remote font to download). |
| 579 const CSSFontFaceSrcValue& item = toCSSFontFaceSrcValue(srcList->item(i)); | 579 const CSSFontFaceSrcValue& item = toCSSFontFaceSrcValue(srcList->item(i)); |
| 580 CSSFontFaceSource* source = nullptr; | 580 CSSFontFaceSource* source = nullptr; |
| 581 | 581 |
| 582 if (!item.isLocal()) { | 582 if (!item.isLocal()) { |
| 583 const Settings* settings = document ? document->settings() : nullptr; | 583 const Settings* settings = document ? document->settings() : nullptr; |
| 584 bool allowDownloading = | 584 bool allowDownloading = |
| 585 settings && settings->downloadableBinaryFontsEnabled(); | 585 settings && settings->getDownloadableBinaryFontsEnabled(); |
| 586 if (allowDownloading && item.isSupportedFormat() && document) { | 586 if (allowDownloading && item.isSupportedFormat() && document) { |
| 587 FontResource* fetched = item.fetch(document); | 587 FontResource* fetched = item.fetch(document); |
| 588 if (fetched) { | 588 if (fetched) { |
| 589 CSSFontSelector* fontSelector = | 589 CSSFontSelector* fontSelector = |
| 590 document->styleEngine().fontSelector(); | 590 document->styleEngine().fontSelector(); |
| 591 source = new RemoteFontFaceSource( | 591 source = new RemoteFontFaceSource( |
| 592 fetched, fontSelector, CSSValueToFontDisplay(m_display.get())); | 592 fetched, fontSelector, CSSValueToFontDisplay(m_display.get())); |
| 593 } | 593 } |
| 594 } | 594 } |
| 595 } else { | 595 } else { |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 640 | 640 |
| 641 bool FontFace::hadBlankText() const { | 641 bool FontFace::hadBlankText() const { |
| 642 return m_cssFontFace->hadBlankText(); | 642 return m_cssFontFace->hadBlankText(); |
| 643 } | 643 } |
| 644 | 644 |
| 645 bool FontFace::hasPendingActivity() const { | 645 bool FontFace::hasPendingActivity() const { |
| 646 return m_status == Loading && getExecutionContext(); | 646 return m_status == Loading && getExecutionContext(); |
| 647 } | 647 } |
| 648 | 648 |
| 649 } // namespace blink | 649 } // namespace blink |
| OLD | NEW |