Diff
Modified: trunk/ChangeLog (170287 => 170288)
--- trunk/ChangeLog 2014-06-23 11:11:16 UTC (rev 170287)
+++ trunk/ChangeLog 2014-06-23 12:13:34 UTC (rev 170288)
@@ -1,3 +1,15 @@
+2014-06-23 Krzysztof Czech <[email protected]>
+
+ [EFL] Platform support for WebSpeech feature.
+ https://bugs.webkit.org/show_bug.cgi?id=116438
+
+ Reviewed by Csaba Osztrogonác.
+
+ Add ENABLE_SPEECH_SYNTHESIS flag to have Speech Synthesis in EFL.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
2014-06-23 Philippe Normand <[email protected]>
Unreviewed, GTK build fix after r170266.
Modified: trunk/Source/WebCore/CMakeLists.txt (170287 => 170288)
--- trunk/Source/WebCore/CMakeLists.txt 2014-06-23 11:11:16 UTC (rev 170287)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-06-23 12:13:34 UTC (rev 170288)
@@ -16,6 +16,7 @@
"${WEBCORE_DIR}/Modules/plugins"
"${WEBCORE_DIR}/Modules/proximity"
"${WEBCORE_DIR}/Modules/quota"
+ "${WEBCORE_DIR}/Modules/speech"
"${WEBCORE_DIR}/Modules/vibration"
"${WEBCORE_DIR}/Modules/webaudio"
"${WEBCORE_DIR}/Modules/webdatabase"
@@ -247,6 +248,12 @@
Modules/proximity/DeviceProximityEvent.idl
+ Modules/speech/DOMWindowSpeechSynthesis.idl
+ Modules/speech/SpeechSynthesis.idl
+ Modules/speech/SpeechSynthesisEvent.idl
+ Modules/speech/SpeechSynthesisUtterance.idl
+ Modules/speech/SpeechSynthesisVoice.idl
+
Modules/vibration/NavigatorVibration.idl
Modules/webaudio/AnalyserNode.idl
@@ -881,6 +888,12 @@
Modules/proximity/DeviceProximityController.cpp
Modules/proximity/DeviceProximityEvent.cpp
+ Modules/speech/DOMWindowSpeechSynthesis.cpp
+ Modules/speech/SpeechSynthesis.cpp
+ Modules/speech/SpeechSynthesisEvent.cpp
+ Modules/speech/SpeechSynthesisUtterance.cpp
+ Modules/speech/SpeechSynthesisVoice.cpp
+
Modules/vibration/NavigatorVibration.cpp
Modules/vibration/Vibration.cpp
@@ -1972,6 +1985,9 @@
platform/MemoryPressureHandler.cpp
platform/NotImplemented.cpp
platform/PlatformEvent.cpp
+ platform/PlatformSpeechSynthesisUtterance.cpp
+ platform/PlatformSpeechSynthesisVoice.cpp
+ platform/PlatformSpeechSynthesizer.cpp
platform/PlatformStrategies.cpp
platform/RemoteCommandListener.cpp
platform/SystemSleepListener.cpp
Modified: trunk/Source/WebCore/ChangeLog (170287 => 170288)
--- trunk/Source/WebCore/ChangeLog 2014-06-23 11:11:16 UTC (rev 170287)
+++ trunk/Source/WebCore/ChangeLog 2014-06-23 12:13:34 UTC (rev 170288)
@@ -1,3 +1,35 @@
+2014-06-23 Krzysztof Czech <[email protected]>
+
+ [EFL] Platform support for WebSpeech feature.
+ https://bugs.webkit.org/show_bug.cgi?id=116438
+
+ Reviewed by Csaba Osztrogonác.
+
+ It's a first step of adding support for Speech Synthesis in EFL port.
+ Just stub out required API and support for compilation.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake: Added some idls to not break GTK build.
+ * platform/PlatformSpeechSynthesizer.h:
+ * platform/efl/PlatformSpeechSynthesisProviderEfl.cpp: Added.
+ (WebCore::PlatformSpeechSynthesisProviderEfl::PlatformSpeechSynthesisProviderEfl):
+ (WebCore::PlatformSpeechSynthesisProviderEfl::~PlatformSpeechSynthesisProviderEfl):
+ (WebCore::PlatformSpeechSynthesisProviderEfl::initializeVoiceList):
+ (WebCore::PlatformSpeechSynthesisProviderEfl::pause):
+ (WebCore::PlatformSpeechSynthesisProviderEfl::resume):
+ (WebCore::PlatformSpeechSynthesisProviderEfl::speak):
+ (WebCore::PlatformSpeechSynthesisProviderEfl::cancel):
+ * platform/efl/PlatformSpeechSynthesisProviderEfl.h: Added.
+ * platform/efl/PlatformSpeechSynthesizerEfl.cpp: Added.
+ (WebCore::PlatformSpeechSynthesizer::PlatformSpeechSynthesizer):
+ (WebCore::PlatformSpeechSynthesizer::~PlatformSpeechSynthesizer):
+ (WebCore::PlatformSpeechSynthesizer::initializeVoiceList):
+ (WebCore::PlatformSpeechSynthesizer::pause):
+ (WebCore::PlatformSpeechSynthesizer::resume):
+ (WebCore::PlatformSpeechSynthesizer::speak):
+ (WebCore::PlatformSpeechSynthesizer::cancel):
+
2014-06-23 Jeongeun Kim <[email protected]>
Make it clear to get m_svgExtensions using svgExtensions().
Modified: trunk/Source/WebCore/PlatformEfl.cmake (170287 => 170288)
--- trunk/Source/WebCore/PlatformEfl.cmake 2014-06-23 11:11:16 UTC (rev 170287)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2014-06-23 12:13:34 UTC (rev 170288)
@@ -437,3 +437,10 @@
${ATK_LIBRARIES}
)
endif ()
+
+if (ENABLE_SPEECH_SYNTHESIS)
+ list(APPEND WebCore_SOURCES
+ platform/efl/PlatformSpeechSynthesizerEfl.cpp
+ platform/efl/PlatformSpeechSynthesisProviderEfl.cpp
+ )
+endif ()
Modified: trunk/Source/WebCore/PlatformGTK.cmake (170287 => 170288)
--- trunk/Source/WebCore/PlatformGTK.cmake 2014-06-23 11:11:16 UTC (rev 170287)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-06-23 12:13:34 UTC (rev 170288)
@@ -564,6 +564,12 @@
Modules/quota/StorageInfo.idl
Modules/quota/StorageQuota.idl
+ Modules/speech/DOMWindowSpeechSynthesis.idl
+ Modules/speech/SpeechSynthesis.idl
+ Modules/speech/SpeechSynthesisEvent.idl
+ Modules/speech/SpeechSynthesisUtterance.idl
+ Modules/speech/SpeechSynthesisVoice.idl
+
Modules/webdatabase/Database.idl
css/DOMWindowCSS.idl
Modified: trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h (170287 => 170288)
--- trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h 2014-06-23 11:11:16 UTC (rev 170287)
+++ trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h 2014-06-23 12:13:34 UTC (rev 170288)
@@ -36,8 +36,14 @@
OBJC_CLASS WebSpeechSynthesisWrapper;
#endif
+#if PLATFORM(EFL)
namespace WebCore {
+class PlatformSpeechSynthesisProviderEfl;
+}
+#endif
+namespace WebCore {
+
enum SpeechBoundary {
SpeechWordBoundary,
SpeechSentenceBoundary
@@ -86,6 +92,9 @@
#if PLATFORM(COCOA)
RetainPtr<WebSpeechSynthesisWrapper> m_platformSpeechWrapper;
#endif
+#if PLATFORM(EFL)
+ std::unique_ptr<PlatformSpeechSynthesisProviderEfl> m_platformSpeechWrapper;
+#endif
};
} // namespace WebCore
Added: trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp (0 => 170288)
--- trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp (rev 0)
+++ trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp 2014-06-23 12:13:34 UTC (rev 170288)
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2014 Samsung Electronics
+ *
+ * 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "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 THE COPYRIGHT HOLDER 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 "PlatformSpeechSynthesisProviderEfl.h"
+
+#if ENABLE(SPEECH_SYNTHESIS)
+
+#include <NotImplemented.h>
+#include <PlatformSpeechSynthesisUtterance.h>
+#include <PlatformSpeechSynthesisVoice.h>
+#include <PlatformSpeechSynthesizer.h>
+
+namespace WebCore {
+
+PlatformSpeechSynthesisProviderEfl::PlatformSpeechSynthesisProviderEfl(PlatformSpeechSynthesizer* platformSpeechSynthesizer)
+ : m_platformSpeechSynthesizer(platformSpeechSynthesizer)
+{
+}
+
+PlatformSpeechSynthesisProviderEfl::~PlatformSpeechSynthesisProviderEfl()
+{
+}
+
+void PlatformSpeechSynthesisProviderEfl::initializeVoiceList(Vector<RefPtr<PlatformSpeechSynthesisVoice>>& voiceList)
+{
+ UNUSED_PARAM(voiceList);
+ notImplemented();
+}
+
+void PlatformSpeechSynthesisProviderEfl::pause()
+{
+ notImplemented();
+}
+
+void PlatformSpeechSynthesisProviderEfl::resume()
+{
+ notImplemented();
+}
+
+void PlatformSpeechSynthesisProviderEfl::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
+{
+ UNUSED_PARAM(utterance);
+ notImplemented();
+}
+
+void PlatformSpeechSynthesisProviderEfl::cancel()
+{
+ notImplemented();
+}
+
+} // namespace WebCore
+
+#endif
Added: trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h (0 => 170288)
--- trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h (rev 0)
+++ trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h 2014-06-23 12:13:34 UTC (rev 170288)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2014 Samsung Electronics
+ *
+ * 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "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 THE COPYRIGHT HOLDER 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.
+ */
+
+#ifndef PlatformSpeechSynthesisProviderEfl_h
+#define PlatformSpeechSynthesisProviderEfl_h
+
+#if ENABLE(SPEECH_SYNTHESIS)
+
+#include <wtf/PassRefPtr.h>
+#include <wtf/Vector.h>
+
+namespace WebCore {
+
+class PlatformSpeechSynthesizer;
+class PlatformSpeechSynthesisUtterance;
+class PlatformSpeechSynthesisVoice;
+
+class PlatformSpeechSynthesisProviderEfl {
+public:
+ explicit PlatformSpeechSynthesisProviderEfl(PlatformSpeechSynthesizer*);
+ ~PlatformSpeechSynthesisProviderEfl();
+
+ void initializeVoiceList(Vector<RefPtr<PlatformSpeechSynthesisVoice>>&);
+ void pause();
+ void resume();
+ void speak(PassRefPtr<PlatformSpeechSynthesisUtterance>);
+ void cancel();
+private:
+ PlatformSpeechSynthesizer* m_platformSpeechSynthesizer;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(SPEECH_SYNTHESIS)
+
+#endif // PlatformSpeechSynthesisProviderEfl_h
Added: trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesizerEfl.cpp (0 => 170288)
--- trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesizerEfl.cpp (rev 0)
+++ trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesizerEfl.cpp 2014-06-23 12:13:34 UTC (rev 170288)
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2014 Samsung Electronics
+ *
+ * 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "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 THE COPYRIGHT HOLDER 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 "PlatformSpeechSynthesizer.h"
+
+#if ENABLE(SPEECH_SYNTHESIS)
+
+#include <PlatformSpeechSynthesisProviderEfl.h>
+#include <PlatformSpeechSynthesisUtterance.h>
+#include <PlatformSpeechSynthesisVoice.h>
+
+namespace WebCore {
+
+PlatformSpeechSynthesizer::PlatformSpeechSynthesizer(PlatformSpeechSynthesizerClient* client)
+ : m_voiceListIsInitialized(false)
+ , m_speechSynthesizerClient(client)
+ , m_platformSpeechWrapper(std::make_unique<PlatformSpeechSynthesisProviderEfl>(this))
+
+{
+}
+
+PlatformSpeechSynthesizer::~PlatformSpeechSynthesizer()
+{
+}
+
+void PlatformSpeechSynthesizer::initializeVoiceList()
+{
+ m_platformSpeechWrapper->initializeVoiceList(m_voiceList);
+}
+
+void PlatformSpeechSynthesizer::pause()
+{
+ m_platformSpeechWrapper->pause();
+}
+
+void PlatformSpeechSynthesizer::resume()
+{
+ m_platformSpeechWrapper->resume();
+}
+
+void PlatformSpeechSynthesizer::speak(PassRefPtr<PlatformSpeechSynthesisUtterance> utterance)
+{
+ m_platformSpeechWrapper->speak(utterance);
+}
+
+void PlatformSpeechSynthesizer::cancel()
+{
+ m_platformSpeechWrapper->cancel();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(SPEECH_SYNTHESIS)
Modified: trunk/Source/cmake/OptionsEfl.cmake (170287 => 170288)
--- trunk/Source/cmake/OptionsEfl.cmake 2014-06-23 11:11:16 UTC (rev 170287)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-06-23 12:13:34 UTC (rev 170288)
@@ -85,6 +85,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REQUEST_ANIMATION_FRAME ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
@@ -285,6 +286,10 @@
add_definitions(-DHAVE_ACCESSIBILITY=0)
endif ()
+if (ENABLE_SPEECH_SYNTHESIS)
+ add_definitions(-DENABLE_SPEECH_SYNTHESIS=1)
+endif ()
+
if (ENABLE_FTL_JIT)
find_package(LLVM REQUIRED)
find_package(LIBCXXABI REQUIRED)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (170287 => 170288)
--- trunk/Source/cmake/WebKitFeatures.cmake 2014-06-23 11:11:16 UTC (rev 170287)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2014-06-23 12:13:34 UTC (rev 170288)
@@ -102,6 +102,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_SCRIPTED_SPEECH "Toggle Scripted Speech API support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SECCOMP_FILTERS "Toggle Linux seccomp filters for the WebProcess support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SHARED_WORKERS "Toggle SharedWorkers support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SQL_DATABASE "Toggle SQL Database Support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG fonts support (imples SVG support)" ON)
