Index: Source/modules/speech/SpeechRecognitionEvent.cpp |
diff --git a/Source/modules/speech/SpeechRecognitionEvent.cpp b/Source/modules/speech/SpeechRecognitionEvent.cpp |
index d91ff32908001ff2186a3d06fc7a08271e45e256..bf14e58058d15fcbff93c14685ee92642c8c1a87 100644 |
--- a/Source/modules/speech/SpeechRecognitionEvent.cpp |
+++ b/Source/modules/speech/SpeechRecognitionEvent.cpp |
@@ -34,30 +34,30 @@ SpeechRecognitionEventInit::SpeechRecognitionEventInit() |
{ |
} |
-PassRefPtrWillBeRawPtr<SpeechRecognitionEvent> SpeechRecognitionEvent::create() |
+SpeechRecognitionEvent* SpeechRecognitionEvent::create() |
{ |
- return adoptRefWillBeNoop(new SpeechRecognitionEvent()); |
+ return new SpeechRecognitionEvent; |
} |
-PassRefPtrWillBeRawPtr<SpeechRecognitionEvent> SpeechRecognitionEvent::create(const AtomicString& eventName, const SpeechRecognitionEventInit& initializer) |
+SpeechRecognitionEvent* SpeechRecognitionEvent::create(const AtomicString& eventName, const SpeechRecognitionEventInit& initializer) |
{ |
- return adoptRefWillBeNoop(new SpeechRecognitionEvent(eventName, initializer)); |
+ return new SpeechRecognitionEvent(eventName, initializer); |
} |
-PassRefPtrWillBeRawPtr<SpeechRecognitionEvent> SpeechRecognitionEvent::createResult(unsigned long resultIndex, const WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> >& results) |
+SpeechRecognitionEvent* SpeechRecognitionEvent::createResult(unsigned long resultIndex, const HeapVector<Member<SpeechRecognitionResult> >& results) |
{ |
- return adoptRefWillBeNoop(new SpeechRecognitionEvent(EventTypeNames::result, resultIndex, SpeechRecognitionResultList::create(results))); |
+ return new SpeechRecognitionEvent(EventTypeNames::result, resultIndex, SpeechRecognitionResultList::create(results)); |
} |
-PassRefPtrWillBeRawPtr<SpeechRecognitionEvent> SpeechRecognitionEvent::createNoMatch(PassRefPtrWillBeRawPtr<SpeechRecognitionResult> result) |
+SpeechRecognitionEvent* SpeechRecognitionEvent::createNoMatch(SpeechRecognitionResult* result) |
{ |
if (result) { |
- WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> > results; |
+ HeapVector<Member<SpeechRecognitionResult> > results; |
results.append(result); |
- return adoptRefWillBeNoop(new SpeechRecognitionEvent(EventTypeNames::nomatch, 0, SpeechRecognitionResultList::create(results))); |
+ return new SpeechRecognitionEvent(EventTypeNames::nomatch, 0, SpeechRecognitionResultList::create(results)); |
} |
- return adoptRefWillBeNoop(new SpeechRecognitionEvent(EventTypeNames::nomatch, 0, nullptr)); |
+ return new SpeechRecognitionEvent(EventTypeNames::nomatch, 0, nullptr); |
} |
const AtomicString& SpeechRecognitionEvent::interfaceName() const |
@@ -79,7 +79,7 @@ SpeechRecognitionEvent::SpeechRecognitionEvent(const AtomicString& eventName, co |
ScriptWrappable::init(this); |
} |
-SpeechRecognitionEvent::SpeechRecognitionEvent(const AtomicString& eventName, unsigned long resultIndex, PassRefPtrWillBeRawPtr<SpeechRecognitionResultList> results) |
+SpeechRecognitionEvent::SpeechRecognitionEvent(const AtomicString& eventName, unsigned long resultIndex, SpeechRecognitionResultList* results) |
: Event(eventName, /*canBubble=*/false, /*cancelable=*/false) |
, m_resultIndex(resultIndex) |
, m_results(results) |
@@ -89,7 +89,6 @@ SpeechRecognitionEvent::SpeechRecognitionEvent(const AtomicString& eventName, un |
SpeechRecognitionEvent::~SpeechRecognitionEvent() |
{ |
- ScriptWrappable::init(this); |
haraken
2014/06/05 14:30:28
wow...
|
} |
void SpeechRecognitionEvent::trace(Visitor* visitor) |