Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Henry Mason (hmason@mac.com) | 2 * Copyright (C) 2007 Henry Mason (hmason@mac.com) |
| 3 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 191 visitor->trace(m_source); | 191 visitor->trace(m_source); |
| 192 #if ENABLE(OILPAN) | 192 #if ENABLE(OILPAN) |
| 193 visitor->trace(m_ports); | 193 visitor->trace(m_ports); |
| 194 #endif | 194 #endif |
| 195 Event::trace(visitor); | 195 Event::trace(visitor); |
| 196 } | 196 } |
| 197 | 197 |
| 198 v8::Handle<v8::Object> MessageEvent::wrap(v8::Handle<v8::Object> creationContext , v8::Isolate* isolate) | 198 v8::Handle<v8::Object> MessageEvent::wrap(v8::Handle<v8::Object> creationContext , v8::Isolate* isolate) |
| 199 { | 199 { |
| 200 v8::Handle<v8::Object> wrapper = Event::wrap(creationContext, isolate); | 200 v8::Handle<v8::Object> wrapper = Event::wrap(creationContext, isolate); |
| 201 return associateWithWrapperInternal(wrapper, isolate); | |
| 202 } | |
| 201 | 203 |
| 204 v8::Handle<v8::Object> MessageEvent::associateWithWrapper(const WrapperTypeInfo* wrapperType, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate) | |
| 205 { | |
| 206 Event::associateWithWrapper(wrapperType, wrapper, isolate); | |
| 207 return associateWithWrapperInternal(wrapper, isolate); | |
|
haraken
2014/09/05 16:41:39
I guess that associateWithWrapperInternal should b
Yuki
2014/09/08 07:56:05
We need associateWithWrapperInternal for callback
| |
| 208 } | |
| 209 | |
| 210 v8::Handle<v8::Object> MessageEvent::associateWithWrapperInternal(v8::Handle<v8: :Object> wrapper, v8::Isolate* isolate) | |
| 211 { | |
| 202 // Ensures a wrapper is created for the data to return now so that V8 knows how | 212 // Ensures a wrapper is created for the data to return now so that V8 knows how |
| 203 // much memory is used via the wrapper. To keep the wrapper alive, it's set to | 213 // much memory is used via the wrapper. To keep the wrapper alive, it's set to |
| 204 // the wrapper of the MessageEvent as a hidden value. | 214 // the wrapper of the MessageEvent as a hidden value. |
| 205 switch (dataType()) { | 215 switch (dataType()) { |
| 206 case MessageEvent::DataTypeScriptValue: | 216 case MessageEvent::DataTypeScriptValue: |
| 207 case MessageEvent::DataTypeSerializedScriptValue: | 217 case MessageEvent::DataTypeSerializedScriptValue: |
| 208 break; | 218 break; |
| 209 case MessageEvent::DataTypeString: | 219 case MessageEvent::DataTypeString: |
| 210 V8HiddenValue::setHiddenValue(isolate, wrapper, V8HiddenValue::stringDat a(isolate), v8String(isolate, dataAsString())); | 220 V8HiddenValue::setHiddenValue(isolate, wrapper, V8HiddenValue::stringDat a(isolate), v8String(isolate, dataAsString())); |
| 211 break; | 221 break; |
| 212 case MessageEvent::DataTypeBlob: | 222 case MessageEvent::DataTypeBlob: |
| 213 break; | 223 break; |
| 214 case MessageEvent::DataTypeArrayBuffer: | 224 case MessageEvent::DataTypeArrayBuffer: |
| 215 V8HiddenValue::setHiddenValue(isolate, wrapper, V8HiddenValue::arrayBuff erData(isolate), toV8(dataAsArrayBuffer(), wrapper, isolate)); | 225 V8HiddenValue::setHiddenValue(isolate, wrapper, V8HiddenValue::arrayBuff erData(isolate), toV8(dataAsArrayBuffer(), wrapper, isolate)); |
| 216 break; | 226 break; |
| 217 } | 227 } |
| 218 | 228 |
| 219 return wrapper; | 229 return wrapper; |
| 220 } | 230 } |
| 221 | 231 |
| 222 } // namespace blink | 232 } // namespace blink |
| OLD | NEW |