Chromium Code Reviews| 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 met: | 5 * modification, are permitted provided that the following conditions are met: |
| 6 * | 6 * |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 40 | 40 |
| 41 class CachedFont; | 41 class CachedFont; |
| 42 class CSSFontFaceRule; | 42 class CSSFontFaceRule; |
| 43 class CSSFontFaceSource; | 43 class CSSFontFaceSource; |
| 44 class Dictionary; | 44 class Dictionary; |
| 45 class Document; | 45 class Document; |
| 46 class Event; | 46 class Event; |
| 47 class Font; | 47 class Font; |
| 48 class ScriptExecutionContext; | 48 class ScriptExecutionContext; |
| 49 | 49 |
| 50 class FontLoader : public RefCounted<FontLoader>, public ActiveDOMObject, public EventTarget { | 50 class FontLoader : public EventTarget, public RefCounted<FontLoader>, public Act iveDOMObject { |
|
do-not-use
2013/07/05 14:44:04
FYI, I'm changing the other because we hit the fol
do-not-use
2013/07/05 14:47:44
changing the *order* (not *other*).
haraken
2013/07/06 00:29:56
In your CL, the order swap doesn't matter.
The or
haraken
2013/07/06 01:21:01
On the other hand, we might not want to change the
dominicc (has gone to gerrit)
2013/07/07 00:14:28
The issue is basically this one: <http://stackover
| |
| 51 public: | 51 public: |
| 52 static PassRefPtr<FontLoader> create(Document* document) | 52 static PassRefPtr<FontLoader> create(Document* document) |
| 53 { | 53 { |
| 54 return adoptRef<FontLoader>(new FontLoader(document)); | 54 return adoptRef<FontLoader>(new FontLoader(document)); |
| 55 } | 55 } |
| 56 virtual ~FontLoader(); | 56 virtual ~FontLoader(); |
| 57 | 57 |
| 58 DEFINE_ATTRIBUTE_EVENT_LISTENER(loading); | 58 DEFINE_ATTRIBUTE_EVENT_LISTENER(loading); |
| 59 DEFINE_ATTRIBUTE_EVENT_LISTENER(loadingdone); | 59 DEFINE_ATTRIBUTE_EVENT_LISTENER(loadingdone); |
| 60 DEFINE_ATTRIBUTE_EVENT_LISTENER(loadstart); | 60 DEFINE_ATTRIBUTE_EVENT_LISTENER(loadstart); |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 115 Vector<RefPtr<VoidCallback> > m_pendingCallbacks; | 115 Vector<RefPtr<VoidCallback> > m_pendingCallbacks; |
| 116 Vector<RefPtr<VoidCallback> > m_fontsReadyCallbacks; | 116 Vector<RefPtr<VoidCallback> > m_fontsReadyCallbacks; |
| 117 RefPtr<Event> m_pendingDoneEvent; | 117 RefPtr<Event> m_pendingDoneEvent; |
| 118 Timer<FontLoader> m_timer; | 118 Timer<FontLoader> m_timer; |
| 119 FontLoadHistogram m_histogram; | 119 FontLoadHistogram m_histogram; |
| 120 }; | 120 }; |
| 121 | 121 |
| 122 } // namespace WebCore | 122 } // namespace WebCore |
| 123 | 123 |
| 124 #endif // FontLoader_h | 124 #endif // FontLoader_h |
| OLD | NEW |