<!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>[170007] trunk</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/170007">170007</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-16 05:17:10 -0700 (Mon, 16 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/170003">r170003</a>.
https://bugs.webkit.org/show_bug.cgi?id=133938
This patch broke GTK build (Requested by kczech on #webkit).
Reverted changeset:
"[EFL] Platform support for WebSpeech feature."
https://bugs.webkit.org/show_bug.cgi?id=116438
http://trac.webkit.org/changeset/170003</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformSpeechSynthesizerh">trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformeflPlatformSpeechSynthesisProviderEflcpp">trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformeflPlatformSpeechSynthesisProviderEflh">trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflPlatformSpeechSynthesizerEflcpp">trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesizerEfl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (170006 => 170007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-06-16 11:31:38 UTC (rev 170006)
+++ trunk/ChangeLog 2014-06-16 12:17:10 UTC (rev 170007)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-16 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r170003.
+ https://bugs.webkit.org/show_bug.cgi?id=133938
+
+ This patch broke GTK build (Requested by kczech on #webkit).
+
+ Reverted changeset:
+
+ "[EFL] Platform support for WebSpeech feature."
+ https://bugs.webkit.org/show_bug.cgi?id=116438
+ http://trac.webkit.org/changeset/170003
+
</ins><span class="cx"> 2014-06-16 Krzysztof Czech <k.czech@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Platform support for WebSpeech feature.
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (170006 => 170007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-06-16 11:31:38 UTC (rev 170006)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-06-16 12:17:10 UTC (rev 170007)
</span><span class="lines">@@ -15,7 +15,6 @@
</span><span class="cx"> "${WEBCORE_DIR}/Modules/plugins"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/proximity"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/quota"
</span><del>- "${WEBCORE_DIR}/Modules/speech"
</del><span class="cx"> "${WEBCORE_DIR}/Modules/vibration"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/webaudio"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/webdatabase"
</span><span class="lines">@@ -246,12 +245,6 @@
</span><span class="cx">
</span><span class="cx"> Modules/proximity/DeviceProximityEvent.idl
</span><span class="cx">
</span><del>- Modules/speech/DOMWindowSpeechSynthesis.idl
- Modules/speech/SpeechSynthesis.idl
- Modules/speech/SpeechSynthesisEvent.idl
- Modules/speech/SpeechSynthesisUtterance.idl
- Modules/speech/SpeechSynthesisVoice.idl
-
</del><span class="cx"> Modules/vibration/NavigatorVibration.idl
</span><span class="cx">
</span><span class="cx"> Modules/webaudio/AnalyserNode.idl
</span><span class="lines">@@ -886,12 +879,6 @@
</span><span class="cx"> Modules/proximity/DeviceProximityController.cpp
</span><span class="cx"> Modules/proximity/DeviceProximityEvent.cpp
</span><span class="cx">
</span><del>- Modules/speech/DOMWindowSpeechSynthesis.cpp
- Modules/speech/SpeechSynthesis.cpp
- Modules/speech/SpeechSynthesisEvent.cpp
- Modules/speech/SpeechSynthesisUtterance.cpp
- Modules/speech/SpeechSynthesisVoice.cpp
-
</del><span class="cx"> Modules/vibration/NavigatorVibration.cpp
</span><span class="cx"> Modules/vibration/Vibration.cpp
</span><span class="cx">
</span><span class="lines">@@ -1983,9 +1970,6 @@
</span><span class="cx"> platform/MemoryPressureHandler.cpp
</span><span class="cx"> platform/NotImplemented.cpp
</span><span class="cx"> platform/PlatformEvent.cpp
</span><del>- platform/PlatformSpeechSynthesisUtterance.cpp
- platform/PlatformSpeechSynthesisVoice.cpp
- platform/PlatformSpeechSynthesizer.cpp
</del><span class="cx"> platform/PlatformStrategies.cpp
</span><span class="cx"> platform/RemoteCommandListener.cpp
</span><span class="cx"> platform/SystemSleepListener.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170006 => 170007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-16 11:31:38 UTC (rev 170006)
+++ trunk/Source/WebCore/ChangeLog 2014-06-16 12:17:10 UTC (rev 170007)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-16 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r170003.
+ https://bugs.webkit.org/show_bug.cgi?id=133938
+
+ This patch broke GTK build (Requested by kczech on #webkit).
+
+ Reverted changeset:
+
+ "[EFL] Platform support for WebSpeech feature."
+ https://bugs.webkit.org/show_bug.cgi?id=116438
+ http://trac.webkit.org/changeset/170003
+
</ins><span class="cx"> 2014-06-16 Frédéric Wang <fred.wang@free.fr>
</span><span class="cx">
</span><span class="cx"> Draw radicals with glyphs for better rendering.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (170006 => 170007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2014-06-16 11:31:38 UTC (rev 170006)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2014-06-16 12:17:10 UTC (rev 170007)
</span><span class="lines">@@ -437,10 +437,3 @@
</span><span class="cx"> ${ATK_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><del>-
-if (ENABLE_SPEECH_SYNTHESIS)
- list(APPEND WebCore_SOURCES
- platform/efl/PlatformSpeechSynthesizerEfl.cpp
- platform/efl/PlatformSpeechSynthesisProviderEfl.cpp
- )
-endif ()
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformSpeechSynthesizerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h (170006 => 170007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h 2014-06-16 11:31:38 UTC (rev 170006)
+++ trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h 2014-06-16 12:17:10 UTC (rev 170007)
</span><span class="lines">@@ -36,14 +36,8 @@
</span><span class="cx"> OBJC_CLASS WebSpeechSynthesisWrapper;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
</del><span class="cx"> namespace WebCore {
</span><del>-class PlatformSpeechSynthesisProviderEfl;
-}
-#endif
</del><span class="cx">
</span><del>-namespace WebCore {
-
</del><span class="cx"> enum SpeechBoundary {
</span><span class="cx"> SpeechWordBoundary,
</span><span class="cx"> SpeechSentenceBoundary
</span><span class="lines">@@ -92,9 +86,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<WebSpeechSynthesisWrapper> m_platformSpeechWrapper;
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(EFL)
- std::unique_ptr<PlatformSpeechSynthesisProviderEfl> m_platformSpeechWrapper;
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflPlatformSpeechSynthesisProviderEflcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp (170006 => 170007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp 2014-06-16 11:31:38 UTC (rev 170006)
+++ trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.cpp 2014-06-16 12:17:10 UTC (rev 170007)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformeflPlatformSpeechSynthesisProviderEflh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h (170006 => 170007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h 2014-06-16 11:31:38 UTC (rev 170006)
+++ trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesisProviderEfl.h 2014-06-16 12:17:10 UTC (rev 170007)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformeflPlatformSpeechSynthesizerEflcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesizerEfl.cpp (170006 => 170007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesizerEfl.cpp 2014-06-16 11:31:38 UTC (rev 170006)
+++ trunk/Source/WebCore/platform/efl/PlatformSpeechSynthesizerEfl.cpp 2014-06-16 12:17:10 UTC (rev 170007)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * 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)
</del></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (170006 => 170007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-06-16 11:31:38 UTC (rev 170006)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-06-16 12:17:10 UTC (rev 170007)
</span><span class="lines">@@ -87,7 +87,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REQUEST_ANIMATION_FRAME ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHARED_WORKERS ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
</span><span class="lines">@@ -289,10 +288,6 @@
</span><span class="cx"> add_definitions(-DHAVE_ACCESSIBILITY=0)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (ENABLE_SPEECH_SYNTHESIS)
- add_definitions(-DENABLE_SPEECH_SYNTHESIS=1)
-endif ()
-
</del><span class="cx"> if (ENABLE_FTL_JIT)
</span><span class="cx"> find_package(LLVM REQUIRED)
</span><span class="cx"> find_package(LIBCXXABI REQUIRED)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (170006 => 170007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2014-06-16 11:31:38 UTC (rev 170006)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2014-06-16 12:17:10 UTC (rev 170007)
</span><span class="lines">@@ -103,7 +103,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SCRIPTED_SPEECH "Toggle Scripted Speech API support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SECCOMP_FILTERS "Toggle Linux seccomp filters for the WebProcess support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SHARED_WORKERS "Toggle SharedWorkers support" OFF)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SQL_DATABASE "Toggle SQL Database Support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG fonts support (imples SVG support)" ON)
</span></span></pre>
</div>
</div>
</body>
</html>