Changing serviceuri param to be url from string in Blink and tagging requests to speech recognizer

Source/modules/speech/SpeechRecognition.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 17 matching lines @@
 #include "modules/speech/SpeechRecognition.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/page/Page.h"
 #include "modules/mediastream/MediaStreamTrack.h"
 #include "modules/speech/SpeechRecognitionController.h"
 #include "modules/speech/SpeechRecognitionError.h"
 #include "modules/speech/SpeechRecognitionEvent.h"
+#include "platform/weborigin/KURL.h"
 
 namespace blink {
 
 SpeechRecognition* SpeechRecognition::create(ExecutionContext* context)
 {
     ASSERT(context && context->isDocument());
     Document* document = toDocument(context);
     ASSERT(document);
     SpeechRecognition* speechRecognition = new SpeechRecognition(document->page(), context);
     speechRecognition->suspendIfNeeded();
     return speechRecognition;
 }
 
 void SpeechRecognition::start(ExceptionState& exceptionState)
 {
     if (!m_controller)
         return;
 
     if (m_started) {
         exceptionState.throwDOMException(InvalidStateError, "recognition has already started.");
         return;
     }
 
+    KURL url(ParsedURLString, m_serviceURI);
+    // Throw an error if serviceuri is not empty and url is invalid.

[jochen (gone - plz use gerrit), 2015/05/06 13:03:58]

nit. that comment doesn't add value, just omit it

[kirtia, 2015/05/06 14:57:13]

Done.

+    if (!m_serviceURI.isEmpty() && !url.isValid()) {
+        exceptionState.throwDOMException(SyntaxError, "serviceURI is neither empty nor a valid URL.");

[jochen (gone - plz use gerrit), 2015/05/06 13:03:58]

i just double-checked the spec, and it doesn't define what should happen here.
Can we update the spec to match this behavior?

[kirtia, 2015/06/02 20:56:57]

Ack. It has been decided that we ignore malformed urls so the web observable
behavior does not change.

+        return;
+    }
+
     m_finalResults.clear();
-    m_controller->start(this, m_grammars, m_lang, m_serviceURI, m_continuous, m_interimResults, m_maxAlternatives, m_audioTrack);
+    m_controller->start(this, m_grammars, m_lang, url, m_continuous, m_interimResults, m_maxAlternatives, m_audioTrack);
     m_started = true;
 }
 
 void SpeechRecognition::stopFunction()
 {
     if (!m_controller)
         return;
 
     if (m_started && !m_stopping) {
         m_stopping = true;
@@ skipping 135 matching lines @@
 #if ENABLE(OILPAN)
     visitor->trace(m_controller);
 #endif
     visitor->trace(m_finalResults);
     RefCountedGarbageCollectedEventTargetWithInlineData<SpeechRecognition>::trace(visitor);
     PageLifecycleObserver::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink