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

Side by Side Diff: Source/core/events/MessageEvent.h

Issue 636833002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/events (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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/events/KeyboardEvent.h ('k') | Source/core/events/MouseEvent.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) 2007 Henry Mason (hmason@mac.com) 2 * Copyright (C) 2007 Henry Mason (hmason@mac.com)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 29 matching lines...) Expand all
40 40
41 struct MessageEventInit : public EventInit { 41 struct MessageEventInit : public EventInit {
42 MessageEventInit(); 42 MessageEventInit();
43 43
44 String origin; 44 String origin;
45 String lastEventId; 45 String lastEventId;
46 RefPtrWillBeMember<EventTarget> source; 46 RefPtrWillBeMember<EventTarget> source;
47 MessagePortArray ports; 47 MessagePortArray ports;
48 }; 48 };
49 49
50 class MessageEvent FINAL : public Event { 50 class MessageEvent final : public Event {
51 DEFINE_WRAPPERTYPEINFO(); 51 DEFINE_WRAPPERTYPEINFO();
52 public: 52 public:
53 static PassRefPtrWillBeRawPtr<MessageEvent> create() 53 static PassRefPtrWillBeRawPtr<MessageEvent> create()
54 { 54 {
55 return adoptRefWillBeNoop(new MessageEvent); 55 return adoptRefWillBeNoop(new MessageEvent);
56 } 56 }
57 static PassRefPtrWillBeRawPtr<MessageEvent> create(PassOwnPtrWillBeRawPtr<Me ssagePortArray> ports, const String& origin = String(), const String& lastEventI d = String(), PassRefPtrWillBeRawPtr<EventTarget> source = nullptr) 57 static PassRefPtrWillBeRawPtr<MessageEvent> create(PassOwnPtrWillBeRawPtr<Me ssagePortArray> ports, const String& origin = String(), const String& lastEventI d = String(), PassRefPtrWillBeRawPtr<EventTarget> source = nullptr)
58 { 58 {
59 return adoptRefWillBeNoop(new MessageEvent(origin, lastEventId, source, ports)); 59 return adoptRefWillBeNoop(new MessageEvent(origin, lastEventId, source, ports));
60 } 60 }
(...skipping 22 matching lines...) Expand all
83 83
84 void initMessageEvent(const AtomicString& type, bool canBubble, bool cancela ble, const String& origin, const String& lastEventId, LocalDOMWindow* source, Pa ssOwnPtrWillBeRawPtr<MessagePortArray>); 84 void initMessageEvent(const AtomicString& type, bool canBubble, bool cancela ble, const String& origin, const String& lastEventId, LocalDOMWindow* source, Pa ssOwnPtrWillBeRawPtr<MessagePortArray>);
85 void initMessageEvent(const AtomicString& type, bool canBubble, bool cancela ble, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, LocalDOMWindow* source, PassOwnPtrWillBeRawPtr<MessagePortArray>); 85 void initMessageEvent(const AtomicString& type, bool canBubble, bool cancela ble, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, LocalDOMWindow* source, PassOwnPtrWillBeRawPtr<MessagePortArray>);
86 86
87 const String& origin() const { return m_origin; } 87 const String& origin() const { return m_origin; }
88 const String& lastEventId() const { return m_lastEventId; } 88 const String& lastEventId() const { return m_lastEventId; }
89 EventTarget* source() const { return m_source.get(); } 89 EventTarget* source() const { return m_source.get(); }
90 MessagePortArray ports() const { return m_ports ? *m_ports : MessagePortArra y(); } 90 MessagePortArray ports() const { return m_ports ? *m_ports : MessagePortArra y(); }
91 MessagePortChannelArray* channels() const { return m_channels ? m_channels.g et() : 0; } 91 MessagePortChannelArray* channels() const { return m_channels ? m_channels.g et() : 0; }
92 92
93 virtual const AtomicString& interfaceName() const OVERRIDE; 93 virtual const AtomicString& interfaceName() const override;
94 94
95 enum DataType { 95 enum DataType {
96 DataTypeScriptValue, 96 DataTypeScriptValue,
97 DataTypeSerializedScriptValue, 97 DataTypeSerializedScriptValue,
98 DataTypeString, 98 DataTypeString,
99 DataTypeBlob, 99 DataTypeBlob,
100 DataTypeArrayBuffer 100 DataTypeArrayBuffer
101 }; 101 };
102 DataType dataType() const { return m_dataType; } 102 DataType dataType() const { return m_dataType; }
103 SerializedScriptValue* dataAsSerializedScriptValue() const { ASSERT(m_dataTy pe == DataTypeScriptValue || m_dataType == DataTypeSerializedScriptValue); retur n m_dataAsSerializedScriptValue.get(); } 103 SerializedScriptValue* dataAsSerializedScriptValue() const { ASSERT(m_dataTy pe == DataTypeScriptValue || m_dataType == DataTypeSerializedScriptValue); retur n m_dataAsSerializedScriptValue.get(); }
104 String dataAsString() const { ASSERT(m_dataType == DataTypeString); return m _dataAsString; } 104 String dataAsString() const { ASSERT(m_dataType == DataTypeString); return m _dataAsString; }
105 Blob* dataAsBlob() const { ASSERT(m_dataType == DataTypeBlob); return m_data AsBlob.get(); } 105 Blob* dataAsBlob() const { ASSERT(m_dataType == DataTypeBlob); return m_data AsBlob.get(); }
106 ArrayBuffer* dataAsArrayBuffer() const { ASSERT(m_dataType == DataTypeArrayB uffer); return m_dataAsArrayBuffer.get(); } 106 ArrayBuffer* dataAsArrayBuffer() const { ASSERT(m_dataType == DataTypeArrayB uffer); return m_dataAsArrayBuffer.get(); }
107 107
108 void setSerializedData(PassRefPtr<SerializedScriptValue> data) 108 void setSerializedData(PassRefPtr<SerializedScriptValue> data)
109 { 109 {
110 ASSERT(!m_dataAsSerializedScriptValue); 110 ASSERT(!m_dataAsSerializedScriptValue);
111 m_dataAsSerializedScriptValue = data; 111 m_dataAsSerializedScriptValue = data;
112 } 112 }
113 113
114 void entangleMessagePorts(ExecutionContext*); 114 void entangleMessagePorts(ExecutionContext*);
115 115
116 virtual void trace(Visitor*) OVERRIDE; 116 virtual void trace(Visitor*) override;
117 117
118 virtual v8::Handle<v8::Object> associateWithWrapper(const WrapperTypeInfo*, v8::Handle<v8::Object> wrapper, v8::Isolate*) OVERRIDE; 118 virtual v8::Handle<v8::Object> associateWithWrapper(const WrapperTypeInfo*, v8::Handle<v8::Object> wrapper, v8::Isolate*) override;
119 119
120 private: 120 private:
121 MessageEvent(); 121 MessageEvent();
122 MessageEvent(const AtomicString&, const MessageEventInit&); 122 MessageEvent(const AtomicString&, const MessageEventInit&);
123 MessageEvent(const String& origin, const String& lastEventId, PassRefPtrWill BeRawPtr<EventTarget> source, PassOwnPtrWillBeRawPtr<MessagePortArray>); 123 MessageEvent(const String& origin, const String& lastEventId, PassRefPtrWill BeRawPtr<EventTarget> source, PassOwnPtrWillBeRawPtr<MessagePortArray>);
124 MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, c onst String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, PassOwnPtr WillBeRawPtr<MessagePortArray>); 124 MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, c onst String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, PassOwnPtr WillBeRawPtr<MessagePortArray>);
125 MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, c onst String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, PassOwnPtr <MessagePortChannelArray>); 125 MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& origin, c onst String& lastEventId, PassRefPtrWillBeRawPtr<EventTarget> source, PassOwnPtr <MessagePortChannelArray>);
126 126
127 MessageEvent(const String& data, const String& origin); 127 MessageEvent(const String& data, const String& origin);
128 MessageEvent(Blob* data, const String& origin); 128 MessageEvent(Blob* data, const String& origin);
(...skipping 10 matching lines...) Expand all
139 // m_ports are the MessagePorts in an engtangled state, and m_channels are 139 // m_ports are the MessagePorts in an engtangled state, and m_channels are
140 // the MessageChannels in a disentangled state. Only one of them can be 140 // the MessageChannels in a disentangled state. Only one of them can be
141 // non-empty at a time. entangleMessagePorts() moves between the states. 141 // non-empty at a time. entangleMessagePorts() moves between the states.
142 OwnPtrWillBeMember<MessagePortArray> m_ports; 142 OwnPtrWillBeMember<MessagePortArray> m_ports;
143 OwnPtr<MessagePortChannelArray> m_channels; 143 OwnPtr<MessagePortChannelArray> m_channels;
144 }; 144 };
145 145
146 } // namespace blink 146 } // namespace blink
147 147
148 #endif // MessageEvent_h 148 #endif // MessageEvent_h
OLDNEW
« no previous file with comments | « Source/core/events/KeyboardEvent.h ('k') | Source/core/events/MouseEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698