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.h

Issue 1363233002: Restrict font-family in @font-face to <family-name> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 28 matching lines...) Expand all
39 #include "core/dom/ActiveDOMObject.h" 39 #include "core/dom/ActiveDOMObject.h"
40 #include "core/dom/DOMException.h" 40 #include "core/dom/DOMException.h"
41 #include "platform/fonts/FontTraits.h" 41 #include "platform/fonts/FontTraits.h"
42 #include "wtf/PassRefPtr.h" 42 #include "wtf/PassRefPtr.h"
43 #include "wtf/RefCounted.h" 43 #include "wtf/RefCounted.h"
44 #include "wtf/text/WTFString.h" 44 #include "wtf/text/WTFString.h"
45 45
46 namespace blink { 46 namespace blink {
47 47
48 class CSSFontFace; 48 class CSSFontFace;
49 class CSSValueList; 49 class CSSPrimitiveValue;
50 class DOMArrayBuffer; 50 class DOMArrayBuffer;
51 class DOMArrayBufferView; 51 class DOMArrayBufferView;
52 class Document; 52 class Document;
53 class ExceptionState; 53 class ExceptionState;
54 class FontFaceDescriptors; 54 class FontFaceDescriptors;
55 class StringOrArrayBufferOrArrayBufferView; 55 class StringOrArrayBufferOrArrayBufferView;
56 class StylePropertySet; 56 class StylePropertySet;
57 class StyleRuleFontFace; 57 class StyleRuleFontFace;
58 58
59 class FontFace : public RefCountedWillBeGarbageCollectedFinalized<FontFace>, pub lic ScriptWrappable, public ActiveDOMObject { 59 class FontFace : public RefCountedWillBeGarbageCollectedFinalized<FontFace>, pub lic ScriptWrappable, public ActiveDOMObject {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const Atom icString& family, const String& source, const FontFaceDescriptors&); 118 static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const Atom icString& family, const String& source, const FontFaceDescriptors&);
119 119
120 explicit FontFace(ExecutionContext*); 120 explicit FontFace(ExecutionContext*);
121 FontFace(ExecutionContext*, const AtomicString& family, const FontFaceDescri ptors&); 121 FontFace(ExecutionContext*, const AtomicString& family, const FontFaceDescri ptors&);
122 122
123 void initCSSFontFace(Document*, PassRefPtrWillBeRawPtr<CSSValue> src); 123 void initCSSFontFace(Document*, PassRefPtrWillBeRawPtr<CSSValue> src);
124 void initCSSFontFace(const unsigned char* data, unsigned size); 124 void initCSSFontFace(const unsigned char* data, unsigned size);
125 void setPropertyFromString(const Document*, const String&, CSSPropertyID, Ex ceptionState* = 0); 125 void setPropertyFromString(const Document*, const String&, CSSPropertyID, Ex ceptionState* = 0);
126 bool setPropertyFromStyle(const StylePropertySet&, CSSPropertyID); 126 bool setPropertyFromStyle(const StylePropertySet&, CSSPropertyID);
127 bool setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue>, CSSPropertyID); 127 bool setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue>, CSSPropertyID);
128 bool setFamilyValue(CSSValueList*); 128 bool setFamilyValue(CSSPrimitiveValue*);
129 void loadInternal(ExecutionContext*); 129 void loadInternal(ExecutionContext*);
130 ScriptPromise fontStatusPromise(ScriptState*); 130 ScriptPromise fontStatusPromise(ScriptState*);
131 131
132 using LoadedProperty = ScriptPromiseProperty<RawPtrWillBeMember<FontFace>, R awPtrWillBeMember<FontFace>, Member<DOMException>>; 132 using LoadedProperty = ScriptPromiseProperty<RawPtrWillBeMember<FontFace>, R awPtrWillBeMember<FontFace>, Member<DOMException>>;
133 133
134 AtomicString m_family; 134 AtomicString m_family;
135 String m_otsParseMessage; 135 String m_otsParseMessage;
136 RefPtrWillBeMember<CSSValue> m_src; 136 RefPtrWillBeMember<CSSValue> m_src;
137 RefPtrWillBeMember<CSSValue> m_style; 137 RefPtrWillBeMember<CSSValue> m_style;
138 RefPtrWillBeMember<CSSValue> m_weight; 138 RefPtrWillBeMember<CSSValue> m_weight;
139 RefPtrWillBeMember<CSSValue> m_stretch; 139 RefPtrWillBeMember<CSSValue> m_stretch;
140 RefPtrWillBeMember<CSSValue> m_unicodeRange; 140 RefPtrWillBeMember<CSSValue> m_unicodeRange;
141 RefPtrWillBeMember<CSSValue> m_variant; 141 RefPtrWillBeMember<CSSValue> m_variant;
142 RefPtrWillBeMember<CSSValue> m_featureSettings; 142 RefPtrWillBeMember<CSSValue> m_featureSettings;
143 LoadStatus m_status; 143 LoadStatus m_status;
144 PersistentWillBeMember<DOMException> m_error; 144 PersistentWillBeMember<DOMException> m_error;
145 145
146 PersistentWillBeMember<LoadedProperty> m_loadedProperty; 146 PersistentWillBeMember<LoadedProperty> m_loadedProperty;
147 OwnPtrWillBeMember<CSSFontFace> m_cssFontFace; 147 OwnPtrWillBeMember<CSSFontFace> m_cssFontFace;
148 WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback>> m_callbacks; 148 WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback>> m_callbacks;
149 }; 149 };
150 150
151 using FontFaceArray = WillBeHeapVector<RefPtrWillBeMember<FontFace>>; 151 using FontFaceArray = WillBeHeapVector<RefPtrWillBeMember<FontFace>>;
152 152
153 } // namespace blink 153 } // namespace blink
154 154
155 #endif // FontFace_h 155 #endif // FontFace_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698