| 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 #include "platform/FontFamilyNames.h" | 61 #include "platform/FontFamilyNames.h" |
| 62 #include "platform/Histogram.h" | 62 #include "platform/Histogram.h" |
| 63 #include "platform/SharedBuffer.h" | 63 #include "platform/SharedBuffer.h" |
| 64 #include "platform/WebTaskRunner.h" | 64 #include "platform/WebTaskRunner.h" |
| 65 | 65 |
| 66 namespace blink { | 66 namespace blink { |
| 67 | 67 |
| 68 static const CSSValue* parseCSSValue(const Document* document, | 68 static const CSSValue* parseCSSValue(const Document* document, |
| 69 const String& value, | 69 const String& value, |
| 70 CSSPropertyID propertyID) { | 70 CSSPropertyID propertyID) { |
| 71 CSSParserContext context(*document, UseCounter::getFrom(document)); | 71 CSSParserContext* context = |
| 72 CSSParserContext::create(*document, UseCounter::getFrom(document)); |
| 72 return CSSParser::parseFontFaceDescriptor(propertyID, value, context); | 73 return CSSParser::parseFontFaceDescriptor(propertyID, value, context); |
| 73 } | 74 } |
| 74 | 75 |
| 75 FontFace* FontFace::create(ExecutionContext* context, | 76 FontFace* FontFace::create(ExecutionContext* context, |
| 76 const AtomicString& family, | 77 const AtomicString& family, |
| 77 StringOrArrayBufferOrArrayBufferView& source, | 78 StringOrArrayBufferOrArrayBufferView& source, |
| 78 const FontFaceDescriptors& descriptors) { | 79 const FontFaceDescriptors& descriptors) { |
| 79 if (source.isString()) | 80 if (source.isString()) |
| 80 return create(context, family, source.getAsString(), descriptors); | 81 return create(context, family, source.getAsString(), descriptors); |
| 81 if (source.isArrayBuffer()) | 82 if (source.isArrayBuffer()) |
| (...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 | 656 |
| 656 bool FontFace::hadBlankText() const { | 657 bool FontFace::hadBlankText() const { |
| 657 return m_cssFontFace->hadBlankText(); | 658 return m_cssFontFace->hadBlankText(); |
| 658 } | 659 } |
| 659 | 660 |
| 660 bool FontFace::hasPendingActivity() const { | 661 bool FontFace::hasPendingActivity() const { |
| 661 return m_status == Loading && getExecutionContext(); | 662 return m_status == Loading && getExecutionContext(); |
| 662 } | 663 } |
| 663 | 664 |
| 664 } // namespace blink | 665 } // namespace blink |
| OLD | NEW |