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

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

Issue 2848243004: Clean up bindings/core/v8 (Part 2) (Closed)
Patch Set: Rebase Created 3 years, 7 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "core/css/FontFace.h" 31 #include "core/css/FontFace.h"
32 32
33 #include "bindings/core/v8/ExceptionState.h" 33 #include "bindings/core/v8/ExceptionState.h"
34 #include "bindings/core/v8/ScriptState.h"
35 #include "bindings/core/v8/StringOrArrayBufferOrArrayBufferView.h" 34 #include "bindings/core/v8/StringOrArrayBufferOrArrayBufferView.h"
36 #include "core/CSSValueKeywords.h" 35 #include "core/CSSValueKeywords.h"
37 #include "core/css/BinaryDataFontFaceSource.h" 36 #include "core/css/BinaryDataFontFaceSource.h"
38 #include "core/css/CSSFontFace.h" 37 #include "core/css/CSSFontFace.h"
39 #include "core/css/CSSFontFaceSrcValue.h" 38 #include "core/css/CSSFontFaceSrcValue.h"
40 #include "core/css/CSSFontFamilyValue.h" 39 #include "core/css/CSSFontFamilyValue.h"
41 #include "core/css/CSSFontSelector.h" 40 #include "core/css/CSSFontSelector.h"
42 #include "core/css/CSSIdentifierValue.h" 41 #include "core/css/CSSIdentifierValue.h"
43 #include "core/css/CSSUnicodeRangeValue.h" 42 #include "core/css/CSSUnicodeRangeValue.h"
44 #include "core/css/CSSValueList.h" 43 #include "core/css/CSSValueList.h"
(...skipping 12 matching lines...) Expand all
57 #include "core/dom/StyleEngine.h" 56 #include "core/dom/StyleEngine.h"
58 #include "core/dom/TaskRunnerHelper.h" 57 #include "core/dom/TaskRunnerHelper.h"
59 #include "core/frame/LocalFrame.h" 58 #include "core/frame/LocalFrame.h"
60 #include "core/frame/Settings.h" 59 #include "core/frame/Settings.h"
61 #include "core/frame/UseCounter.h" 60 #include "core/frame/UseCounter.h"
62 #include "platform/FontFamilyNames.h" 61 #include "platform/FontFamilyNames.h"
63 #include "platform/Histogram.h" 62 #include "platform/Histogram.h"
64 #include "platform/RuntimeEnabledFeatures.h" 63 #include "platform/RuntimeEnabledFeatures.h"
65 #include "platform/SharedBuffer.h" 64 #include "platform/SharedBuffer.h"
66 #include "platform/WebTaskRunner.h" 65 #include "platform/WebTaskRunner.h"
66 #include "platform/bindings/ScriptState.h"
67 67
68 namespace blink { 68 namespace blink {
69 69
70 static const CSSValue* ParseCSSValue(const Document* document, 70 static const CSSValue* ParseCSSValue(const Document* document,
71 const String& value, 71 const String& value,
72 CSSPropertyID property_id) { 72 CSSPropertyID property_id) {
73 CSSParserContext* context = CSSParserContext::Create(*document); 73 CSSParserContext* context = CSSParserContext::Create(*document);
74 return CSSParser::ParseFontFaceDescriptor(property_id, value, context); 74 return CSSParser::ParseFontFaceDescriptor(property_id, value, context);
75 } 75 }
76 76
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 675
676 bool FontFace::HadBlankText() const { 676 bool FontFace::HadBlankText() const {
677 return css_font_face_->HadBlankText(); 677 return css_font_face_->HadBlankText();
678 } 678 }
679 679
680 bool FontFace::HasPendingActivity() const { 680 bool FontFace::HasPendingActivity() const {
681 return status_ == kLoading && GetExecutionContext(); 681 return status_ == kLoading && GetExecutionContext();
682 } 682 }
683 683
684 } // namespace blink 684 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.h ('k') | third_party/WebKit/Source/core/css/FontFaceSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698