Upstream version 7.36.149.0

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

diff --git a/src/third_party/WebKit/Source/web/SpeechRecognitionClientProxy.cpp b/src/third_party/WebKit/Source/web/SpeechRecognitionClientProxy.cpp
index 3ae6d91..d1de70b 100644 (file)
--- a/src/third_party/WebKit/Source/web/SpeechRecognitionClientProxy.cpp
+++ b/src/third_party/WebKit/Source/web/SpeechRecognitionClientProxy.cpp
@@ -24,27 +24,26 @@
  */
 
 #include "config.h"
-#include "SpeechRecognitionClientProxy.h"
+#include "web/SpeechRecognitionClientProxy.h"
 
-#include "wtf/PassOwnPtr.h"
-#include "wtf/PassRefPtr.h"
-#include "WebSecurityOrigin.h"
-#include "WebSpeechGrammar.h"
-#include "WebSpeechRecognitionHandle.h"
-#include "WebSpeechRecognitionParams.h"
-#include "WebSpeechRecognitionResult.h"
-#include "WebSpeechRecognizer.h"
 #include "core/dom/ExecutionContext.h"
 #include "modules/speech/SpeechGrammarList.h"
 #include "modules/speech/SpeechRecognition.h"
 #include "modules/speech/SpeechRecognitionError.h"
 #include "modules/speech/SpeechRecognitionResult.h"
 #include "modules/speech/SpeechRecognitionResultList.h"
-#include "weborigin/SecurityOrigin.h"
+#include "platform/weborigin/SecurityOrigin.h"
+#include "public/web/WebSecurityOrigin.h"
+#include "public/web/WebSpeechGrammar.h"
+#include "public/web/WebSpeechRecognitionHandle.h"
+#include "public/web/WebSpeechRecognitionParams.h"
+#include "public/web/WebSpeechRecognitionResult.h"
+#include "public/web/WebSpeechRecognizer.h"
+#include "wtf/PassRefPtr.h"
 
 using namespace WebCore;
 
-namespace WebKit {
+namespace blink {
 
 SpeechRecognitionClientProxy::~SpeechRecognitionClientProxy()
 {
@@ -77,67 +76,67 @@ void SpeechRecognitionClientProxy::abort(SpeechRecognition* recognition)
 
 void SpeechRecognitionClientProxy::didStartAudio(const WebSpeechRecognitionHandle& handle)
 {
-    RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
+    RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
     recognition->didStartAudio();
 }
 
 void SpeechRecognitionClientProxy::didStartSound(const WebSpeechRecognitionHandle& handle)
 {
-    RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
+    RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
     recognition->didStartSound();
     recognition->didStartSpeech();
 }
 
 void SpeechRecognitionClientProxy::didEndSound(const WebSpeechRecognitionHandle& handle)
 {
-    RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
+    RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
     recognition->didEndSpeech();
     recognition->didEndSound();
 }
 
 void SpeechRecognitionClientProxy::didEndAudio(const WebSpeechRecognitionHandle& handle)
 {
-    RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
+    RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
     recognition->didEndAudio();
 }
 
 void SpeechRecognitionClientProxy::didReceiveResults(const WebSpeechRecognitionHandle& handle, const WebVector<WebSpeechRecognitionResult>& newFinalResults, const WebVector<WebSpeechRecognitionResult>& currentInterimResults)
 {
-    RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
+    RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
 
-    Vector<RefPtr<SpeechRecognitionResult> > finalResultsVector(newFinalResults.size());
+    WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> > finalResultsVector(newFinalResults.size());
     for (size_t i = 0; i < newFinalResults.size(); ++i)
-        finalResultsVector[i] = static_cast<PassRefPtr<SpeechRecognitionResult> >(newFinalResults[i]);
+        finalResultsVector[i] = PassRefPtrWillBeRawPtr<SpeechRecognitionResult>(newFinalResults[i]);
 
-    Vector<RefPtr<SpeechRecognitionResult> > interimResultsVector(currentInterimResults.size());
+    WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> > interimResultsVector(currentInterimResults.size());
     for (size_t i = 0; i < currentInterimResults.size(); ++i)
-        interimResultsVector[i] = static_cast<PassRefPtr<SpeechRecognitionResult> >(currentInterimResults[i]);
+        interimResultsVector[i] = PassRefPtrWillBeRawPtr<SpeechRecognitionResult>(currentInterimResults[i]);
 
     recognition->didReceiveResults(finalResultsVector, interimResultsVector);
 }
 
 void SpeechRecognitionClientProxy::didReceiveNoMatch(const WebSpeechRecognitionHandle& handle, const WebSpeechRecognitionResult& result)
 {
-    RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
+    RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
     recognition->didReceiveNoMatch(result);
 }
 
 void SpeechRecognitionClientProxy::didReceiveError(const WebSpeechRecognitionHandle& handle, const WebString& message, WebSpeechRecognizerClient::ErrorCode code)
 {
-    RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
+    RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
     SpeechRecognitionError::ErrorCode errorCode = static_cast<SpeechRecognitionError::ErrorCode>(code);
     recognition->didReceiveError(SpeechRecognitionError::create(errorCode, message));
 }
 
 void SpeechRecognitionClientProxy::didStart(const WebSpeechRecognitionHandle& handle)
 {
-    RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
+    RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
     recognition->didStart();
 }
 
 void SpeechRecognitionClientProxy::didEnd(const WebSpeechRecognitionHandle& handle)
 {
-    RefPtr<SpeechRecognition> recognition = PassRefPtr<SpeechRecognition>(handle);
+    RefPtrWillBeRawPtr<SpeechRecognition> recognition = PassRefPtrWillBeRawPtr<SpeechRecognition>(handle);
     recognition->didEnd();
 }
 
@@ -146,4 +145,4 @@ SpeechRecognitionClientProxy::SpeechRecognitionClientProxy(WebSpeechRecognizer*
 {
 }
 
-} // namespace WebKit
+} // namespace blink