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

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

Issue 1461193003: Revert of [Oilpan] Prepare full definition of classes before using Member (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make patch applicable Created 5 years 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 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
536 static PassOwnPtrWillBeRawPtr<CSSFontFace> createCSSFontFace(FontFace* fontFace, CSSValue* unicodeRange) 531 static PassOwnPtrWillBeRawPtr<CSSFontFace> createCSSFontFace(FontFace* fontFace, CSSValue* unicodeRange)
537 { 532 {
538 Vector<CSSFontFace::UnicodeRange> ranges; 533 Vector<CSSFontFace::UnicodeRange> ranges;
539 if (CSSValueList* rangeList = toCSSValueList(unicodeRange)) { 534 if (CSSValueList* rangeList = toCSSValueList(unicodeRange)) {
540 unsigned numRanges = rangeList->length(); 535 unsigned numRanges = rangeList->length();
541 for (unsigned i = 0; i < numRanges; i++) { 536 for (unsigned i = 0; i < numRanges; i++) {
542 CSSUnicodeRangeValue* range = toCSSUnicodeRangeValue(rangeList->item (i)); 537 CSSUnicodeRangeValue* range = toCSSUnicodeRangeValue(rangeList->item (i));
543 ranges.append(CSSFontFace::UnicodeRange(range->from(), range->to())) ; 538 ranges.append(CSSFontFace::UnicodeRange(range->from(), range->to())) ;
544 } 539 }
545 } 540 }
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 { 612 {
618 return m_cssFontFace->hadBlankText(); 613 return m_cssFontFace->hadBlankText();
619 } 614 }
620 615
621 bool FontFace::hasPendingActivity() const 616 bool FontFace::hasPendingActivity() const
622 { 617 {
623 return m_status == Loading && executionContext() && !executionContext()->act iveDOMObjectsAreStopped(); 618 return m_status == Loading && executionContext() && !executionContext()->act iveDOMObjectsAreStopped();
624 } 619 }
625 620
626 } // namespace blink 621 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.h ('k') | third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698