This commit resolves compiler errors for tizen standard profile.
This also includes changes from https://review.tizen.org/gerrit/#/c/172051/.
Change-Id: If3cc715d36e71c7bdf1a04f912704f13f3294ae8
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>
":base_win_linker_flags",
"//tools/win/DebugVisualizers:chrome",
]
- } else if ((!is_nacl && !is_fuchsia) || is_nacl_nonsfi) {
+ } else if (!is_tizen && ((!is_nacl && !is_fuchsia) || is_nacl_nonsfi)) {
# Non-Windows.
deps += [ "//base/third_party/libevent" ]
}
# Linux/Android/Fuchsia common flags setup.
# ---------------------------------
- if (is_linux || is_android || is_fuchsia) {
+ if (is_linux || is_android || is_fuchsia || is_tizen) {
if (use_pic) {
cflags += [ "-fPIC" ]
ldflags += [ "-fPIC" ]
# to set up feature flags.
# True if NSS is used for certificate handling.
-use_nss_certs = is_linux
+use_nss_certs = is_linux || is_tizen
}
pkgresult = exec_script(pkg_config_script, args, "value")
+ include_dirs = pkgresult[0]
cflags = pkgresult[1]
# We want the system include paths to use -isystem instead of -I to suppress
# warnings in those headers.
- foreach(include, pkgresult[0]) {
- include_relativized = rebase_path(include, root_build_dir)
- cflags += [ "-isystem$include_relativized" ]
- }
+ #foreach(include, pkgresult[0]) {
+ # include_relativized = rebase_path(include, root_build_dir)
+ # cflags += [ "-isystem$include_relativized" ]
+ #}
if (!defined(invoker.ignore_libs) || !invoker.ignore_libs) {
libs = pkgresult[2]
target_arch = "mac"
} else if (is_linux) {
target_arch = "linux"
+ } else if (is_tizen) {
+ target_arch = "tizen"
} else {
# This will cause the script to fail.
target_arch = "unknown_target_arch"
"linux": download_file_types_pb2.DownloadFileType.PLATFORM_LINUX,
"mac": download_file_types_pb2.DownloadFileType.PLATFORM_MAC,
"win": download_file_types_pb2.DownloadFileType.PLATFORM_WINDOWS,
+ "tizen": download_file_types_pb2.DownloadFileType.PLATFORM_ANY,
}
std::unique_ptr<DeviceManagementService> device_management_service) {
device_management_service_ = std::move(device_management_service);
+#if defined(OS_TIZEN)
+ // FIXME: For EWK_BRINGUP.
+ NOTIMPLEMENTED();
+#else
policy_statistics_collector_.reset(new policy::PolicyStatisticsCollector(
base::Bind(&GetChromePolicyDetails), GetChromeSchema(),
GetPolicyService(), local_state, base::ThreadTaskRunnerHandle::Get()));
policy_statistics_collector_->Initialize();
+#endif
}
void BrowserPolicyConnector::Shutdown() {
'void SetEnterpriseUsersDefaults(PolicyMap* policy_map);\n'
'#endif\n'
'\n'
+ '#if !defined (OS_TIZEN)\n'
'// Returns the PolicyDetails for |policy| if |policy| is a known\n'
'// Chrome policy, otherwise returns NULL.\n'
'const PolicyDetails* GetChromePolicyDetails('
'const std::string& policy);\n'
+ '#endif\n'
'\n'
'// Returns the schema data of the Chrome policy schema.\n'
'const internal::SchemaData* GetChromeSchemaData();\n'
f.write('}\n'
'#endif\n\n')
- f.write('const PolicyDetails* GetChromePolicyDetails('
+ f.write('#if !defined (OS_TIZEN)\n'
+ 'const PolicyDetails* GetChromePolicyDetails('
'const std::string& policy) {\n'
' // First index in kPropertyNodes of the Chrome policies.\n'
' static const int begin_index = %s;\n'
' size_t index = it - begin;\n'
' CHECK_LT(index, arraysize(kChromePolicyDetails));\n'
' return kChromePolicyDetails + index;\n'
- '}\n\n')
+ '}\n'
+ '#endif\n\n')
f.write('namespace key {\n\n')
for policy in policies:
if (enable_ipc_logging) {
enabled_features += [ "ipc_logging" ]
}
- if (is_linux || is_chromeos) {
+ if (is_linux || is_chromeos || is_tizen) {
enabled_features += [ "supports_thread_priorities" ]
}
%define _debug_mode 1
%endif
+%define _smp_mflags -j%(echo $((`/usr/bin/getconf _NPROCESSORS_ONLN` / 2)))
+
# Conditions for OBS build
# The OBS build does not support running script 'build_{target}.sh'.
# TODO: There is a bug regarding mismatched versions from repository.
Requires(post): xkeyboard-config
Requires(postun): /sbin/ldconfig
+BuildRequires: binutils-gold
BuildRequires: bison, edje-tools, expat-devel, flex, gettext, gperf, libcap-devel
BuildRequires: libjpeg-turbo-devel, ninja, perl, python, python-xml, which
BuildRequires: pkgconfig(capi-appfw-application)
BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(libdrm)
+BuildRequires: pkgconfig(libevent)
BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libffi)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(xtst)
%endif
-# TODO(youngsoo): The binutils-gold crashes mini_browser on the Tizen v3.0 ARM 64 bit images.
-# Once fixed, use binutils-gold for all targets on Tizen v3.0.
-%ifnarch aarch64 %{arm} # [M48_2564] Temporary excluding arm architecture for fixing memory issue
- # FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15383
-%if "%{chromium_efl_tizen_version}" == "3.0"
-BuildRequires: binutils-gold
-%endif
-%endif
-
%if "%{?chromium_efl_tizen_version}%{!?chromium_efl_tizen_version:0}" == "2.4"
BuildRequires: pkgconfig(glesv2)
%endif
source tizen_src/build/ccache_env.sh %{OUTPUT_BUILD_PROFILE_TARGET}
fi
+%if 0%{!?_skip_gn:1}
#gn generate
#run standard gn_chromiumefl wrapper
./tizen_src/build/gn_chromiumefl.sh \
"component=\"shared_library\"" \
%endif
"is_tizen=true"
+%endif # _skip_gn
ninja %{_smp_mflags} -C"%{OUTPUT_FOLDER}" \
%if 0%{?_enable_content_shell}
os_dump->resident_set_kb = internal_os_dump.resident_set_kb;
os_dump->private_footprint_kb =
CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb);
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if (defined(OS_LINUX) || defined(OS_ANDROID)) && !defined(OS_TIZEN)
os_dump->private_footprint_swap_kb =
internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024;
#endif
# also: |rtc_initialize_ffmpeg|.
# CHECK THE OPENH264, FFMPEG AND H.264 LICENSES/PATENTS BEFORE BUILDING.
# http://www.openh264.org, https://www.ffmpeg.org/
- rtc_use_h264 = proprietary_codecs && !is_android && !is_ios
+ rtc_use_h264 = proprietary_codecs && !is_android && !is_ios && !is_tizen
# By default, use normal platform audio support or dummy audio, but don't
# use file-based audio playout and record.
"../../third_party/webrtc_overrides",
"../../testing/gtest/include",
"../../third_party/libyuv/include",
- "../../third_party/usrsctp/usrsctplib",
"../../third_party/webrtc",
]
}
deps = [
":webrtc",
"//third_party/libsrtp",
- "//third_party/usrsctp",
"//third_party/webrtc/media:rtc_media",
"//third_party/webrtc/media:rtc_media_base",
"//third_party/webrtc/modules/video_capture",
COMMON_GN_PARAMETERS="use_libjpeg_turbo=true
proprietary_codecs=true
+ rtc_enable_sctp=false
use_alsa=false
use_aura=false
use_kerberos=false
"
SYSTEM_DEPS="--system-libraries
+ libevent
libpng
+ libxml
+ libxslt
zlib
"
prebuilt_ld_gold_dir=\"${TOPDIR}/tizen_src/build/prebuild/tizen_v2.4_tv\"
"
else
- ADDITIONAL_GN_PARAMETERS+="linux_use_gold_flags=false
- prebuilt_ld_gold_dir=\"${TOPDIR}/tizen_src/build/prebuild\"
+ ADDITIONAL_GN_PARAMETERS+="linux_use_gold_flags=true
"
fi
]
if (is_tizen) {
- external_exclude_content_browser_efl_sources = [ "//tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_shared_memory_tizen.cc" ]
+ external_exclude_content_browser_efl_sources = [
+ # "//tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_shared_memory_tizen.cc"
+ ]
external_content_browser_efl_sources += [
- "//tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.cc",
- "//tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.h",
- "//tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_shared_memory_tizen.cc",
+ # "//tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.cc",
+ # "//tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.h",
+ # "//tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_shared_memory_tizen.cc",
"//tizen_src/chromium_impl/content/browser/speech/tts_message_filter_efl.cc",
"//tizen_src/chromium_impl/content/browser/speech/tts_message_filter_efl.h",
"//tizen_src/chromium_impl/content/browser/speech/tts_tizen.cc",
base::AutoLock autolock(motion_buffer_lock_);
device_motion_buffer_ = buffer;
}
- sensor_listener_set_event_cb(listener_accelerometer_,
- kInertialSensorIntervalMicroseconds / 1000,
+ sensor_listener_set_event_cb(
+ listener_accelerometer_, kDeviceSensorIntervalMicroseconds / 1000,
DataFetcherImplTizen::onAccelerationChanged, this);
return Start(CONSUMER_TYPE_MOTION);
}
base::AutoLock autolock(orientation_buffer_lock_);
device_orientation_buffer_ = buffer;
}
- sensor_listener_set_event_cb(listener_orientation_,
- kInertialSensorIntervalMicroseconds / 1000,
+ sensor_listener_set_event_cb(
+ listener_orientation_, kDeviceSensorIntervalMicroseconds / 1000,
DataFetcherImplTizen::onOrientationChanged, this);
bool success = Start(CONSUMER_TYPE_ORIENTATION);
float roll = event->values[2];
fetcher->device_orientation_buffer_->data.alpha = azimuth;
- fetcher->device_orientation_buffer_->data.hasAlpha = true;
+ fetcher->device_orientation_buffer_->data.has_alpha = true;
fetcher->device_orientation_buffer_->data.beta = pitch;
- fetcher->device_orientation_buffer_->data.hasBeta = true;
+ fetcher->device_orientation_buffer_->data.has_beta = true;
fetcher->device_orientation_buffer_->data.gamma = roll;
- fetcher->device_orientation_buffer_->data.hasGamma = true;
+ fetcher->device_orientation_buffer_->data.has_gamma = true;
fetcher->device_orientation_buffer_->seqlock.WriteEnd();
if (!fetcher->is_orientation_buffer_ready_)
unsigned long long timestamp = event->timestamp;
- double interval = static_cast<double>(self->last_motion_timestamp_ ?
- (timestamp - self->last_motion_timestamp_) / 1000 :
- kInertialSensorIntervalMicroseconds / 1000);
+ double interval = static_cast<double>(
+ self->last_motion_timestamp_
+ ? (timestamp - self->last_motion_timestamp_) / 1000
+ : kDeviceSensorIntervalMicroseconds / 1000);
self->last_motion_timestamp_ = timestamp;
if (self->has_last_motion_data_) {
- const blink::WebDeviceMotionData* m = &self->last_motion_data_;
- gravityX += (m->accelerationIncludingGravityX - m->accelerationX) * 0.8f;
- gravityY += (m->accelerationIncludingGravityY - m->accelerationY) * 0.8f;
- gravityZ += (m->accelerationIncludingGravityZ - m->accelerationZ) * 0.8f;
+ const DeviceMotionHardwareBuffer* m = self->last_motion_data_;
+ gravityX +=
+ (m->data.acceleration_including_gravity_x - m->data.acceleration_x) *
+ 0.8f;
+ gravityY +=
+ (m->data.acceleration_including_gravity_x - m->data.acceleration_y) *
+ 0.8f;
+ gravityZ +=
+ (m->data.acceleration_including_gravity_z - m->data.acceleration_z) *
+ 0.8f;
accelerationAvailable = true;
}
self->device_motion_buffer_->seqlock.WriteBegin();
- self->device_motion_buffer_->data.accelerationIncludingGravityX = x;
- self->device_motion_buffer_->data.hasAccelerationIncludingGravityX = true;
- self->device_motion_buffer_->data.accelerationIncludingGravityY = y;
- self->device_motion_buffer_->data.hasAccelerationIncludingGravityY = true;
- self->device_motion_buffer_->data.accelerationIncludingGravityZ = z;
- self->device_motion_buffer_->data.hasAccelerationIncludingGravityZ = true;
-
- self->device_motion_buffer_->data.accelerationX = x - gravityX;
- self->device_motion_buffer_->data.hasAccelerationX = accelerationAvailable;
- self->device_motion_buffer_->data.accelerationY = y - gravityY;
- self->device_motion_buffer_->data.hasAccelerationY = accelerationAvailable;
- self->device_motion_buffer_->data.accelerationZ = z - gravityZ;
- self->device_motion_buffer_->data.hasAccelerationZ = accelerationAvailable;
-
- self->device_motion_buffer_->data.rotationRateAlpha = alpha;
- self->device_motion_buffer_->data.hasRotationRateAlpha = rotationRateAvailable;
- self->device_motion_buffer_->data.rotationRateBeta = beta;
- self->device_motion_buffer_->data.hasRotationRateBeta = rotationRateAvailable;
- self->device_motion_buffer_->data.rotationRateGamma = gamma;
- self->device_motion_buffer_->data.hasRotationRateGamma = rotationRateAvailable;
-
- self->device_motion_buffer_->data.allAvailableSensorsAreActive =
+ self->device_motion_buffer_->data.acceleration_including_gravity_x = x;
+ self->device_motion_buffer_->data.has_acceleration_including_gravity_x = true;
+ self->device_motion_buffer_->data.acceleration_including_gravity_x = y;
+ self->device_motion_buffer_->data.has_acceleration_including_gravity_x = true;
+ self->device_motion_buffer_->data.acceleration_including_gravity_z = z;
+ self->device_motion_buffer_->data.has_acceleration_including_gravity_z = true;
+
+ self->device_motion_buffer_->data.acceleration_x = x - gravityX;
+ self->device_motion_buffer_->data.has_acceleration_x = accelerationAvailable;
+ self->device_motion_buffer_->data.acceleration_y = y - gravityY;
+ self->device_motion_buffer_->data.has_acceleration_y = accelerationAvailable;
+ self->device_motion_buffer_->data.acceleration_z = z - gravityZ;
+ self->device_motion_buffer_->data.has_acceleration_z = accelerationAvailable;
+
+ self->device_motion_buffer_->data.rotation_rate_alpha = alpha;
+ self->device_motion_buffer_->data.has_rotation_rate_alpha =
+ rotationRateAvailable;
+ self->device_motion_buffer_->data.rotation_rate_beta = beta;
+ self->device_motion_buffer_->data.has_rotation_rate_beta =
+ rotationRateAvailable;
+ self->device_motion_buffer_->data.rotation_rate_gamma = gamma;
+ self->device_motion_buffer_->data.has_rotation_rate_gamma =
+ rotationRateAvailable;
+
+ self->device_motion_buffer_->data.all_available_sensors_are_active =
(accelerationAvailable && rotationRateAvailable);
- self->last_motion_data_ = self->device_motion_buffer_->data;
+ self->last_motion_data_ = self->device_motion_buffer_;
self->has_last_motion_data_ = true;
self->device_motion_buffer_->data.interval = interval;
void DataFetcherImplTizen::SetOrientationBufferReadyStatus(bool ready) {
device_orientation_buffer_->seqlock.WriteBegin();
device_orientation_buffer_->data.absolute = ready;
- device_orientation_buffer_->data.allAvailableSensorsAreActive = ready;
+ device_orientation_buffer_->data.all_available_sensors_are_active = ready;
device_orientation_buffer_->seqlock.WriteEnd();
is_orientation_buffer_ready_ = ready;
}
#include <sensor/sensor.h>
#include "base/synchronization/lock.h"
-#include "content/browser/device_sensors/device_sensors_consts.h"
-#include "content/common/device_sensors/device_motion_hardware_buffer.h"
-#include "content/common/device_sensors/device_orientation_hardware_buffer.h"
+#include "device/sensors/device_sensors_consts.h"
+#include "device/sensors/public/cpp/device_motion_hardware_buffer.h"
+#include "device/sensors/public/cpp/device_orientation_hardware_buffer.h"
namespace base {
template<typename T> struct DefaultSingletonTraits;
namespace content {
+using namespace device;
+
+// FIXME: This class should be moved to device namespace.
class DataFetcherImplTizen {
public:
static DataFetcherImplTizen* GetInstance();
DeviceMotionHardwareBuffer* device_motion_buffer_;
DeviceOrientationHardwareBuffer* device_orientation_buffer_;
- blink::WebDeviceMotionData last_motion_data_;
+ DeviceMotionHardwareBuffer* last_motion_data_;
bool has_last_motion_data_;
unsigned long long last_motion_timestamp_;
bool is_orientation_buffer_ready_;
#include "base/logging.h"
#include "content/browser/device_sensors/data_fetcher_shared_memory.h"
-#include "content/common/device_sensors/device_motion_hardware_buffer.h"
-#include "content/common/device_sensors/device_orientation_hardware_buffer.h"
+#include "device/sensors/public/cpp/device_motion_hardware_buffer.h"
+#include "device/sensors/public/cpp/device_orientation_hardware_buffer.h"
#include "tizen/system_info.h"
namespace content {
"//tizen_src/chromium_impl/content/common/gpu/gpu_memory_buffer_factory_efl.cc",
]
- if (!wayland_bringup) {
+ if (!ewk_bringup) {
external_content_common_efl_sources += [
"//tizen_src/chromium_impl/content/common/gpu/client/gpu_memory_buffer_impl_efl_pixmap.cc",
"//tizen_src/chromium_impl/content/common/gpu/client/gpu_memory_buffer_impl_efl_pixmap.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/blink/public/platform/WebCString.h"
-#include "third_party/blink/public/platform/WebSpeechSynthesisUtterance.h"
-#include "third_party/blink/public/platform/WebSpeechSynthesisVoice.h"
-#include "third_party/blink/public/platform/WebString.h"
-#include "third_party/blink/public/platform/WebVector.h"
+#include "third_party/blink/public/platform/web_speech_synthesis_utterance.h"
+#include "third_party/blink/public/platform/web_speech_synthesis_voice.h"
+#include "third_party/blink/public/platform/web_string.h"
+#include "third_party/blink/public/platform/web_vector.h"
namespace content {
+
int TtsDispatcherEfl::next_utterance_id_ = 1;
static const std::vector<TtsVoice>& getDefaultVoiceList() {
return false;
}
-void TtsDispatcherEfl::updateVoiceList() {
+void TtsDispatcherEfl::UpdateVoiceList() {
content::RenderThread::Get()->Send(new TtsHostMsg_InitializeVoiceList());
}
-void TtsDispatcherEfl::speak(const blink::WebSpeechSynthesisUtterance& web_utterance) {
+void TtsDispatcherEfl::Speak(
+ const blink::WebSpeechSynthesisUtterance& web_utterance) {
int id = next_utterance_id_++;
utterance_id_map_[id] = web_utterance;
TtsUtteranceRequest utterance;
utterance.id = id;
- utterance.text = web_utterance.text().utf8();
- if (!web_utterance.lang().isEmpty() &&
- web_utterance.lang().utf8().at(2) == '-')
- utterance.lang = web_utterance.lang().utf8().replace(2,1,"_");
- utterance.voice = web_utterance.voice().utf8();
- utterance.volume = web_utterance.volume();
- utterance.rate = web_utterance.rate();
- utterance.pitch = web_utterance.pitch();
+ utterance.text = web_utterance.GetText().Utf8();
+ if (!web_utterance.Lang().IsEmpty() &&
+ web_utterance.Lang().Utf8().at(2) == '-')
+ utterance.lang = web_utterance.Lang().Utf8().replace(2, 1, "_");
+ utterance.voice = web_utterance.Voice().Utf8();
+ utterance.volume = web_utterance.Volume();
+ utterance.rate = web_utterance.Rate();
+ utterance.pitch = web_utterance.Pitch();
content::RenderThread::Get()->Send(new TtsHostMsg_Speak(utterance));
}
-void TtsDispatcherEfl::pause() {
+void TtsDispatcherEfl::Pause() {
content::RenderThread::Get()->Send(new TtsHostMsg_Pause());
}
-void TtsDispatcherEfl::resume() {
+void TtsDispatcherEfl::Resume() {
content::RenderThread::Get()->Send(new TtsHostMsg_Resume());
}
-void TtsDispatcherEfl::cancel() {
+void TtsDispatcherEfl::Cancel() {
content::RenderThread::Get()->Send(new TtsHostMsg_Cancel());
}
void TtsDispatcherEfl::OnSetVoiceList(const std::vector<TtsVoice>& voices) {
blink::WebVector<blink::WebSpeechSynthesisVoice> out_voices(voices.size());
for (size_t i = 0; i < voices.size(); ++i) {
- out_voices[i].setVoiceURI(blink::WebString::fromUTF8(voices[i].voice_uri));
- out_voices[i].setName(blink::WebString::fromUTF8(voices[i].name));
- out_voices[i].setLanguage(blink::WebString::fromUTF8(voices[i].lang));
- out_voices[i].setIsLocalService(voices[i].local_service);
- out_voices[i].setIsDefault(voices[i].is_default);
+ out_voices[i].SetVoiceURI(blink::WebString::FromUTF8(voices[i].voice_uri));
+ out_voices[i].SetName(blink::WebString::FromUTF8(voices[i].name));
+ out_voices[i].SetLanguage(blink::WebString::FromUTF8(voices[i].lang));
+ out_voices[i].SetIsLocalService(voices[i].local_service);
+ out_voices[i].SetIsDefault(voices[i].is_default);
}
- synthesizer_client_->setVoiceList(out_voices);
+ synthesizer_client_->SetVoiceList(out_voices);
}
void TtsDispatcherEfl::OnDidStartSpeaking(int utterance_id) {
return;
blink::WebSpeechSynthesisUtterance utterance = FindUtterance(utterance_id);
- if (utterance.isNull())
+ if (utterance.IsNull())
return;
- synthesizer_client_->didStartSpeaking(utterance);
+ synthesizer_client_->DidStartSpeaking(utterance);
}
void TtsDispatcherEfl::OnDidFinishSpeaking(int utterance_id) {
blink::WebSpeechSynthesisUtterance utterance = FindUtterance(utterance_id);
- if (utterance.isNull())
+ if (utterance.IsNull())
return;
- synthesizer_client_->didFinishSpeaking(utterance);
+ synthesizer_client_->DidFinishSpeaking(utterance);
utterance_id_map_.erase(utterance_id);
}
void TtsDispatcherEfl::OnDidPauseSpeaking(int utterance_id) {
blink::WebSpeechSynthesisUtterance utterance = FindUtterance(utterance_id);
- if (utterance.isNull())
+ if (utterance.IsNull())
return;
- synthesizer_client_->didPauseSpeaking(utterance);
+ synthesizer_client_->DidPauseSpeaking(utterance);
}
void TtsDispatcherEfl::OnDidResumeSpeaking(int utterance_id) {
blink::WebSpeechSynthesisUtterance utterance = FindUtterance(utterance_id);
- if (utterance.isNull())
+ if (utterance.IsNull())
return;
- synthesizer_client_->didResumeSpeaking(utterance);
+ synthesizer_client_->DidResumeSpeaking(utterance);
}
void TtsDispatcherEfl::OnWordBoundary(int utterance_id, int char_index) {
CHECK(char_index >= 0);
blink::WebSpeechSynthesisUtterance utterance = FindUtterance(utterance_id);
- if (utterance.isNull())
+ if (utterance.IsNull())
return;
- synthesizer_client_->wordBoundaryEventOccurred(
+ synthesizer_client_->WordBoundaryEventOccurred(
utterance, static_cast<unsigned>(char_index));
}
CHECK(char_index >= 0);
blink::WebSpeechSynthesisUtterance utterance = FindUtterance(utterance_id);
- if (utterance.isNull())
+ if (utterance.IsNull())
return;
- synthesizer_client_->sentenceBoundaryEventOccurred(
+ synthesizer_client_->SentenceBoundaryEventOccurred(
utterance, static_cast<unsigned>(char_index));
}
void TtsDispatcherEfl::OnWasInterrupted(int utterance_id) {
blink::WebSpeechSynthesisUtterance utterance = FindUtterance(utterance_id);
- if (utterance.isNull())
+ if (utterance.IsNull())
return;
// The web speech API doesn't support "interrupted".
- synthesizer_client_->didFinishSpeaking(utterance);
+ synthesizer_client_->DidFinishSpeaking(utterance);
utterance_id_map_.erase(utterance_id);
}
void TtsDispatcherEfl::OnWasCancelled(int utterance_id) {
blink::WebSpeechSynthesisUtterance utterance = FindUtterance(utterance_id);
- if (utterance.isNull())
+ if (utterance.IsNull())
return;
// The web speech API doesn't support "cancelled".
- synthesizer_client_->didFinishSpeaking(utterance);
+ synthesizer_client_->DidFinishSpeaking(utterance);
utterance_id_map_.erase(utterance_id);
}
void TtsDispatcherEfl::OnSpeakingErrorOccurred(int utterance_id,
const std::string& error_message) {
blink::WebSpeechSynthesisUtterance utterance = FindUtterance(utterance_id);
- if (utterance.isNull())
+ if (utterance.IsNull())
return;
// The web speech API doesn't support an error message.
- synthesizer_client_->speakingErrorOccurred(utterance);
+ synthesizer_client_->SpeakingErrorOccurred(utterance);
utterance_id_map_.erase(utterance_id);
}
#include "base/containers/hash_tables.h"
#include "content/common/content_export.h"
#include "content/public/renderer/render_thread_observer.h"
-#include "third_party/blink/public/platform/WebSpeechSynthesizer.h"
-#include "third_party/blink/public/platform/WebSpeechSynthesizerClient.h"
+#include "third_party/blink/public/platform/web_speech_synthesizer.h"
+#include "third_party/blink/public/platform/web_speech_synthesizer_client.h"
namespace IPC {
class Message;
explicit TtsDispatcherEfl(blink::WebSpeechSynthesizerClient* client);
private:
- virtual ~TtsDispatcherEfl();
+ ~TtsDispatcherEfl() override;
// RenderThreadObserver override.
bool OnControlMessageReceived(const IPC::Message& message) override;
// blink::WebSpeechSynthesizer implementation.
- void updateVoiceList() override;
- void speak(const blink::WebSpeechSynthesisUtterance& utterance)
- override;
- void pause() override;
- void resume() override;
- void cancel() override;
+ void UpdateVoiceList() override;
+ void Speak(const blink::WebSpeechSynthesisUtterance& utterance) override;
+ void Pause() override;
+ void Resume() override;
+ void Cancel() override;
blink::WebSpeechSynthesisUtterance FindUtterance(int utterance_id);
worker_.Stop();
}
+#if !defined(EWK_BRINGUP)
camera_device_e VideoCaptureDeviceTizen::DeviceNameToCameraId(
const VideoCaptureDevice::Name& device_name) {
if (device_name.id().compare("0") == 0){
}
return static_cast<camera_device_e>(-1);
}
+#endif
std::string VideoCaptureDeviceTizen::GetCameraErrorMessage(int err_code) {
for (size_t i = 0; i < arraysize(video_capture_err); i++) {
client_ = std::move(client);
+#if !defined(EWK_BRINGUP)
if (CAMERA_ERROR_NONE !=
camera_create(DeviceNameToCameraId(device_name_), &camera_)) {
LOG(ERROR) << "Fail to create camera";
SetErrorState("Fail to create camera");
return;
}
+#endif
if (CAMERA_ERROR_NONE !=
camera_set_display(camera_, CAMERA_DISPLAY_TYPE_NONE, NULL)) {
virtual void StopAndDeAllocate() override;
+#if !defined(EWK_BRINGUP)
+ // FIXME: Name is undefined.
static camera_device_e DeviceNameToCameraId(
const VideoCaptureDevice::Name& device_name);
+#endif
static std::string GetCameraErrorMessage(int err_code);
#define UI_GL_EFL_PIXMAP_H_
#include "base/containers/hash_tables.h"
-#include "base/containers/scoped_ptr_hash_map.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gl/gl_bindings.h"
return true;
}
+#if !defined(EWK_BRINGUP)
void GLImageEflPixmap::Destroy(bool have_context) {
if (egl_image_ == EGL_NO_IMAGE_KHR)
return;
gfx::Size GLImageEflPixmap::GetSize() {
return size_;
}
+#endif
+
+unsigned GLImageEflPixmap::GetInternalFormat() {
+ // FIXME: Check this for pixmap.
+ return -1;
+}
bool GLImageEflPixmap::BindTexImage(unsigned target) {
TRACE_EVENT0("gpu", "GLImageEflPixmap::BindTexImage");
return true;
}
+void GLImageEflPixmap::ReleaseTexImage(unsigned target) {}
+
+bool GLImageEflPixmap::CopyTexImage(unsigned target) {
+ return false;
+}
+
bool GLImageEflPixmap::CopyTexSubImage(unsigned target,
const gfx::Point& offset,
const gfx::Rect& rect) {
return false;
}
+void GLImageEflPixmap::Flush() {}
+
+void GLImageEflPixmap::OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
+ uint64_t process_tracing_id,
+ const std::string& dump_name) {}
+
+GLImage::Type GLImageEflPixmap::GetType() const {
+ return Type::DXGI_IMAGE;
+}
+
} // namespace gl
bool Initialize(unsigned long efl_pixmap_id);
// Overridden from GLImage:
- virtual void Destroy(bool have_context) override;
- virtual gfx::Size GetSize() override;
- virtual bool BindTexImage(unsigned target) override;
- virtual bool CopyTexSubImage(unsigned target,
- const gfx::Point& offset,
- const gfx::Rect& rect) override;
- virtual bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
- int z_order,
- gfx::OverlayTransform transform,
- const gfx::Rect& bounds_rect,
- const gfx::RectF& crop_rect) override;
+#if !defined(EWK_BRINGUP)
+ // This API is removed. Just keeping for reference.
+ void Destroy(bool have_context) override;
+#endif
+ gfx::Size GetSize() override;
+ unsigned GetInternalFormat() override;
+ bool BindTexImage(unsigned target) override;
+ void ReleaseTexImage(unsigned target) override;
+ bool CopyTexImage(unsigned target) override;
+ bool CopyTexSubImage(unsigned target,
+ const gfx::Point& offset,
+ const gfx::Rect& rect) override;
+ bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
+ int z_order,
+ gfx::OverlayTransform transform,
+ const gfx::Rect& bounds_rect,
+ const gfx::RectF& crop_rect) override;
+ void Flush() override;
+ void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
+ uint64_t process_tracing_id,
+ const std::string& dump_name) override;
+ Type GetType() const override;
protected:
- virtual ~GLImageEflPixmap();
+ ~GLImageEflPixmap();
private:
unsigned long efl_pixmap_id_;
]
if (is_tizen) {
external_ui_gl_sources += [
- "//tizen_src/chromium_impl/ui/gl/gl_image_efl_pixmap.cc",
- "//tizen_src/chromium_impl/ui/gl/gl_image_efl_pixmap.h",
+ #"//tizen_src/chromium_impl/ui/gl/gl_image_efl_pixmap.cc",
+ #"//tizen_src/chromium_impl/ui/gl/gl_image_efl_pixmap.h",
]
if (!wayland_bringup) {
external_ui_gl_sources += [
- "//tizen_src/chromium_impl/ui/gl/efl_pixmap.cc",
- "//tizen_src/chromium_impl/ui/gl/efl_pixmap.h",
+ # "//tizen_src/chromium_impl/ui/gl/efl_pixmap.cc",
+ # "//tizen_src/chromium_impl/ui/gl/efl_pixmap.h",
]
}
}
"browser/geolocation/location_provider_efl.cc",
"browser/geolocation/location_provider_efl.h",
]
+ if (ewk_bringup) {
+ # FIXME: EWK_BRINGUP
+ exclude_source_set -= [
+ "browser/geolocation/location_provider_efl.cc",
+ "browser/geolocation/location_provider_efl.h",
+ ]
+ }
}
# TODO : Below dependency is set in chromium/device/battery_tizen.gypi,
"browser/favicon/favicon_database_p.h",
"browser/favicon/favicon_downloader.cc",
"browser/favicon/favicon_downloader.h",
-
- #"browser/geolocation/access_token_store_efl.cc",
- #"browser/geolocation/access_token_store_efl.h",
+ "browser/geolocation/access_token_store_efl.cc",
+ "browser/geolocation/access_token_store_efl.h",
"browser/geolocation/geolocation_permission_context_efl.cc",
"browser/geolocation/geolocation_permission_context_efl.h",
"browser/geolocation/location_provider_efl.cc",
# FIXME: Followings are guarded just for bringup.
if (ewk_bringup) {
sources -= [
+ "browser/geolocation/access_token_store_efl.cc",
+ "browser/geolocation/access_token_store_efl.h",
+ "browser/geolocation/geolocation_permission_context_efl.cc",
+ "browser/geolocation/geolocation_permission_context_efl.h",
+ "browser/geolocation/location_provider_efl.cc",
+ "browser/geolocation/location_provider_efl.h",
"browser/vibration/vibration_provider_client.cc",
"browser/vibration/vibration_provider_client.h",
"permission_popup_manager.cc",
#if defined(OS_TIZEN)
#if !defined(EWK_BRINGUP)
p_command_line->AppendSwitch(switches::kEnableGestureTapHighlight);
-#endif
p_command_line->AppendSwitch(switches::kEnableSpatialNavigation);
p_command_line->AppendSwitch(switches::kMainFrameResizesAreOrientationChanges);
p_command_line->AppendSwitch(switches::kForceAccelerated2dCanvas);
-#if !defined(EWK_BRINGUP)
// [M44_2403] Temporary disabling the codes for switching to new chromium
// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14040
p_command_line->AppendSwitch(cc::switches::kEnableParallelCanvasMode);
#include "common/web_contents_utils.h"
#if defined(OS_TIZEN)
+#if !defined(EWK_BRINGUP)
#include "browser/geolocation/location_provider_efl.h"
+#endif
#include "content/browser/speech/tts_message_filter_efl.h"
#endif
#include "third_party/blink/public/web/web_view.h"
#include "url/gurl.h"
-#if defined(OS_TIZEN)
+#if defined(TIZEN_MULTIMEDIA_SUPPORT)
#include "content/common/tts_messages_efl.h"
#include "content/renderer/tts_dispatcher_efl.h"
#endif
std::unique_ptr<blink::WebSpeechSynthesizer>
ContentRendererClientEfl::OverrideSpeechSynthesizer(
blink::WebSpeechSynthesizerClient* client) {
-#if defined(OS_TIZEN)
+#if defined(TIZEN_MULTIMEDIA_SUPPORT)
return base::MakeUnique<TtsDispatcher>(new content::TtsDispatcherEfl(client));
#else
return nullptr;
#include "public/platform/web_input_event.h"
#include "url/gurl.h"
-#if defined(OS_TIZEN)
+#if defined(TIZEN_MULTIMEDIA_SUPPORT)
#include "content/public/browser/media_capture_devices.h"
#include "media/capture/video/tizen/video_capture_device_tizen.h"
#endif
configs += [ "//tizen_src/build:libelementary" ]
public_configs += [ "//tizen_src/build:elementary-public" ]
deps += [
+ "//tizen_src/chromium_impl/tizen:system-info",
"//tizen_src/ewk/efl_integration:chromium-ewk",
"//tizen_src/ewk/efl_integration:launch_exec",
- "//tizen_src/chromium_impl/tizen:system-info",
]
import("../tizen_version_defines_for_apps.gni")
cflags = [
# will be excluded in chromium side (src/build/common.gypi), and GYP
# processes pattern lists after exclusion lists.
# (ref: https://gyp.gsrc.io/docs/InputFormatReference.md#Processing-Order)
- "-Werror",
+ # "-Werror",
]
if (!use_wayland) {
configs += [ "//tizen_src/build:ecore-x" ]
# will be excluded in chromium side (src/build/common.gypi), and GYP
# processes pattern lists after exclusion lists.
# (ref: https://gyp.gsrc.io/docs/InputFormatReference.md#Processing-Order)
- "-Werror",
+ # "-Werror",
]
sources = []
include_dirs = []
deps += [
"//tizen_src/chromium_impl/tizen:system-info",
"//tizen_src/ewk/efl_integration:chromium-ewk",
+
#"//build/linux:glib", removed from the chromium
]
configs += [ "//build/config/linux:glib" ]
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#define _DEFAULT_SOURCE
+
#include "public/ewk_auth_challenge.h"
#include "public/ewk_context.h"
#include "public/ewk_main.h"
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#define _DEFAULT_SOURCE
+
#include <appfw/app.h>
#include <dlog.h>
#include <Ecore.h>
static void get_main_window_size(int *changed_ang, int *width, int *height);
+#if defined(OS_TIZEN)
+// To avoid implicit function declaration
+int setenv(const char *name, const char *value, int overwrite);
+#endif
+
enum
{
FOR_TEST_APPLICATION_CACHE_RUN = EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG + 1,
# will be excluded in chromium side (src/build/common.gypi), and GYP
# processes pattern lists after exclusion lists.
# (ref: https://gyp.gsrc.io/docs/InputFormatReference.md#Processing-Order)
- "-Werror",
+ # "-Werror",
]
ldflags = []
libs = []
# Instead, --rsyncable breaks the file into small chunks, so that one doesn't
# affect the other in compression, and then only that chunk will have to be
# updated.
- gzip_proc = subprocess.Popen(['gzip', '--stdout', '--rsyncable',
- '--best', '--no-name'],
+ #
+ # We cannot use the rsyncable compression since gbs build infra does not have
+ # the '--rsyncable' option built in for gzip.
+ gzip_proc = subprocess.Popen(['gzip', '--stdout', '--best', '--no-name'],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
parser.error('You must specify a --platform.')
supported_platforms = ['android', 'chromeos', 'fuchsia', 'ios', 'linux',
- 'mac', 'win']
+ 'mac', 'tizen', 'win']
if opts.platform not in supported_platforms:
parser.error('\'%s\' is an unknown platform. Supported platforms: %s' %
(opts.platform, supported_platforms))
#include "ui/gfx/native_pixmap_handle.h"
#if defined(OS_LINUX)
+#if !defined(OS_TIZEN)
#include <drm_fourcc.h>
+#endif
#include "base/posix/eintr_wrapper.h"
#endif
namespace gfx {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(OS_TIZEN)
static_assert(NativePixmapPlane::kNoModifier == DRM_FORMAT_MOD_INVALID,
"gfx::NativePixmapPlane::kNoModifier should be an alias for"
"DRM_FORMAT_MOD_INVALID");
# Should EGL support be compiled. Can be overriden to test during bring up
# of EGL support on other platforms
- use_egl = is_win || is_android || is_linux || is_fuchsia
+ use_egl = is_win || is_android || is_linux || is_fuchsia || is_tizen
}
]
data_deps = [
- "//third_party/mesa:osmesa",
+ # "//third_party/mesa:osmesa",
]
visibility = [ "//ui/ozone/platform/*" ]
projects / platform / framework / web / chromium-efl.git / commitdiff