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

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

Issue 1226293002: Fix virtual/override/final usage in Source/core/{animation,css,style}/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | « Source/core/css/CSSViewportRule.h ('k') | Source/core/css/FontFaceSet.h » ('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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 class LoadFontCallback : public RefCountedWillBeGarbageCollectedFinalized<Lo adFontCallback> { 103 class LoadFontCallback : public RefCountedWillBeGarbageCollectedFinalized<Lo adFontCallback> {
104 public: 104 public:
105 virtual ~LoadFontCallback() { } 105 virtual ~LoadFontCallback() { }
106 virtual void notifyLoaded(FontFace*) = 0; 106 virtual void notifyLoaded(FontFace*) = 0;
107 virtual void notifyError(FontFace*) = 0; 107 virtual void notifyError(FontFace*) = 0;
108 DEFINE_INLINE_VIRTUAL_TRACE() { } 108 DEFINE_INLINE_VIRTUAL_TRACE() { }
109 }; 109 };
110 void loadWithCallback(PassRefPtrWillBeRawPtr<LoadFontCallback>, ExecutionCon text*); 110 void loadWithCallback(PassRefPtrWillBeRawPtr<LoadFontCallback>, ExecutionCon text*);
111 111
112 // ActiveDOMObject 112 // ActiveDOMObject
113 virtual bool hasPendingActivity() const override; 113 bool hasPendingActivity() const override;
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);
(...skipping 22 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 typedef WillBeHeapVector<RefPtrWillBeMember<FontFace>> FontFaceArray; 151 typedef WillBeHeapVector<RefPtrWillBeMember<FontFace>> FontFaceArray;
152 152
153 } // namespace blink 153 } // namespace blink
154 154
155 #endif // FontFace_h 155 #endif // FontFace_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSViewportRule.h ('k') | Source/core/css/FontFaceSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698