Title: [117251] trunk/Source/WebKit/chromium
- Revision
- 117251
- Author
- h...@chromium.org
- Date
- 2012-05-16 03:24:51 -0700 (Wed, 16 May 2012)
Log Message
Speech _javascript_ API: pass WebSecurityOrigin to embedder
https://bugs.webkit.org/show_bug.cgi?id=86348
Reviewed by Adam Barth.
Pass the WebSecurityOrigin of the SpeecReco object to the embedder when calling
start(). The origin will be used to determine whether speech recognition is
allowed or not.
* public/WebSpeechRecognitionParams.h:
(WebKit::WebSpeechRecognitionParams::WebSpeechRecognitionParams):
(WebKit::WebSpeechRecognitionParams::origin):
(WebSpeechRecognitionParams):
* src/SpeechRecognitionClientProxy.cpp:
(WebKit::SpeechRecognitionClientProxy::start):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (117250 => 117251)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-16 10:19:35 UTC (rev 117250)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-16 10:24:51 UTC (rev 117251)
@@ -1,3 +1,21 @@
+2012-05-16 Hans Wennborg <h...@chromium.org>
+
+ Speech _javascript_ API: pass WebSecurityOrigin to embedder
+ https://bugs.webkit.org/show_bug.cgi?id=86348
+
+ Reviewed by Adam Barth.
+
+ Pass the WebSecurityOrigin of the SpeecReco object to the embedder when calling
+ start(). The origin will be used to determine whether speech recognition is
+ allowed or not.
+
+ * public/WebSpeechRecognitionParams.h:
+ (WebKit::WebSpeechRecognitionParams::WebSpeechRecognitionParams):
+ (WebKit::WebSpeechRecognitionParams::origin):
+ (WebSpeechRecognitionParams):
+ * src/SpeechRecognitionClientProxy.cpp:
+ (WebKit::SpeechRecognitionClientProxy::start):
+
2012-05-15 Tien-Ren Chen <trc...@chromium.org>
[Chromium] CCTimer::isActive() is incorrect inside tick callback
Modified: trunk/Source/WebKit/chromium/public/WebSpeechRecognitionParams.h (117250 => 117251)
--- trunk/Source/WebKit/chromium/public/WebSpeechRecognitionParams.h 2012-05-16 10:19:35 UTC (rev 117250)
+++ trunk/Source/WebKit/chromium/public/WebSpeechRecognitionParams.h 2012-05-16 10:24:51 UTC (rev 117251)
@@ -26,6 +26,7 @@
#ifndef WebSpeechRecognitionParams_h
#define WebSpeechRecognitionParams_h
+#include "WebSecurityOrigin.h"
#include "WebSpeechGrammar.h"
#include "platform/WebString.h"
#include "platform/WebVector.h"
@@ -36,21 +37,24 @@
class WebSpeechRecognitionParams {
public:
- WebSpeechRecognitionParams(const WebVector<WebSpeechGrammar>& grammars, const WebString& language, bool continuous)
+ WebSpeechRecognitionParams(const WebVector<WebSpeechGrammar>& grammars, const WebString& language, bool continuous, const WebSecurityOrigin& origin)
: m_grammars(grammars)
, m_language(language)
, m_continuous(continuous)
+ , m_origin(origin)
{
}
const WebVector<WebSpeechGrammar>& grammars() const { return m_grammars; }
const WebString& language() const { return m_language; }
bool continuous() const { return m_continuous; }
+ const WebSecurityOrigin& origin() const { return m_origin; }
private:
WebVector<WebSpeechGrammar> m_grammars;
WebString m_language;
bool m_continuous;
+ WebSecurityOrigin m_origin;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/SpeechRecognitionClientProxy.cpp (117250 => 117251)
--- trunk/Source/WebKit/chromium/src/SpeechRecognitionClientProxy.cpp 2012-05-16 10:19:35 UTC (rev 117250)
+++ trunk/Source/WebKit/chromium/src/SpeechRecognitionClientProxy.cpp 2012-05-16 10:24:51 UTC (rev 117251)
@@ -26,11 +26,14 @@
#include "config.h"
#include "SpeechRecognitionClientProxy.h"
+#include "ScriptExecutionContext.h"
+#include "SecurityOrigin.h"
#include "SpeechGrammarList.h"
#include "SpeechRecognition.h"
#include "SpeechRecognitionError.h"
#include "SpeechRecognitionResult.h"
#include "SpeechRecognitionResultList.h"
+#include "WebSecurityOrigin.h"
#include "WebSpeechGrammar.h"
#include "WebSpeechRecognitionHandle.h"
#include "WebSpeechRecognitionParams.h"
@@ -58,7 +61,8 @@
for (unsigned long i = 0; i < grammarList->length(); ++i)
webSpeechGrammars[i] = grammarList->item(i);
- m_recognizer->start(WebSpeechRecognitionHandle(recognition), WebSpeechRecognitionParams(webSpeechGrammars, lang, continuous), this);
+ WebSpeechRecognitionParams params(webSpeechGrammars, lang, continuous, WebSecurityOrigin(recognition->scriptExecutionContext()->securityOrigin()));
+ m_recognizer->start(WebSpeechRecognitionHandle(recognition), params, this);
}
void SpeechRecognitionClientProxy::stop(SpeechRecognition* recognition)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
