Source/core/css/FontFace.h - Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard]

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

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebased the patch 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

« no previous file with comments | « Source/core/css/ElementRuleCollector.h ('k') | Source/core/css/FontFaceCache.h » ('j') | no next file with comments »

OLD	NEW
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 91 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102 class LoadFontCallback : public RefCountedWillBeGarbageCollectedFinalized<Lo adFontCallback> {	102 class LoadFontCallback : public RefCountedWillBeGarbageCollectedFinalized<Lo adFontCallback> {

103 public:	103 public:

104 virtual ~LoadFontCallback() { }	104 virtual ~LoadFontCallback() { }

105 virtual void notifyLoaded(FontFace*) = 0;	105 virtual void notifyLoaded(FontFace*) = 0;

106 virtual void notifyError(FontFace*) = 0;	106 virtual void notifyError(FontFace*) = 0;

107 virtual void trace(Visitor*) { }	107 virtual void trace(Visitor*) { }

108 };	108 };

109 void loadWithCallback(PassRefPtrWillBeRawPtr<LoadFontCallback>, ExecutionCon text*);	109 void loadWithCallback(PassRefPtrWillBeRawPtr<LoadFontCallback>, ExecutionCon text*);

110	110

111 // ActiveDOMObject	111 // ActiveDOMObject

112 virtual bool hasPendingActivity() const OVERRIDE;	112 virtual bool hasPendingActivity() const override;

113	113

114 private:	114 private:

115 explicit FontFace(ExecutionContext*);	115 explicit FontFace(ExecutionContext*);

116 FontFace(ExecutionContext*, const AtomicString& family, const FontFaceDescri ptors&);	116 FontFace(ExecutionContext*, const AtomicString& family, const FontFaceDescri ptors&);

117	117

118 void initCSSFontFace(Document*, PassRefPtrWillBeRawPtr<CSSValue> src);	118 void initCSSFontFace(Document*, PassRefPtrWillBeRawPtr<CSSValue> src);

119 void initCSSFontFace(const unsigned char* data, unsigned size);	119 void initCSSFontFace(const unsigned char* data, unsigned size);

120 void setPropertyFromString(const Document, const String&, CSSPropertyID, Ex ceptionState = 0);	120 void setPropertyFromString(const Document, const String&, CSSPropertyID, Ex ceptionState = 0);

121 bool setPropertyFromStyle(const StylePropertySet&, CSSPropertyID);	121 bool setPropertyFromStyle(const StylePropertySet&, CSSPropertyID);

122 bool setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue>, CSSPropertyID);	122 bool setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue>, CSSPropertyID);

(...skipping 17 matching lines...) Expand all Loading...
140 PersistentWillBeMember<LoadedProperty> m_loadedProperty;	140 PersistentWillBeMember<LoadedProperty> m_loadedProperty;

141 OwnPtrWillBeMember<CSSFontFace> m_cssFontFace;	141 OwnPtrWillBeMember<CSSFontFace> m_cssFontFace;

142 WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback> > m_callbacks;	142 WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback> > m_callbacks;

143 };	143 };

144	144

145 typedef WillBeHeapVector<RefPtrWillBeMember<FontFace> > FontFaceArray;	145 typedef WillBeHeapVector<RefPtrWillBeMember<FontFace> > FontFaceArray;

146	146

147 } // namespace blink	147 } // namespace blink

148	148

149 #endif // FontFace_h	149 #endif // FontFace_h

OLD	NEW