- Revision
- 140297
- Author
- dmazz...@google.com
- Date
- 2013-01-20 22:13:34 -0800 (Sun, 20 Jan 2013)
Log Message
Make SpeechSynthesis compile in the Chromium port
https://bugs.webkit.org/show_bug.cgi?id=107382
Reviewed by Adam Barth.
Source/WebCore:
Add stubs for the Chromium implementation of speech synthesis,
and add all source and header files to WebCore.gypi. Everything
is behind the ENABLE_SPEECH_SYNTHESIS flag.
* Modules/speech/chromium/SpeechSynthesisChromium.cpp: Added.
(WebCore):
(WebCore::SpeechSynthesis::initializeVoiceList):
(WebCore::SpeechSynthesis::pending):
(WebCore::SpeechSynthesis::speaking):
(WebCore::SpeechSynthesis::paused):
(WebCore::SpeechSynthesis::speak):
(WebCore::SpeechSynthesis::cancel):
(WebCore::SpeechSynthesis::pause):
(WebCore::SpeechSynthesis::resume):
* WebCore.gypi:
Source/WebKit/chromium:
Add ENABLE_SPEECH_SYNTHESIS to features.gypi, off by default.
* features.gypi:
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (140296 => 140297)
--- trunk/Source/WebCore/ChangeLog 2013-01-21 06:10:23 UTC (rev 140296)
+++ trunk/Source/WebCore/ChangeLog 2013-01-21 06:13:34 UTC (rev 140297)
@@ -1,3 +1,26 @@
+2013-01-20 Dominic Mazzoni <dmazz...@google.com>
+
+ Make SpeechSynthesis compile in the Chromium port
+ https://bugs.webkit.org/show_bug.cgi?id=107382
+
+ Reviewed by Adam Barth.
+
+ Add stubs for the Chromium implementation of speech synthesis,
+ and add all source and header files to WebCore.gypi. Everything
+ is behind the ENABLE_SPEECH_SYNTHESIS flag.
+
+ * Modules/speech/chromium/SpeechSynthesisChromium.cpp: Added.
+ (WebCore):
+ (WebCore::SpeechSynthesis::initializeVoiceList):
+ (WebCore::SpeechSynthesis::pending):
+ (WebCore::SpeechSynthesis::speaking):
+ (WebCore::SpeechSynthesis::paused):
+ (WebCore::SpeechSynthesis::speak):
+ (WebCore::SpeechSynthesis::cancel):
+ (WebCore::SpeechSynthesis::pause):
+ (WebCore::SpeechSynthesis::resume):
+ * WebCore.gypi:
+
2013-01-20 Kent Tamura <tk...@chromium.org>
Re-layout child blocks when border/padding of the box-sizing:border-box parent is updated
Added: trunk/Source/WebCore/Modules/speech/chromium/SpeechSynthesisChromium.cpp (0 => 140297)
--- trunk/Source/WebCore/Modules/speech/chromium/SpeechSynthesisChromium.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/speech/chromium/SpeechSynthesisChromium.cpp 2013-01-21 06:13:34 UTC (rev 140297)
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2013 Google Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "SpeechSynthesis.h"
+
+#if ENABLE(SPEECH_SYNTHESIS)
+
+#include "SpeechSynthesisUtterance.h"
+#include "SpeechSynthesisVoice.h"
+
+namespace WebCore {
+
+void SpeechSynthesis::initializeVoiceList()
+{
+}
+
+bool SpeechSynthesis::pending() const
+{
+ return false;
+}
+
+bool SpeechSynthesis::speaking() const
+{
+ return false;
+}
+
+bool SpeechSynthesis::paused() const
+{
+ return false;
+}
+
+void SpeechSynthesis::speak(SpeechSynthesisUtterance*)
+{
+}
+
+void SpeechSynthesis::cancel()
+{
+}
+
+void SpeechSynthesis::pause()
+{
+}
+
+void SpeechSynthesis::resume()
+{
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(SPEECH_SYNTHESIS)
Modified: trunk/Source/WebCore/WebCore.gypi (140296 => 140297)
--- trunk/Source/WebCore/WebCore.gypi 2013-01-21 06:10:23 UTC (rev 140296)
+++ trunk/Source/WebCore/WebCore.gypi 2013-01-21 06:13:34 UTC (rev 140297)
@@ -100,6 +100,7 @@
'Modules/quota/StorageInfoQuotaCallback.idl',
'Modules/quota/StorageInfoUsageCallback.idl',
'Modules/speech/DOMWindowSpeech.idl',
+ 'Modules/speech/DOMWindowSpeechSynthesis.idl',
'Modules/speech/SpeechGrammar.idl',
'Modules/speech/SpeechGrammarList.idl',
'Modules/speech/SpeechRecognition.idl',
@@ -108,6 +109,10 @@
'Modules/speech/SpeechRecognitionEvent.idl',
'Modules/speech/SpeechRecognitionResult.idl',
'Modules/speech/SpeechRecognitionResultList.idl',
+ 'Modules/speech/SpeechSynthesis.idl',
+ 'Modules/speech/SpeechSynthesisEvent.idl',
+ 'Modules/speech/SpeechSynthesisUtterance.idl',
+ 'Modules/speech/SpeechSynthesisVoice.idl',
'Modules/webaudio/AudioBuffer.idl',
'Modules/webaudio/AudioBufferCallback.idl',
'Modules/webaudio/AudioBufferSourceNode.idl',
@@ -874,6 +879,8 @@
'Modules/quota/StorageInfoErrorCallback.h',
'Modules/quota/StorageInfoQuotaCallback.h',
'Modules/quota/StorageInfoUsageCallback.h',
+ 'Modules/speech/DOMWindowSpeechSynthesis.cpp',
+ 'Modules/speech/DOMWindowSpeechSynthesis.h',
'Modules/speech/SpeechGrammar.cpp',
'Modules/speech/SpeechGrammar.h',
'Modules/speech/SpeechGrammarList.cpp',
@@ -893,6 +900,15 @@
'Modules/speech/SpeechRecognitionResult.h',
'Modules/speech/SpeechRecognitionResultList.cpp',
'Modules/speech/SpeechRecognitionResultList.h',
+ 'Modules/speech/SpeechSynthesis.cpp',
+ 'Modules/speech/SpeechSynthesis.h',
+ 'Modules/speech/SpeechSynthesisEvent.cpp',
+ 'Modules/speech/SpeechSynthesisEvent.h',
+ 'Modules/speech/SpeechSynthesisUtterance.cpp',
+ 'Modules/speech/SpeechSynthesisUtterance.h',
+ 'Modules/speech/SpeechSynthesisVoice.cpp',
+ 'Modules/speech/SpeechSynthesisVoice.h',
+ 'Modules/speech/chromium/SpeechSynthesisChromium.cpp',
'Modules/webaudio/AudioBasicInspectorNode.cpp',
'Modules/webaudio/AudioBasicInspectorNode.h',
'Modules/webaudio/AudioBasicProcessorNode.cpp',
Modified: trunk/Source/WebKit/chromium/ChangeLog (140296 => 140297)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-21 06:10:23 UTC (rev 140296)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-21 06:13:34 UTC (rev 140297)
@@ -1,3 +1,14 @@
+2013-01-20 Dominic Mazzoni <dmazz...@google.com>
+
+ Make SpeechSynthesis compile in the Chromium port
+ https://bugs.webkit.org/show_bug.cgi?id=107382
+
+ Reviewed by Adam Barth.
+
+ Add ENABLE_SPEECH_SYNTHESIS to features.gypi, off by default.
+
+ * features.gypi:
+
2013-01-20 Yoshifumi Inoue <yo...@chromium.org>
Dragging over an element with scrollbars should scroll the element when dragging near edges
Modified: trunk/Source/WebKit/chromium/features.gypi (140296 => 140297)
--- trunk/Source/WebKit/chromium/features.gypi 2013-01-21 06:10:23 UTC (rev 140296)
+++ trunk/Source/WebKit/chromium/features.gypi 2013-01-21 06:13:34 UTC (rev 140297)
@@ -109,6 +109,7 @@
'ENABLE_SCRIPTED_SPEECH=1',
'ENABLE_SHADOW_DOM=1',
'ENABLE_SMOOTH_SCROLLING=1',
+ 'ENABLE_SPEECH_SYNTHESIS=0',
'ENABLE_SQL_DATABASE=1',
'ENABLE_STYLE_SCOPED=1',
'ENABLE_SVG=<(enable_svg)',
