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

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

Issue 653983002: Remove #include of ImageBuffer.h from Filter.h. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update to ToT Created 6 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/html/HTMLVideoElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "core/dom/ExceptionCode.h" 52 #include "core/dom/ExceptionCode.h"
53 #include "core/dom/StyleEngine.h" 53 #include "core/dom/StyleEngine.h"
54 #include "core/frame/LocalFrame.h" 54 #include "core/frame/LocalFrame.h"
55 #include "core/frame/Settings.h" 55 #include "core/frame/Settings.h"
56 #include "core/frame/UseCounter.h" 56 #include "core/frame/UseCounter.h"
57 #include "core/svg/SVGFontFaceElement.h" 57 #include "core/svg/SVGFontFaceElement.h"
58 #include "core/svg/SVGFontFaceSource.h" 58 #include "core/svg/SVGFontFaceSource.h"
59 #include "core/svg/SVGRemoteFontFaceSource.h" 59 #include "core/svg/SVGRemoteFontFaceSource.h"
60 #include "platform/FontFamilyNames.h" 60 #include "platform/FontFamilyNames.h"
61 #include "platform/SharedBuffer.h" 61 #include "platform/SharedBuffer.h"
62 #include "wtf/ArrayBufferView.h"
62 63
63 namespace blink { 64 namespace blink {
64 65
65 static PassRefPtrWillBeRawPtr<CSSValue> parseCSSValue(const Document* document, const String& s, CSSPropertyID propertyID) 66 static PassRefPtrWillBeRawPtr<CSSValue> parseCSSValue(const Document* document, const String& s, CSSPropertyID propertyID)
66 { 67 {
67 CSSParserContext context(*document, UseCounter::getFrom(document)); 68 CSSParserContext context(*document, UseCounter::getFrom(document));
68 return CSSParser::parseSingleValue(propertyID, s, context); 69 return CSSParser::parseSingleValue(propertyID, s, context);
69 } 70 }
70 71
71 PassRefPtrWillBeRawPtr<FontFace> FontFace::create(ExecutionContext* context, con st AtomicString& family, const String& source, const FontFaceDescriptors& descri ptors) 72 PassRefPtrWillBeRawPtr<FontFace> FontFace::create(ExecutionContext* context, con st AtomicString& family, const String& source, const FontFaceDescriptors& descri ptors)
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 { 593 {
593 return m_cssFontFace->hadBlankText(); 594 return m_cssFontFace->hadBlankText();
594 } 595 }
595 596
596 bool FontFace::hasPendingActivity() const 597 bool FontFace::hasPendingActivity() const
597 { 598 {
598 return m_status == Loading && executionContext() && !executionContext()->act iveDOMObjectsAreStopped(); 599 return m_status == Loading && executionContext() && !executionContext()->act iveDOMObjectsAreStopped();
599 } 600 }
600 601
601 } // namespace blink 602 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLVideoElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698