Avoid some explicit WebSpeechRecognitionHandle() conversions.

Source/web/SpeechRecognitionClientProxy.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *  * Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *  * Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 20 matching lines @@
 #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 "platform/RuntimeEnabledFeatures.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/WebMediaStreamTrack.h"
 #include "public/web/WebSecurityOrigin.h"
 #include "public/web/WebSpeechGrammar.h"
 #include "public/web/WebSpeechRecognitionHandle.h"

[Mike West, 2014/10/05 19:37:27]

Can you remove the header? It looks like you're just passing
WebSpeechRecognitionHandles around and turning them into SpeechRecognition
objects that you actually use.

[sof, 2014/10/05 20:27:25]

The declarations for the conversions between WebSpeechRecognitionHandle and
SpeechRecognition* (both ways) need to be in scope here, so it seems reasonable
to include it & not rely on those to float into scope indirectly.

(As it happens, WebSpeechRecognizer.h includes "*Handle.h" - which embedder code
relies on - so it will work out to remove the #include here. But a bit brittle.)

 #include "public/web/WebSpeechRecognitionParams.h"
 #include "public/web/WebSpeechRecognitionResult.h"
 #include "public/web/WebSpeechRecognizer.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 SpeechRecognitionClientProxy::~SpeechRecognitionClientProxy()
 {
 }
 
 PassOwnPtr<SpeechRecognitionClientProxy> SpeechRecognitionClientProxy::create(WebSpeechRecognizer* recognizer)
 {
     return adoptPtr(new SpeechRecognitionClientProxy(recognizer));
 }
 
 void SpeechRecognitionClientProxy::start(SpeechRecognition* recognition, const SpeechGrammarList* grammarList, const String& lang, bool continuous, bool interimResults, unsigned long maxAlternatives, MediaStreamTrack* audioTrack)
 {
     WebVector<WebSpeechGrammar> webSpeechGrammars(static_cast<size_t>(grammarList->length()));
     for (unsigned long i = 0; i < grammarList->length(); ++i)
         webSpeechGrammars[i] = grammarList->item(i);
 
     WebMediaStreamTrack track;
     if (RuntimeEnabledFeatures::mediaStreamSpeechEnabled() && audioTrack)
         track.assign(audioTrack->component());
     WebSpeechRecognitionParams params(webSpeechGrammars, lang, continuous, interimResults, maxAlternatives, track, WebSecurityOrigin(recognition->executionContext()->securityOrigin()));
-    m_recognizer->start(WebSpeechRecognitionHandle(recognition), params, this);
+    m_recognizer->start(recognition, params, this);
 }
 
 void SpeechRecognitionClientProxy::stop(SpeechRecognition* recognition)
 {
-    m_recognizer->stop(WebSpeechRecognitionHandle(recognition), this);
+    m_recognizer->stop(recognition, this);
 }
 
 void SpeechRecognitionClientProxy::abort(SpeechRecognition* recognition)
 {
-    m_recognizer->abort(WebSpeechRecognitionHandle(recognition), this);
+    m_recognizer->abort(recognition, this);
 }
 
 void SpeechRecognitionClientProxy::didStartAudio(const WebSpeechRecognitionHandle& handle)
 {
     SpeechRecognition* recognition(handle);
     recognition->didStartAudio();
 }
 
 void SpeechRecognitionClientProxy::didStartSound(const WebSpeechRecognitionHandle& handle)
 {
@@ skipping 14 matching lines @@
     SpeechRecognition* recognition(handle);
     recognition->didEndAudio();
 }
 
 void SpeechRecognitionClientProxy::didReceiveResults(const WebSpeechRecognitionHandle& handle, const WebVector<WebSpeechRecognitionResult>& newFinalResults, const WebVector<WebSpeechRecognitionResult>& currentInterimResults)
 {
     SpeechRecognition* recognition(handle);
 
     HeapVector<Member<SpeechRecognitionResult> > finalResultsVector(newFinalResults.size());
     for (size_t i = 0; i < newFinalResults.size(); ++i)
-        finalResultsVector[i] = static_cast<SpeechRecognitionResult*>(newFinalResults[i]);
+        finalResultsVector[i] = Member<SpeechRecognitionResult>(newFinalResults[i]);
 
     HeapVector<Member<SpeechRecognitionResult> > interimResultsVector(currentInterimResults.size());
     for (size_t i = 0; i < currentInterimResults.size(); ++i)
-        interimResultsVector[i] = static_cast<SpeechRecognitionResult*>(currentInterimResults[i]);
+        interimResultsVector[i] = Member<SpeechRecognitionResult>(currentInterimResults[i]);
 
     recognition->didReceiveResults(finalResultsVector, interimResultsVector);
 }
 
 void SpeechRecognitionClientProxy::didReceiveNoMatch(const WebSpeechRecognitionHandle& handle, const WebSpeechRecognitionResult& result)
 {
     SpeechRecognition* recognition(handle);
     recognition->didReceiveNoMatch(result);
 }
 
@@ skipping 15 matching lines @@
     SpeechRecognition* recognition(handle);
     recognition->didEnd();
 }
 
 SpeechRecognitionClientProxy::SpeechRecognitionClientProxy(WebSpeechRecognizer* recognizer)
     : m_recognizer(recognizer)
 {
 }
 
 } // namespace blink