Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / WebSpeechRecognitionResult.cpp

diff --git a/src/third_party/WebKit/Source/web/WebSpeechRecognitionResult.cpp b/src/third_party/WebKit/Source/web/WebSpeechRecognitionResult.cpp
index 165cfe0..fee75e2 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebSpeechRecognitionResult.cpp
+++ b/src/third_party/WebKit/Source/web/WebSpeechRecognitionResult.cpp
@@ -26,11 +26,24 @@
 #include "config.h"
 #include "WebSpeechRecognitionResult.h"
 
+#include "heap/Handle.h"
 #include "modules/speech/SpeechRecognitionAlternative.h"
 #include "modules/speech/SpeechRecognitionResult.h"
 #include "wtf/PassRefPtr.h"
+#include "wtf/RawPtr.h"
+#include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
+// FIXME: oilpan: If the WebCore-qualified Oilpan transition types
+// used below map to CPP #defines, move the type names they expand to
+// into the WebCore namespace. When Oilpan is always enabled, this
+// block can be removed.
+namespace WebCore {
+using WTF::RawPtr;
+using WTF::RefPtr;
+using WTF::Vector;
+};
+
 namespace blink {
 
 void WebSpeechRecognitionResult::assign(const WebSpeechRecognitionResult& other)
@@ -42,7 +55,7 @@ void WebSpeechRecognitionResult::assign(const WebVector<WebString>& transcripts,
 {
     ASSERT(transcripts.size() == confidences.size());
 
-    Vector<RefPtr<WebCore::SpeechRecognitionAlternative> > alternatives(transcripts.size());
+    WebCore::WillBeHeapVector<WebCore::RefPtrWillBeMember<WebCore::SpeechRecognitionAlternative> > alternatives(transcripts.size());
     for (size_t i = 0; i < transcripts.size(); ++i)
         alternatives[i] = WebCore::SpeechRecognitionAlternative::create(transcripts[i], confidences[i]);