<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[151680] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/151680">151680</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-06-18 04:23:37 -0700 (Tue, 18 Jun 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[WebSpeech] Speech Recognition requires convertValue support in JSDictionary
https://bugs.webkit.org/show_bug.cgi?id=117731

Patch by Praveen R Jadhav &lt;praveen.j@samsung.com&gt; on 2013-06-18
Reviewed by Christophe Dumez.

Build fails after enabling ENABLE_SCRIPTED_SPEECH feature. This patch
resolves the issue.

No new tests. No change in behaviour.

* bindings/js/JSDictionary.cpp:
(WebCore::JSDictionary::convertValue):
* bindings/js/JSDictionary.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDictionarycpp">trunk/Source/WebCore/bindings/js/JSDictionary.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDictionaryh">trunk/Source/WebCore/bindings/js/JSDictionary.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (151679 => 151680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-06-18 10:30:22 UTC (rev 151679)
+++ trunk/Source/WebCore/ChangeLog        2013-06-18 11:23:37 UTC (rev 151680)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-06-18  Praveen R Jadhav  &lt;praveen.j@samsung.com&gt;
+
+        [WebSpeech] Speech Recognition requires convertValue support in JSDictionary
+        https://bugs.webkit.org/show_bug.cgi?id=117731
+
+        Reviewed by Christophe Dumez.
+
+        Build fails after enabling ENABLE_SCRIPTED_SPEECH feature. This patch
+        resolves the issue.
+
+        No new tests. No change in behaviour.
+
+        * bindings/js/JSDictionary.cpp:
+        (WebCore::JSDictionary::convertValue):
+        * bindings/js/JSDictionary.h:
+
</ins><span class="cx"> 2013-06-18  Mary Wu  &lt;mary.wu@torchmobile.com.cn&gt;
</span><span class="cx"> 
</span><span class="cx">         [BlackBerry] only notify download client when download error
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.cpp (151679 => 151680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.cpp        2013-06-18 10:30:22 UTC (rev 151679)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.cpp        2013-06-18 11:23:37 UTC (rev 151680)
</span><span class="lines">@@ -52,6 +52,10 @@
</span><span class="cx"> #include &quot;JSMediaStream.h&quot;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if ENABLE(SCRIPTED_SPEECH)
+#include &quot;JSSpeechRecognitionResultList.h&quot;
+#endif
+
</ins><span class="cx"> using namespace JSC;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -249,6 +253,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if ENABLE(SCRIPTED_SPEECH)
+void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, RefPtr&lt;SpeechRecognitionResultList&gt;&amp; result)
+{
+    result = toSpeechRecognitionResultList(value);
+}
+#endif
+
</ins><span class="cx"> bool JSDictionary::getWithUndefinedOrNullCheck(const String&amp; propertyName, String&amp; result) const
</span><span class="cx"> {
</span><span class="cx">     ASSERT(isValid());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.h (151679 => 151680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.h        2013-06-18 10:30:22 UTC (rev 151679)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.h        2013-06-18 11:23:37 UTC (rev 151680)
</span><span class="lines">@@ -50,6 +50,10 @@
</span><span class="cx"> class TrackBase;
</span><span class="cx"> class VoidCallback;
</span><span class="cx"> 
</span><ins>+#if ENABLE(SCRIPTED_SPEECH)
+class SpeechRecognitionResultList;
+#endif
+
</ins><span class="cx"> class JSDictionary {
</span><span class="cx"> public:
</span><span class="cx">     JSDictionary(JSC::ExecState* exec, JSC::JSObject* initializerObject)
</span><span class="lines">@@ -127,6 +131,9 @@
</span><span class="cx">     static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr&lt;DOMError&gt;&amp; result);
</span><span class="cx">     static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr&lt;VoidCallback&gt;&amp; result);
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(SCRIPTED_SPEECH)
+    static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr&lt;SpeechRecognitionResultList&gt;&amp;);
+#endif
</ins><span class="cx"> 
</span><span class="cx">     JSC::ExecState* m_exec;
</span><span class="cx">     JSC::Strong&lt;JSC::JSObject&gt; m_initializerObject;
</span></span></pre>
</div>
</div>

</body>
</html>