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

Side by Side Diff: sky/engine/core/css/FontFaceSetLoadEvent.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « sky/engine/core/css/FontFaceSetForEachCallback.idl ('k') | sky/engine/core/css/MediaList.cpp » ('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 26 matching lines...) Expand all
37 #include "sky/engine/wtf/PassRefPtr.h" 37 #include "sky/engine/wtf/PassRefPtr.h"
38 #include "sky/engine/wtf/RefPtr.h" 38 #include "sky/engine/wtf/RefPtr.h"
39 39
40 namespace blink { 40 namespace blink {
41 41
42 struct FontFaceSetLoadEventInit : public EventInit { 42 struct FontFaceSetLoadEventInit : public EventInit {
43 FontFaceArray fontfaces; 43 FontFaceArray fontfaces;
44 }; 44 };
45 45
46 class FontFaceSetLoadEvent final : public Event { 46 class FontFaceSetLoadEvent final : public Event {
47 DEFINE_WRAPPERTYPEINFO();
48 public: 47 public:
49 static PassRefPtr<FontFaceSetLoadEvent> create() 48 static PassRefPtr<FontFaceSetLoadEvent> create()
50 { 49 {
51 return adoptRef(new FontFaceSetLoadEvent()); 50 return adoptRef(new FontFaceSetLoadEvent());
52 } 51 }
53 52
54 static PassRefPtr<FontFaceSetLoadEvent> create(const AtomicString& type, con st FontFaceSetLoadEventInit& initializer) 53 static PassRefPtr<FontFaceSetLoadEvent> create(const AtomicString& type, con st FontFaceSetLoadEventInit& initializer)
55 { 54 {
56 return adoptRef(new FontFaceSetLoadEvent(type, initializer)); 55 return adoptRef(new FontFaceSetLoadEvent(type, initializer));
57 } 56 }
(...skipping 13 matching lines...) Expand all
71 FontFaceSetLoadEvent(); 70 FontFaceSetLoadEvent();
72 FontFaceSetLoadEvent(const AtomicString&, const FontFaceArray&); 71 FontFaceSetLoadEvent(const AtomicString&, const FontFaceArray&);
73 FontFaceSetLoadEvent(const AtomicString&, const FontFaceSetLoadEventInit&); 72 FontFaceSetLoadEvent(const AtomicString&, const FontFaceSetLoadEventInit&);
74 73
75 FontFaceArray m_fontfaces; 74 FontFaceArray m_fontfaces;
76 }; 75 };
77 76
78 } // namespace blink 77 } // namespace blink
79 78
80 #endif // SKY_ENGINE_CORE_CSS_FONTFACESETLOADEVENT_H_ 79 #endif // SKY_ENGINE_CORE_CSS_FONTFACESETLOADEVENT_H_
OLDNEW
« no previous file with comments | « sky/engine/core/css/FontFaceSetForEachCallback.idl ('k') | sky/engine/core/css/MediaList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698