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

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

Issue 1571233003: Fix errors caused by unsafe conversions to/from size_t (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: improved ALLOW_NUMERIC_ARG_TYPES_PROMOTABLE_TO Created 4 years, 11 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 private: 115 private:
116 static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const Atom icString& family, PassRefPtr<DOMArrayBuffer> source, const FontFaceDescriptors&) ; 116 static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const Atom icString& family, PassRefPtr<DOMArrayBuffer> source, const FontFaceDescriptors&) ;
117 static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const Atom icString& family, PassRefPtr<DOMArrayBufferView>, const FontFaceDescriptors&); 117 static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const Atom icString& family, PassRefPtr<DOMArrayBufferView>, const FontFaceDescriptors&);
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, size_t);
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(const CSSValue&); 128 bool setFamilyValue(const CSSValue&);
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;
(...skipping 11 matching lines...) Expand all
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
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/ScriptStreamer.cpp ('k') | third_party/WebKit/Source/core/css/FontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698