From: Piotr Tworek
Date: Tue, 3 Mar 2015 08:06:45 +0000 (+0900)
Subject: Migrate chromium speech synthesizer code (TTS) to chormium_impl
X-Git-Tag: submit/tizen/20201118.160233~1123
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1cb6c5217e5a6f0a93c4566327d60544c2b7a40e;p=platform%2Fframework%2Fweb%2Fchromium-efl.git
Migrate chromium speech synthesizer code (TTS) to chormium_impl
Can't test it properly now as I don't have a tizen mobile device, but
the code belongs in chromium_impl, not ewk directory.
Change-Id: I85318e6a175ddfa23169cf938c9f540e2e7d8cbb
Signed-off-by: Piotr Tworek
---
diff --git a/tizen_src/build/system.gyp b/tizen_src/build/system.gyp
index 7279a7a..8e61e51 100644
--- a/tizen_src/build/system.gyp
+++ b/tizen_src/build/system.gyp
@@ -256,6 +256,27 @@
'
diff --git a/tizen_src/impl/browser/speech/tts_tizen.h b/tizen_src/chromium_impl/content/browser/speech/tts_tizen.h
old mode 100755
new mode 100644
similarity index 95%
rename from tizen_src/impl/browser/speech/tts_tizen.h
rename to tizen_src/chromium_impl/content/browser/speech/tts_tizen.h
index a3ee33e..1b4d9bd
--- a/tizen_src/impl/browser/speech/tts_tizen.h
+++ b/tizen_src/chromium_impl/content/browser/speech/tts_tizen.h
@@ -9,8 +9,8 @@
typedef int tts_voice_type_e;
#endif
-#include "browser/speech/tts_message_filter_efl.h"
-#include "common/tts_utterance_request_efl.h"
+#include "content/browser/speech/tts_message_filter_efl.h"
+#include "content/common/tts_utterance_request_efl.h"
#include
#include
diff --git a/tizen_src/impl/common/tts_messages_efl.h b/tizen_src/chromium_impl/content/common/tts_messages_efl.h
old mode 100755
new mode 100644
similarity index 97%
rename from tizen_src/impl/common/tts_messages_efl.h
rename to tizen_src/chromium_impl/content/common/tts_messages_efl.h
index 74c2579..512616c
--- a/tizen_src/impl/common/tts_messages_efl.h
+++ b/tizen_src/chromium_impl/content/common/tts_messages_efl.h
@@ -4,7 +4,7 @@
// Multiply-included message file, hence no include guard.
-#include "common/tts_utterance_request_efl.h"
+#include "content/common/tts_utterance_request_efl.h"
#include "ipc/ipc_message_macros.h"
#include "ipc/ipc_param_traits.h"
diff --git a/tizen_src/impl/common/tts_utterance_request_efl.cc b/tizen_src/chromium_impl/content/common/tts_utterance_request_efl.cc
old mode 100755
new mode 100644
similarity index 89%
rename from tizen_src/impl/common/tts_utterance_request_efl.cc
rename to tizen_src/chromium_impl/content/common/tts_utterance_request_efl.cc
index 609d094..fd7bbb7
--- a/tizen_src/impl/common/tts_utterance_request_efl.cc
+++ b/tizen_src/chromium_impl/content/common/tts_utterance_request_efl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "tts_utterance_request_efl.h"
+#include "content/common/tts_utterance_request_efl.h"
namespace content {
diff --git a/tizen_src/impl/common/tts_utterance_request_efl.h b/tizen_src/chromium_impl/content/common/tts_utterance_request_efl.h
old mode 100755
new mode 100644
similarity index 100%
rename from tizen_src/impl/common/tts_utterance_request_efl.h
rename to tizen_src/chromium_impl/content/common/tts_utterance_request_efl.h
diff --git a/tizen_src/chromium_impl/content/content_efl.gypi b/tizen_src/chromium_impl/content/content_efl.gypi
index 63dee173..b0b7a6d 100644
--- a/tizen_src/chromium_impl/content/content_efl.gypi
+++ b/tizen_src/chromium_impl/content/content_efl.gypi
@@ -8,6 +8,7 @@
'<(DEPTH)/tizen_src/build/system.gyp:ecore-x',
'<(DEPTH)/tizen_src/build/system.gyp:capi-appfw-application',
'<(DEPTH)/tizen_src/build/system.gyp:gstreamer',
+ '<(DEPTH)/tizen_src/build/system.gyp:tts',
],
'external_content_browser_deps': [
'<(DEPTH)/tizen_src/build/system.gyp:ecore',
@@ -17,6 +18,10 @@
'<(DEPTH)/tizen_src/build/system.gyp:efl-assist',
'<(DEPTH)/tizen_src/chromium_impl/efl/efl.gyp:window-factory',
'<(DEPTH)/tizen_src/build/system.gyp:gstreamer',
+ '<(DEPTH)/tizen_src/build/system.gyp:tts',
+ ],
+ 'external_content_renderer_deps': [
+ '<(DEPTH)/tizen_src/build/system.gyp:tts',
],
'external_content_gpu_deps': [
'<(DEPTH)/tizen_src/build/system.gyp:evas',
@@ -58,6 +63,13 @@
'common/wrt/wrt_url_parse.h',
],
'conditions': [
+ ['building_for_tizen_mobile==1', {
+ 'sources': [
+ 'common/tts_messages_efl.h',
+ 'common/tts_utterance_request_efl.cc',
+ 'common/tts_utterance_request_efl.h',
+ ],
+ }], # building_for_tizen_mobile==1
['building_for_tizen==1', {
'sources': [
'common/gpu/client/gpu_memory_buffer_impl_efl.cc',
@@ -71,7 +83,7 @@
[ 'exclude', 'common/gpu/client/gpu_memory_buffer_impl_linux.cc$' ],
[ 'exclude', 'common/gpu/gpu_memory_buffer_factory_linux.cc' ],
]
- }],
+ }], # building_for_tizen==1
['tizen_multimedia_support==1', {
'sources': [
'common/media/efl/media_player_messages_enums_efl.h',
@@ -81,7 +93,7 @@
'common/gpu/media/efl/tizen_video_encode_accelerator.h',
'common/gpu/media/efl/tizen_video_encode_accelerator.cc',
],
- }],
+ }], # tizen_multimedia_support==1
],
}],
@@ -102,6 +114,14 @@
'browser/renderer_host/web_event_factory_efl.cc',
],
'conditions': [
+ ['building_for_tizen_mobile==1', {
+ 'sources': [
+ 'browser/speech/tts_message_filter_efl.cc',
+ 'browser/speech/tts_message_filter_efl.h',
+ 'browser/speech/tts_tizen.cc',
+ 'browser/speech/tts_tizen.h',
+ ],
+ }], # building_for_tizen_mobile==1
['tizen_multimedia_support==1', {
'sources': [
'browser/media/media_web_contents_observer_efl.cc',
@@ -113,7 +133,7 @@
'browser/media/efl/browser_media_player_manager_efl.cc',
'browser/media/efl/browser_media_player_manager_efl.h',
],
- }],
+ }], # tizen_multimedia_support==1
],
}],
@@ -125,6 +145,12 @@
'<(DEPTH)/content/renderer/external_popup_menu.h',
],
'conditions': [
+ ['building_for_tizen_mobile==1', {
+ 'sources': [
+ 'renderer/tts_dispatcher_efl.cc',
+ 'renderer/tts_dispatcher_efl.h',
+ ],
+ }], # building_for_tizen_mobile==1
['tizen_multimedia_support==1', {
'sources/': [
[ 'exclude', 'renderer/media/audio_decoder\\.(cc|h)$' ],
@@ -139,7 +165,7 @@
'renderer/media/efl/renderer_media_player_manager_efl.cc',
'renderer/media/efl/renderer_media_player_manager_efl.h',
],
- }],
+ }], # tizen_multimedia_support==1
],
}],
diff --git a/tizen_src/impl/renderer/tts_dispatcher_efl.cc b/tizen_src/chromium_impl/content/renderer/tts_dispatcher_efl.cc
old mode 100755
new mode 100644
similarity index 97%
rename from tizen_src/impl/renderer/tts_dispatcher_efl.cc
rename to tizen_src/chromium_impl/content/renderer/tts_dispatcher_efl.cc
index 0276a66..ceeff6c
--- a/tizen_src/impl/renderer/tts_dispatcher_efl.cc
+++ b/tizen_src/chromium_impl/content/renderer/tts_dispatcher_efl.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "renderer/tts_dispatcher_efl.h"
+#include "content/renderer/tts_dispatcher_efl.h"
#include "base/logging.h"
#include "base/basictypes.h"
#include "base/strings/utf_string_conversions.h"
-#include "common/tts_messages_efl.h"
-#include "common/tts_utterance_request_efl.h"
+#include "content/common/tts_messages_efl.h"
+#include "content/common/tts_utterance_request_efl.h"
#include "content/public/renderer/render_thread.h"
#include "third_party/WebKit/public/platform/WebCString.h"
#include "third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h"
diff --git a/tizen_src/impl/renderer/tts_dispatcher_efl.h b/tizen_src/chromium_impl/content/renderer/tts_dispatcher_efl.h
old mode 100755
new mode 100644
similarity index 100%
rename from tizen_src/impl/renderer/tts_dispatcher_efl.h
rename to tizen_src/chromium_impl/content/renderer/tts_dispatcher_efl.h