Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: third_party/WebKit/Source/core/css/FontFace.cpp

Issue 1808853002: Move UnicodeRangeSet to platform/fonts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 return FontDisplayOptional; 548 return FontDisplayOptional;
549 default: 549 default:
550 break; 550 break;
551 } 551 }
552 } 552 }
553 return FontDisplayAuto; 553 return FontDisplayAuto;
554 } 554 }
555 555
556 static PassOwnPtrWillBeRawPtr<CSSFontFace> createCSSFontFace(FontFace* fontFace, CSSValue* unicodeRange) 556 static PassOwnPtrWillBeRawPtr<CSSFontFace> createCSSFontFace(FontFace* fontFace, CSSValue* unicodeRange)
557 { 557 {
558 Vector<CSSFontFace::UnicodeRange> ranges; 558 Vector<UnicodeRange> ranges;
559 if (CSSValueList* rangeList = toCSSValueList(unicodeRange)) { 559 if (CSSValueList* rangeList = toCSSValueList(unicodeRange)) {
560 unsigned numRanges = rangeList->length(); 560 unsigned numRanges = rangeList->length();
561 for (unsigned i = 0; i < numRanges; i++) { 561 for (unsigned i = 0; i < numRanges; i++) {
562 CSSUnicodeRangeValue* range = toCSSUnicodeRangeValue(rangeList->item (i)); 562 CSSUnicodeRangeValue* range = toCSSUnicodeRangeValue(rangeList->item (i));
563 ranges.append(CSSFontFace::UnicodeRange(range->from(), range->to())) ; 563 ranges.append(UnicodeRange(range->from(), range->to()));
564 } 564 }
565 } 565 }
566 566
567 return adoptPtrWillBeNoop(new CSSFontFace(fontFace, ranges)); 567 return adoptPtrWillBeNoop(new CSSFontFace(fontFace, ranges));
568 } 568 }
569 569
570 void FontFace::initCSSFontFace(Document* document, PassRefPtrWillBeRawPtr<CSSVal ue> src) 570 void FontFace::initCSSFontFace(Document* document, PassRefPtrWillBeRawPtr<CSSVal ue> src)
571 { 571 {
572 m_cssFontFace = createCSSFontFace(this, m_unicodeRange.get()); 572 m_cssFontFace = createCSSFontFace(this, m_unicodeRange.get());
573 if (m_error) 573 if (m_error)
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 { 643 {
644 return m_cssFontFace->hadBlankText(); 644 return m_cssFontFace->hadBlankText();
645 } 645 }
646 646
647 bool FontFace::hasPendingActivity() const 647 bool FontFace::hasPendingActivity() const
648 { 648 {
649 return m_status == Loading && getExecutionContext() && !getExecutionContext( )->activeDOMObjectsAreStopped(); 649 return m_status == Loading && getExecutionContext() && !getExecutionContext( )->activeDOMObjectsAreStopped();
650 } 650 }
651 651
652 } // namespace blink 652 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp ('k') | third_party/WebKit/Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698