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

Side by Side Diff: third_party/WebKit/Source/core/events/CustomEvent.cpp

Issue 1383603004: Revert of Store |detail| as a hidden value of custom event wrappers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/events/CustomEvent.h" 27 #include "core/events/CustomEvent.h"
28 28
29 #include "bindings/core/v8/SerializedScriptValue.h" 29 #include "bindings/core/v8/SerializedScriptValue.h"
30 #include "bindings/core/v8/SerializedScriptValueFactory.h"
31 30
32 namespace blink { 31 namespace blink {
33 32
34 CustomEvent::CustomEvent() 33 CustomEvent::CustomEvent()
35 { 34 {
36 } 35 }
37 36
38 CustomEvent::CustomEvent(const AtomicString& type, const CustomEventInit& initia lizer) 37 CustomEvent::CustomEvent(const AtomicString& type, const CustomEventInit& initia lizer)
39 : Event(type, initializer) 38 : Event(type, initializer)
40 { 39 {
40 if (initializer.hasDetail())
41 m_detail = initializer.detail();
41 } 42 }
42 43
43 CustomEvent::~CustomEvent() 44 CustomEvent::~CustomEvent()
44 { 45 {
45 } 46 }
46 47
47 void CustomEvent::initCustomEvent(const AtomicString& type, bool canBubble, bool cancelable, const ScriptValue& detail) 48 void CustomEvent::initCustomEvent(const AtomicString& type, bool canBubble, bool cancelable, const ScriptValue& detail)
48 { 49 {
49 initEvent(type, canBubble, cancelable); 50 initEvent(type, canBubble, cancelable);
50 m_serializedDetail = SerializedScriptValueFactory::instance().createAndSwall owExceptions(detail.isolate(), detail.v8Value()); 51 m_detail = detail;
51 } 52 }
52 53
53 void CustomEvent::initCustomEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> serializedDetail) 54 void CustomEvent::initCustomEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> serializedDetail)
54 { 55 {
55 if (dispatched()) 56 if (dispatched())
56 return; 57 return;
57 58
58 initEvent(type, canBubble, cancelable); 59 initEvent(type, canBubble, cancelable);
59 60
60 m_serializedDetail = serializedDetail; 61 m_serializedDetail = serializedDetail;
61 } 62 }
62 63
63 const AtomicString& CustomEvent::interfaceName() const 64 const AtomicString& CustomEvent::interfaceName() const
64 { 65 {
65 return EventNames::CustomEvent; 66 return EventNames::CustomEvent;
66 } 67 }
67 68
68 DEFINE_TRACE(CustomEvent) 69 DEFINE_TRACE(CustomEvent)
69 { 70 {
70 Event::trace(visitor); 71 Event::trace(visitor);
71 } 72 }
72 73
73 } // namespace blink 74 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/events/CustomEvent.h ('k') | third_party/WebKit/Source/core/events/CustomEvent.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698