Index: Source/web/WebSpeechRecognitionResult.cpp |
diff --git a/Source/web/WebSpeechRecognitionResult.cpp b/Source/web/WebSpeechRecognitionResult.cpp |
index fee75e2bc968d520fa05b8d8c5afe5bded17a73e..1807c8fc4dc3ce6946057f47aaec7c6593f2fed1 100644 |
--- a/Source/web/WebSpeechRecognitionResult.cpp |
+++ b/Source/web/WebSpeechRecognitionResult.cpp |
@@ -34,16 +34,6 @@ |
#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) |
@@ -55,7 +45,7 @@ void WebSpeechRecognitionResult::assign(const WebVector<WebString>& transcripts, |
{ |
ASSERT(transcripts.size() == confidences.size()); |
- WebCore::WillBeHeapVector<WebCore::RefPtrWillBeMember<WebCore::SpeechRecognitionAlternative> > alternatives(transcripts.size()); |
+ WillBeHeapVector<RefPtrWillBeMember<WebCore::SpeechRecognitionAlternative> > alternatives(transcripts.size()); |
for (size_t i = 0; i < transcripts.size(); ++i) |
alternatives[i] = WebCore::SpeechRecognitionAlternative::create(transcripts[i], confidences[i]); |
@@ -67,7 +57,7 @@ void WebSpeechRecognitionResult::reset() |
m_private.reset(); |
} |
-WebSpeechRecognitionResult::operator PassRefPtr<WebCore::SpeechRecognitionResult>() const |
+WebSpeechRecognitionResult::operator PassRefPtrWillBeRawPtr<WebCore::SpeechRecognitionResult>() const |
{ |
return m_private.get(); |
} |