| 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 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 521 break; | 521 break; |
| 522 default: | 522 default: |
| 523 break; | 523 break; |
| 524 } | 524 } |
| 525 } | 525 } |
| 526 } | 526 } |
| 527 | 527 |
| 528 return FontTraits(style, variant, weight, stretch); | 528 return FontTraits(style, variant, weight, stretch); |
| 529 } | 529 } |
| 530 | 530 |
| 531 CSSFontFace* FontFace::cssFontFace() const |
| 532 { |
| 533 return m_cssFontFace.get(); |
| 534 } |
| 535 |
| 531 static PassOwnPtrWillBeRawPtr<CSSFontFace> createCSSFontFace(FontFace* fontFace,
CSSValue* unicodeRange) | 536 static PassOwnPtrWillBeRawPtr<CSSFontFace> createCSSFontFace(FontFace* fontFace,
CSSValue* unicodeRange) |
| 532 { | 537 { |
| 533 Vector<CSSFontFace::UnicodeRange> ranges; | 538 Vector<CSSFontFace::UnicodeRange> ranges; |
| 534 if (CSSValueList* rangeList = toCSSValueList(unicodeRange)) { | 539 if (CSSValueList* rangeList = toCSSValueList(unicodeRange)) { |
| 535 unsigned numRanges = rangeList->length(); | 540 unsigned numRanges = rangeList->length(); |
| 536 for (unsigned i = 0; i < numRanges; i++) { | 541 for (unsigned i = 0; i < numRanges; i++) { |
| 537 CSSUnicodeRangeValue* range = toCSSUnicodeRangeValue(rangeList->item
(i)); | 542 CSSUnicodeRangeValue* range = toCSSUnicodeRangeValue(rangeList->item
(i)); |
| 538 ranges.append(CSSFontFace::UnicodeRange(range->from(), range->to()))
; | 543 ranges.append(CSSFontFace::UnicodeRange(range->from(), range->to()))
; |
| 539 } | 544 } |
| 540 } | 545 } |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 612 { | 617 { |
| 613 return m_cssFontFace->hadBlankText(); | 618 return m_cssFontFace->hadBlankText(); |
| 614 } | 619 } |
| 615 | 620 |
| 616 bool FontFace::hasPendingActivity() const | 621 bool FontFace::hasPendingActivity() const |
| 617 { | 622 { |
| 618 return m_status == Loading && executionContext() && !executionContext()->act
iveDOMObjectsAreStopped(); | 623 return m_status == Loading && executionContext() && !executionContext()->act
iveDOMObjectsAreStopped(); |
| 619 } | 624 } |
| 620 | 625 |
| 621 } // namespace blink | 626 } // namespace blink |
| OLD | NEW |