# -----------------------------------
ozone_wayland_rev = 'bd769b47008882f3d0fcb78070415a5ef2700032'
+khronos_cl_api_rev = '6f4be98d10f03ce2b12c769cd9835c73a441c00f'
# |blink_upstream_rev| indicates the revision of the latest upstream commit in
# the s-blink repository, so that the devtools code can use it to fetch
# SVN revision while Blink is still in SVN.
blink_upstream_rev = '191638' #TODO(TK) : need to update revision number
-efl_integration_branch = 'origin/dev/m44_2403'
+efl_integration_branch = 'origin/dev/m47_2526'
ct_git = 'ssh://165.213.202.130:29418/webplatform'
+crosswalk_git = 'https://github.com/crosswalk-project'
ozone_wayland_git = 'https://github.com/01org'
'custom_deps': {
'src':
ct_git + '/s-chromium.git@' + efl_integration_branch,
- 'src/third_party/WebKit':
- ct_git + '/s-blink.git@' + efl_integration_branch,
'src/third_party/skia':
ct_git + '/s-skia.git@' + efl_integration_branch,
'src/third_party/webrtc':
# Include OpenCL header files for WebCL support, target version 1.2.
'src/third_party/khronos/CL':
- 'https://cvs.khronos.org/svn/repos/registry/trunk/public/cl/api/1.2@'
- '28150',
+ crosswalk_git + '/khronos-cl-api-1.2.git@' + khronos_cl_api_rev,
# These directories are not relevant to Chromium-efl and can be safely ignored
# in a checkout. It avoids creating additional directories outside src/ that
-Chromium upsteam version: 44.0.2403.0
+Chromium upsteam version: 47.0.2526.0
fi
fi
+${SCRIPTDIR}/apply_patches.sh ${SCRIPTDIR}/patches
+
export __GYP_CHROMIUMEFL_TARGET=desktop
hostGypChromiumEfl
export PATH="${JHBUILD_DEPS}/bin:$PATH"
hostNinja desktop
+
+${SCRIPTDIR}/apply_patches.sh -r ${SCRIPTDIR}/patches
-Duse_gnome_keyring=0
-Duse_pango=0
-Duse_cairo=0
- -Duse_openssl=1
- -Duse_openssl_certs=1
- -Duse_nss_certs=0
-Dtizen_multimedia_eme_support=0
-Denable_plugins=1
-Denable_extensions=1
fi
if [ "$tizen_version" == "3.0" ]; then
- COMMON_GYP_PARAMETERS+="-Dtizen_multimedia_support=1
+ # [M47_2526] Temporary disabling the multimedia flag for switching to new chromium
+ # FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14519
+ COMMON_GYP_PARAMETERS+="-Dtizen_multimedia_support=0
"
elif [ "$tizen_version" == "2.4" -a "$target" == "tv" ]; then
COMMON_GYP_PARAMETERS+="-Dtizen_multimedia_support=0
+++ /dev/null
-diff --git a/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/config.h b/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/config.h
-index 93b0a00..434f49e 100644
---- a/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/config.h
-+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/config.h
-@@ -1,12 +1,12 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio'"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio'"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
--#define CONFIG_THIS_YEAR 2014
-+#define CONFIG_THIS_YEAR 2015
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
- #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
--#define CC_IDENT "gcc 4.8 (Ubuntu/Linaro 4.8.2-13ubuntu1)"
-+#define CC_IDENT "gcc 4.9 (Tizen)"
- #define av_restrict restrict
- #define EXTERN_PREFIX ""
- #define EXTERN_ASM
-@@ -69,7 +69,7 @@
- #define HAVE_CPUNOP 0
- #define HAVE_I686 0
- #define HAVE_MIPSFPU 0
--#define HAVE_MIPS32R2 0
-+#define HAVE_MIPS32R2 1
- #define HAVE_MIPSDSPR1 0
- #define HAVE_MIPSDSPR2 0
- #define HAVE_LOONGSON 1
-@@ -174,7 +174,6 @@
- #define HAVE_ASM_TYPES_H 1
- #define HAVE_CDIO_PARANOIA_H 0
- #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
--#define HAVE_CL_CL_H 0
- #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
- #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
- #define HAVE_DEV_IC_BT8XX_H 0
-@@ -266,7 +265,6 @@
- #define HAVE_LZO1X_999_COMPRESS 0
- #define HAVE_MACH_ABSOLUTE_TIME 0
- #define HAVE_MAPVIEWOFFILE 0
--#define HAVE_MOVEFILEEXA 0
- #define HAVE_MEMALIGN 1
- #define HAVE_MKSTEMP 1
- #define HAVE_MMAP 1
-@@ -291,6 +289,7 @@
- #define HAVE_W32THREADS 0
- #define HAVE_AS_DN_DIRECTIVE 0
- #define HAVE_AS_FUNC 1
-+#define HAVE_AS_OBJECT_ARCH 0
- #define HAVE_ASM_MOD_Q 0
- #define HAVE_ATTRIBUTE_MAY_ALIAS 1
- #define HAVE_ATTRIBUTE_PACKED 1
-@@ -303,13 +302,14 @@
- #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
- #define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
- #define HAVE_PRAGMA_DEPRECATED 1
--#define HAVE_RSYNC_CONTIMEOUT 1
-+#define HAVE_RSYNC_CONTIMEOUT 0
- #define HAVE_SYMVER_ASM_LABEL 0
- #define HAVE_SYMVER_GNU_ASM 1
- #define HAVE_VFP_ARGS 0
- #define HAVE_XFORM_ASM 0
- #define HAVE_XMM_CLOBBERS 0
- #define HAVE_CONDITION_VARIABLE_PTR 0
-+#define HAVE_DXVA_PICPARAMS_HEVC 0
- #define HAVE_SOCKLEN_T 0
- #define HAVE_STRUCT_ADDRINFO 0
- #define HAVE_STRUCT_GROUP_SOURCE_REQ 0
-@@ -330,13 +330,15 @@
- #define HAVE_LIBC_MSVCRT 0
- #define HAVE_LIBDC1394_1 0
- #define HAVE_LIBDC1394_2 0
--#define HAVE_MAKEINFO 1
--#define HAVE_MAKEINFO_HTML 1
-+#define HAVE_MAKEINFO 0
-+#define HAVE_MAKEINFO_HTML 0
- #define HAVE_PERL 1
- #define HAVE_POD2MAN 1
- #define HAVE_SDL 0
-+#define HAVE_SECTION_DATA_REL_RO 1
- #define HAVE_TEXI2HTML 0
- #define HAVE_THREADS 1
-+#define HAVE_VAAPI_X11 0
- #define HAVE_VDPAU_X11 0
- #define HAVE_XLIB 0
- #define CONFIG_BSFS 0
-@@ -351,10 +353,10 @@
- #define CONFIG_PARSERS 1
- #define CONFIG_PROTOCOLS 0
- #define CONFIG_DOC 0
--#define CONFIG_HTMLPAGES 1
--#define CONFIG_MANPAGES 1
--#define CONFIG_PODPAGES 1
--#define CONFIG_TXTPAGES 1
-+#define CONFIG_HTMLPAGES 0
-+#define CONFIG_MANPAGES 0
-+#define CONFIG_PODPAGES 0
-+#define CONFIG_TXTPAGES 0
- #define CONFIG_AVIO_READING_EXAMPLE 1
- #define CONFIG_DECODING_ENCODING_EXAMPLE 1
- #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
-@@ -364,6 +366,7 @@
- #define CONFIG_FILTERING_VIDEO_EXAMPLE 0
- #define CONFIG_METADATA_EXAMPLE 1
- #define CONFIG_MUXING_EXAMPLE 0
-+#define CONFIG_QSVDEC_EXAMPLE 0
- #define CONFIG_REMUXING_EXAMPLE 1
- #define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
- #define CONFIG_SCALING_VIDEO_EXAMPLE 0
-@@ -385,6 +388,7 @@
- #define CONFIG_LIBCDIO 0
- #define CONFIG_LIBCELT 0
- #define CONFIG_LIBDC1394 0
-+#define CONFIG_LIBDCADEC 0
- #define CONFIG_LIBFAAC 0
- #define CONFIG_LIBFDK_AAC 0
- #define CONFIG_LIBFLITE 0
-@@ -395,12 +399,14 @@
- #define CONFIG_LIBGSM 0
- #define CONFIG_LIBIEC61883 0
- #define CONFIG_LIBILBC 0
-+#define CONFIG_LIBMFX 0
- #define CONFIG_LIBMODPLUG 0
- #define CONFIG_LIBMP3LAME 0
- #define CONFIG_LIBNUT 0
- #define CONFIG_LIBOPENCORE_AMRNB 0
- #define CONFIG_LIBOPENCORE_AMRWB 0
- #define CONFIG_LIBOPENCV 0
-+#define CONFIG_LIBOPENH264 0
- #define CONFIG_LIBOPENJPEG 0
- #define CONFIG_LIBOPUS 0
- #define CONFIG_LIBPULSE 0
-@@ -435,6 +441,7 @@
- #define CONFIG_LIBZMQ 0
- #define CONFIG_LIBZVBI 0
- #define CONFIG_LZMA 0
-+#define CONFIG_NVENC 0
- #define CONFIG_OPENAL 0
- #define CONFIG_OPENCL 0
- #define CONFIG_OPENGL 0
-@@ -507,6 +514,7 @@
- #define CONFIG_FAANDCT 0
- #define CONFIG_FAANIDCT 0
- #define CONFIG_FDCTDSP 0
-+#define CONFIG_FMTCONVERT 0
- #define CONFIG_FRAME_THREAD_ENCODER 0
- #define CONFIG_GCRYPT 0
- #define CONFIG_GOLOMB 1
-@@ -522,6 +530,7 @@
- #define CONFIG_HUFFYUVENCDSP 0
- #define CONFIG_IDCTDSP 0
- #define CONFIG_IIRFILTER 0
-+#define CONFIG_IMDCT15 1
- #define CONFIG_INTRAX8 0
- #define CONFIG_LGPLV3 0
- #define CONFIG_LLAUDDSP 0
-@@ -536,6 +545,7 @@
- #define CONFIG_NETTLE 0
- #define CONFIG_PIXBLOCKDSP 0
- #define CONFIG_QPELDSP 0
-+#define CONFIG_QSV 0
- #define CONFIG_RANGECODER 0
- #define CONFIG_RIFFDEC 1
- #define CONFIG_RIFFENC 0
-@@ -629,10 +639,12 @@
- #define CONFIG_H263P_DECODER 0
- #define CONFIG_H264_DECODER 1
- #define CONFIG_H264_CRYSTALHD_DECODER 0
-+#define CONFIG_H264_QSV_DECODER 0
- #define CONFIG_H264_VDA_DECODER 0
- #define CONFIG_H264_VDPAU_DECODER 0
- #define CONFIG_HEVC_DECODER 0
- #define CONFIG_HNM4_VIDEO_DECODER 0
-+#define CONFIG_HQX_DECODER 0
- #define CONFIG_HUFFYUV_DECODER 0
- #define CONFIG_IDCIN_DECODER 0
- #define CONFIG_IFF_BYTERUN1_DECODER 0
-@@ -719,6 +731,7 @@
- #define CONFIG_SVQ3_DECODER 0
- #define CONFIG_TARGA_DECODER 0
- #define CONFIG_TARGA_Y216_DECODER 0
-+#define CONFIG_TDSC_DECODER 0
- #define CONFIG_THEORA_DECODER 1
- #define CONFIG_THP_DECODER 0
- #define CONFIG_TIERTEXSEQVIDEO_DECODER 0
-@@ -797,6 +810,7 @@
- #define CONFIG_DSD_LSBF_PLANAR_DECODER 0
- #define CONFIG_DSD_MSBF_PLANAR_DECODER 0
- #define CONFIG_DSICINAUDIO_DECODER 0
-+#define CONFIG_DSS_SP_DECODER 0
- #define CONFIG_EAC3_DECODER 0
- #define CONFIG_EVRC_DECODER 0
- #define CONFIG_FFWAVESYNTH_DECODER 0
-@@ -923,6 +937,7 @@
- #define CONFIG_VIMA_DECODER 0
- #define CONFIG_SSA_DECODER 0
- #define CONFIG_ASS_DECODER 0
-+#define CONFIG_CCAPTION_DECODER 0
- #define CONFIG_DVBSUB_DECODER 0
- #define CONFIG_DVDSUB_DECODER 0
- #define CONFIG_JACOSUB_DECODER 0
-@@ -943,6 +958,7 @@
- #define CONFIG_WEBVTT_DECODER 0
- #define CONFIG_XSUB_DECODER 0
- #define CONFIG_LIBCELT_DECODER 0
-+#define CONFIG_LIBDCADEC_DECODER 0
- #define CONFIG_LIBFDK_AAC_DECODER 0
- #define CONFIG_LIBGSM_DECODER 0
- #define CONFIG_LIBGSM_MS_DECODER 0
-@@ -1007,9 +1023,11 @@
- #define CONFIG_DNXHD_DEMUXER 0
- #define CONFIG_DSF_DEMUXER 0
- #define CONFIG_DSICIN_DEMUXER 0
-+#define CONFIG_DSS_DEMUXER 0
- #define CONFIG_DTS_DEMUXER 0
- #define CONFIG_DTSHD_DEMUXER 0
- #define CONFIG_DV_DEMUXER 0
-+#define CONFIG_DVBSUB_DEMUXER 0
- #define CONFIG_DXA_DEMUXER 0
- #define CONFIG_EA_DEMUXER 0
- #define CONFIG_EA_CDATA_DEMUXER 0
-@@ -1235,6 +1253,7 @@
- #define CONFIG_MSMPEG4V2_ENCODER 0
- #define CONFIG_MSMPEG4V3_ENCODER 0
- #define CONFIG_MSVIDEO1_ENCODER 0
-+#define CONFIG_NVENC_ENCODER 0
- #define CONFIG_PAM_ENCODER 0
- #define CONFIG_PBM_ENCODER 0
- #define CONFIG_PCX_ENCODER 0
-@@ -1364,6 +1383,7 @@
- #define CONFIG_LIBXAVS_ENCODER 0
- #define CONFIG_LIBXVID_ENCODER 0
- #define CONFIG_LIBAACPLUS_ENCODER 0
-+#define CONFIG_LIBOPENH264_ENCODER 0
- #define CONFIG_ADELAY_FILTER 0
- #define CONFIG_AECHO_FILTER 0
- #define CONFIG_AEVAL_FILTER 0
-@@ -1400,6 +1420,7 @@
- #define CONFIG_CHANNELMAP_FILTER 0
- #define CONFIG_CHANNELSPLIT_FILTER 0
- #define CONFIG_COMPAND_FILTER 0
-+#define CONFIG_DCSHIFT_FILTER 0
- #define CONFIG_EARWAX_FILTER 0
- #define CONFIG_EBUR128_FILTER 0
- #define CONFIG_EQUALIZER_FILTER 0
-@@ -1432,6 +1453,7 @@
- #define CONFIG_CODECVIEW_FILTER 0
- #define CONFIG_COLORBALANCE_FILTER 0
- #define CONFIG_COLORCHANNELMIXER_FILTER 0
-+#define CONFIG_COLORLEVELS_FILTER 0
- #define CONFIG_COLORMATRIX_FILTER 0
- #define CONFIG_COPY_FILTER 0
- #define CONFIG_CROP_FILTER 0
-@@ -1447,8 +1469,10 @@
- #define CONFIG_DRAWTEXT_FILTER 0
- #define CONFIG_EDGEDETECT_FILTER 0
- #define CONFIG_ELBG_FILTER 0
-+#define CONFIG_EQ_FILTER 0
- #define CONFIG_EXTRACTPLANES_FILTER 0
- #define CONFIG_FADE_FILTER 0
-+#define CONFIG_FFTFILT_FILTER 0
- #define CONFIG_FIELD_FILTER 0
- #define CONFIG_FIELDMATCH_FILTER 0
- #define CONFIG_FIELDORDER_FILTER 0
-@@ -1457,6 +1481,7 @@
- #define CONFIG_FRAMEPACK_FILTER 0
- #define CONFIG_FRAMESTEP_FILTER 0
- #define CONFIG_FREI0R_FILTER 0
-+#define CONFIG_FSPP_FILTER 0
- #define CONFIG_GEQ_FILTER 0
- #define CONFIG_GRADFUN_FILTER 0
- #define CONFIG_HALDCLUT_FILTER 0
-@@ -1478,7 +1503,6 @@
- #define CONFIG_LUTYUV_FILTER 0
- #define CONFIG_MCDEINT_FILTER 0
- #define CONFIG_MERGEPLANES_FILTER 0
--#define CONFIG_MP_FILTER 0
- #define CONFIG_MPDECIMATE_FILTER 0
- #define CONFIG_NEGATE_FILTER 0
- #define CONFIG_NOFORMAT_FILTER 0
-@@ -1488,14 +1512,19 @@
- #define CONFIG_OVERLAY_FILTER 0
- #define CONFIG_OWDENOISE_FILTER 0
- #define CONFIG_PAD_FILTER 0
-+#define CONFIG_PALETTEGEN_FILTER 0
-+#define CONFIG_PALETTEUSE_FILTER 0
- #define CONFIG_PERMS_FILTER 0
- #define CONFIG_PERSPECTIVE_FILTER 0
- #define CONFIG_PHASE_FILTER 0
- #define CONFIG_PIXDESCTEST_FILTER 0
- #define CONFIG_PP_FILTER 0
-+#define CONFIG_PP7_FILTER 0
- #define CONFIG_PSNR_FILTER 0
- #define CONFIG_PULLUP_FILTER 0
-+#define CONFIG_QP_FILTER 0
- #define CONFIG_REMOVELOGO_FILTER 0
-+#define CONFIG_REPEATFIELDS_FILTER 0
- #define CONFIG_ROTATE_FILTER 0
- #define CONFIG_SAB_FILTER 0
- #define CONFIG_SCALE_FILTER 0
-@@ -1508,6 +1537,7 @@
- #define CONFIG_SETSAR_FILTER 0
- #define CONFIG_SETTB_FILTER 0
- #define CONFIG_SHOWINFO_FILTER 0
-+#define CONFIG_SHOWPALETTE_FILTER 0
- #define CONFIG_SHUFFLEPLANES_FILTER 0
- #define CONFIG_SIGNALSTATS_FILTER 0
- #define CONFIG_SMARTBLUR_FILTER 0
-@@ -1517,6 +1547,7 @@
- #define CONFIG_SUBTITLES_FILTER 0
- #define CONFIG_SUPER2XSAI_FILTER 0
- #define CONFIG_SWAPUV_FILTER 0
-+#define CONFIG_TBLEND_FILTER 0
- #define CONFIG_TELECINE_FILTER 0
- #define CONFIG_THUMBNAIL_FILTER 0
- #define CONFIG_TILE_FILTER 0
-@@ -1524,6 +1555,7 @@
- #define CONFIG_TRANSPOSE_FILTER 0
- #define CONFIG_TRIM_FILTER 0
- #define CONFIG_UNSHARP_FILTER 0
-+#define CONFIG_USPP_FILTER 0
- #define CONFIG_VFLIP_FILTER 0
- #define CONFIG_VIDSTABDETECT_FILTER 0
- #define CONFIG_VIDSTABTRANSFORM_FILTER 0
-@@ -1551,15 +1583,18 @@
- #define CONFIG_SHOWCQT_FILTER 0
- #define CONFIG_SHOWSPECTRUM_FILTER 0
- #define CONFIG_SHOWWAVES_FILTER 0
-+#define CONFIG_SHOWWAVESPIC_FILTER 0
- #define CONFIG_AMOVIE_FILTER 0
- #define CONFIG_MOVIE_FILTER 0
- #define CONFIG_H263_VAAPI_HWACCEL 0
- #define CONFIG_H263_VDPAU_HWACCEL 0
- #define CONFIG_H264_DXVA2_HWACCEL 0
-+#define CONFIG_H264_QSV_HWACCEL 0
- #define CONFIG_H264_VAAPI_HWACCEL 0
- #define CONFIG_H264_VDA_HWACCEL 0
- #define CONFIG_H264_VDA_OLD_HWACCEL 0
- #define CONFIG_H264_VDPAU_HWACCEL 0
-+#define CONFIG_HEVC_DXVA2_HWACCEL 0
- #define CONFIG_MPEG1_XVMC_HWACCEL 0
- #define CONFIG_MPEG1_VDPAU_HWACCEL 0
- #define CONFIG_MPEG2_XVMC_HWACCEL 0
-@@ -1673,6 +1708,7 @@
- #define CONFIG_MPJPEG_MUXER 0
- #define CONFIG_MXF_MUXER 0
- #define CONFIG_MXF_D10_MUXER 0
-+#define CONFIG_MXF_OPATOM_MUXER 0
- #define CONFIG_NULL_MUXER 0
- #define CONFIG_NUT_MUXER 0
- #define CONFIG_OGA_MUXER 0
-@@ -1705,6 +1741,7 @@
- #define CONFIG_ROQ_MUXER 0
- #define CONFIG_RSO_MUXER 0
- #define CONFIG_RTP_MUXER 0
-+#define CONFIG_RTP_MPEGTS_MUXER 0
- #define CONFIG_RTSP_MUXER 0
- #define CONFIG_SAP_MUXER 0
- #define CONFIG_SEGMENT_MUXER 0
-diff --git a/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/config.h b/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/config.h
-index 36cf1a1..ee951a1 100644
---- a/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/config.h
-+++ b/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/config.h
-@@ -1,12 +1,12 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-demuxer=flac --enable-decoder=flac --enable-parser=flac --enable-decoder=gsm_ms --enable-demuxer=gsm --enable-parser=gsm"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-iconv --disable-lzo --disable-network --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='aac,h264,mp3' --enable-demuxer='aac,mp3,mov' --enable-parser='aac,h264,mpegaudio' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-demuxer=flac --enable-decoder=flac --enable-parser=flac --enable-decoder=gsm_ms --enable-demuxer=gsm --enable-parser=gsm"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
--#define CONFIG_THIS_YEAR 2014
-+#define CONFIG_THIS_YEAR 2015
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
- #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
--#define CC_IDENT "gcc 4.8 (Ubuntu/Linaro 4.8.2-13ubuntu1)"
-+#define CC_IDENT "gcc 4.9 (Tizen)"
- #define av_restrict restrict
- #define EXTERN_PREFIX ""
- #define EXTERN_ASM
-@@ -69,7 +69,7 @@
- #define HAVE_CPUNOP 0
- #define HAVE_I686 0
- #define HAVE_MIPSFPU 0
--#define HAVE_MIPS32R2 0
-+#define HAVE_MIPS32R2 1
- #define HAVE_MIPSDSPR1 0
- #define HAVE_MIPSDSPR2 0
- #define HAVE_LOONGSON 1
-@@ -174,7 +174,6 @@
- #define HAVE_ASM_TYPES_H 1
- #define HAVE_CDIO_PARANOIA_H 0
- #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
--#define HAVE_CL_CL_H 0
- #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
- #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
- #define HAVE_DEV_IC_BT8XX_H 0
-@@ -266,7 +265,6 @@
- #define HAVE_LZO1X_999_COMPRESS 0
- #define HAVE_MACH_ABSOLUTE_TIME 0
- #define HAVE_MAPVIEWOFFILE 0
--#define HAVE_MOVEFILEEXA 0
- #define HAVE_MEMALIGN 1
- #define HAVE_MKSTEMP 1
- #define HAVE_MMAP 1
-@@ -291,6 +289,7 @@
- #define HAVE_W32THREADS 0
- #define HAVE_AS_DN_DIRECTIVE 0
- #define HAVE_AS_FUNC 1
-+#define HAVE_AS_OBJECT_ARCH 0
- #define HAVE_ASM_MOD_Q 0
- #define HAVE_ATTRIBUTE_MAY_ALIAS 1
- #define HAVE_ATTRIBUTE_PACKED 1
-@@ -303,13 +302,14 @@
- #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
- #define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
- #define HAVE_PRAGMA_DEPRECATED 1
--#define HAVE_RSYNC_CONTIMEOUT 1
-+#define HAVE_RSYNC_CONTIMEOUT 0
- #define HAVE_SYMVER_ASM_LABEL 0
- #define HAVE_SYMVER_GNU_ASM 1
- #define HAVE_VFP_ARGS 0
- #define HAVE_XFORM_ASM 0
- #define HAVE_XMM_CLOBBERS 0
- #define HAVE_CONDITION_VARIABLE_PTR 0
-+#define HAVE_DXVA_PICPARAMS_HEVC 0
- #define HAVE_SOCKLEN_T 0
- #define HAVE_STRUCT_ADDRINFO 0
- #define HAVE_STRUCT_GROUP_SOURCE_REQ 0
-@@ -330,13 +330,15 @@
- #define HAVE_LIBC_MSVCRT 0
- #define HAVE_LIBDC1394_1 0
- #define HAVE_LIBDC1394_2 0
--#define HAVE_MAKEINFO 1
--#define HAVE_MAKEINFO_HTML 1
-+#define HAVE_MAKEINFO 0
-+#define HAVE_MAKEINFO_HTML 0
- #define HAVE_PERL 1
- #define HAVE_POD2MAN 1
- #define HAVE_SDL 0
-+#define HAVE_SECTION_DATA_REL_RO 1
- #define HAVE_TEXI2HTML 0
- #define HAVE_THREADS 1
-+#define HAVE_VAAPI_X11 0
- #define HAVE_VDPAU_X11 0
- #define HAVE_XLIB 0
- #define CONFIG_BSFS 0
-@@ -351,10 +353,10 @@
- #define CONFIG_PARSERS 1
- #define CONFIG_PROTOCOLS 0
- #define CONFIG_DOC 0
--#define CONFIG_HTMLPAGES 1
--#define CONFIG_MANPAGES 1
--#define CONFIG_PODPAGES 1
--#define CONFIG_TXTPAGES 1
-+#define CONFIG_HTMLPAGES 0
-+#define CONFIG_MANPAGES 0
-+#define CONFIG_PODPAGES 0
-+#define CONFIG_TXTPAGES 0
- #define CONFIG_AVIO_READING_EXAMPLE 1
- #define CONFIG_DECODING_ENCODING_EXAMPLE 1
- #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
-@@ -364,6 +366,7 @@
- #define CONFIG_FILTERING_VIDEO_EXAMPLE 0
- #define CONFIG_METADATA_EXAMPLE 1
- #define CONFIG_MUXING_EXAMPLE 0
-+#define CONFIG_QSVDEC_EXAMPLE 0
- #define CONFIG_REMUXING_EXAMPLE 1
- #define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
- #define CONFIG_SCALING_VIDEO_EXAMPLE 0
-@@ -385,6 +388,7 @@
- #define CONFIG_LIBCDIO 0
- #define CONFIG_LIBCELT 0
- #define CONFIG_LIBDC1394 0
-+#define CONFIG_LIBDCADEC 0
- #define CONFIG_LIBFAAC 0
- #define CONFIG_LIBFDK_AAC 0
- #define CONFIG_LIBFLITE 0
-@@ -395,12 +399,14 @@
- #define CONFIG_LIBGSM 0
- #define CONFIG_LIBIEC61883 0
- #define CONFIG_LIBILBC 0
-+#define CONFIG_LIBMFX 0
- #define CONFIG_LIBMODPLUG 0
- #define CONFIG_LIBMP3LAME 0
- #define CONFIG_LIBNUT 0
- #define CONFIG_LIBOPENCORE_AMRNB 0
- #define CONFIG_LIBOPENCORE_AMRWB 0
- #define CONFIG_LIBOPENCV 0
-+#define CONFIG_LIBOPENH264 0
- #define CONFIG_LIBOPENJPEG 0
- #define CONFIG_LIBOPUS 0
- #define CONFIG_LIBPULSE 0
-@@ -435,6 +441,7 @@
- #define CONFIG_LIBZMQ 0
- #define CONFIG_LIBZVBI 0
- #define CONFIG_LZMA 0
-+#define CONFIG_NVENC 0
- #define CONFIG_OPENAL 0
- #define CONFIG_OPENCL 0
- #define CONFIG_OPENGL 0
-@@ -507,6 +514,7 @@
- #define CONFIG_FAANDCT 1
- #define CONFIG_FAANIDCT 1
- #define CONFIG_FDCTDSP 1
-+#define CONFIG_FMTCONVERT 0
- #define CONFIG_FRAME_THREAD_ENCODER 0
- #define CONFIG_GCRYPT 0
- #define CONFIG_GOLOMB 1
-@@ -522,6 +530,7 @@
- #define CONFIG_HUFFYUVENCDSP 0
- #define CONFIG_IDCTDSP 1
- #define CONFIG_IIRFILTER 0
-+#define CONFIG_IMDCT15 1
- #define CONFIG_INTRAX8 0
- #define CONFIG_LGPLV3 0
- #define CONFIG_LLAUDDSP 0
-@@ -536,6 +545,7 @@
- #define CONFIG_NETTLE 0
- #define CONFIG_PIXBLOCKDSP 1
- #define CONFIG_QPELDSP 1
-+#define CONFIG_QSV 0
- #define CONFIG_RANGECODER 0
- #define CONFIG_RIFFDEC 1
- #define CONFIG_RIFFENC 0
-@@ -629,10 +639,12 @@
- #define CONFIG_H263P_DECODER 0
- #define CONFIG_H264_DECODER 1
- #define CONFIG_H264_CRYSTALHD_DECODER 0
-+#define CONFIG_H264_QSV_DECODER 0
- #define CONFIG_H264_VDA_DECODER 0
- #define CONFIG_H264_VDPAU_DECODER 0
- #define CONFIG_HEVC_DECODER 0
- #define CONFIG_HNM4_VIDEO_DECODER 0
-+#define CONFIG_HQX_DECODER 0
- #define CONFIG_HUFFYUV_DECODER 0
- #define CONFIG_IDCIN_DECODER 0
- #define CONFIG_IFF_BYTERUN1_DECODER 0
-@@ -719,6 +731,7 @@
- #define CONFIG_SVQ3_DECODER 0
- #define CONFIG_TARGA_DECODER 0
- #define CONFIG_TARGA_Y216_DECODER 0
-+#define CONFIG_TDSC_DECODER 0
- #define CONFIG_THEORA_DECODER 1
- #define CONFIG_THP_DECODER 0
- #define CONFIG_TIERTEXSEQVIDEO_DECODER 0
-@@ -797,6 +810,7 @@
- #define CONFIG_DSD_LSBF_PLANAR_DECODER 0
- #define CONFIG_DSD_MSBF_PLANAR_DECODER 0
- #define CONFIG_DSICINAUDIO_DECODER 0
-+#define CONFIG_DSS_SP_DECODER 0
- #define CONFIG_EAC3_DECODER 0
- #define CONFIG_EVRC_DECODER 0
- #define CONFIG_FFWAVESYNTH_DECODER 0
-@@ -923,6 +937,7 @@
- #define CONFIG_VIMA_DECODER 0
- #define CONFIG_SSA_DECODER 0
- #define CONFIG_ASS_DECODER 0
-+#define CONFIG_CCAPTION_DECODER 0
- #define CONFIG_DVBSUB_DECODER 0
- #define CONFIG_DVDSUB_DECODER 0
- #define CONFIG_JACOSUB_DECODER 0
-@@ -943,6 +958,7 @@
- #define CONFIG_WEBVTT_DECODER 0
- #define CONFIG_XSUB_DECODER 0
- #define CONFIG_LIBCELT_DECODER 0
-+#define CONFIG_LIBDCADEC_DECODER 0
- #define CONFIG_LIBFDK_AAC_DECODER 0
- #define CONFIG_LIBGSM_DECODER 0
- #define CONFIG_LIBGSM_MS_DECODER 0
-@@ -1007,9 +1023,11 @@
- #define CONFIG_DNXHD_DEMUXER 0
- #define CONFIG_DSF_DEMUXER 0
- #define CONFIG_DSICIN_DEMUXER 0
-+#define CONFIG_DSS_DEMUXER 0
- #define CONFIG_DTS_DEMUXER 0
- #define CONFIG_DTSHD_DEMUXER 0
- #define CONFIG_DV_DEMUXER 0
-+#define CONFIG_DVBSUB_DEMUXER 0
- #define CONFIG_DXA_DEMUXER 0
- #define CONFIG_EA_DEMUXER 0
- #define CONFIG_EA_CDATA_DEMUXER 0
-@@ -1235,6 +1253,7 @@
- #define CONFIG_MSMPEG4V2_ENCODER 0
- #define CONFIG_MSMPEG4V3_ENCODER 0
- #define CONFIG_MSVIDEO1_ENCODER 0
-+#define CONFIG_NVENC_ENCODER 0
- #define CONFIG_PAM_ENCODER 0
- #define CONFIG_PBM_ENCODER 0
- #define CONFIG_PCX_ENCODER 0
-@@ -1364,6 +1383,7 @@
- #define CONFIG_LIBXAVS_ENCODER 0
- #define CONFIG_LIBXVID_ENCODER 0
- #define CONFIG_LIBAACPLUS_ENCODER 0
-+#define CONFIG_LIBOPENH264_ENCODER 0
- #define CONFIG_ADELAY_FILTER 0
- #define CONFIG_AECHO_FILTER 0
- #define CONFIG_AEVAL_FILTER 0
-@@ -1400,6 +1420,7 @@
- #define CONFIG_CHANNELMAP_FILTER 0
- #define CONFIG_CHANNELSPLIT_FILTER 0
- #define CONFIG_COMPAND_FILTER 0
-+#define CONFIG_DCSHIFT_FILTER 0
- #define CONFIG_EARWAX_FILTER 0
- #define CONFIG_EBUR128_FILTER 0
- #define CONFIG_EQUALIZER_FILTER 0
-@@ -1432,6 +1453,7 @@
- #define CONFIG_CODECVIEW_FILTER 0
- #define CONFIG_COLORBALANCE_FILTER 0
- #define CONFIG_COLORCHANNELMIXER_FILTER 0
-+#define CONFIG_COLORLEVELS_FILTER 0
- #define CONFIG_COLORMATRIX_FILTER 0
- #define CONFIG_COPY_FILTER 0
- #define CONFIG_CROP_FILTER 0
-@@ -1447,8 +1469,10 @@
- #define CONFIG_DRAWTEXT_FILTER 0
- #define CONFIG_EDGEDETECT_FILTER 0
- #define CONFIG_ELBG_FILTER 0
-+#define CONFIG_EQ_FILTER 0
- #define CONFIG_EXTRACTPLANES_FILTER 0
- #define CONFIG_FADE_FILTER 0
-+#define CONFIG_FFTFILT_FILTER 0
- #define CONFIG_FIELD_FILTER 0
- #define CONFIG_FIELDMATCH_FILTER 0
- #define CONFIG_FIELDORDER_FILTER 0
-@@ -1457,6 +1481,7 @@
- #define CONFIG_FRAMEPACK_FILTER 0
- #define CONFIG_FRAMESTEP_FILTER 0
- #define CONFIG_FREI0R_FILTER 0
-+#define CONFIG_FSPP_FILTER 0
- #define CONFIG_GEQ_FILTER 0
- #define CONFIG_GRADFUN_FILTER 0
- #define CONFIG_HALDCLUT_FILTER 0
-@@ -1478,7 +1503,6 @@
- #define CONFIG_LUTYUV_FILTER 0
- #define CONFIG_MCDEINT_FILTER 0
- #define CONFIG_MERGEPLANES_FILTER 0
--#define CONFIG_MP_FILTER 0
- #define CONFIG_MPDECIMATE_FILTER 0
- #define CONFIG_NEGATE_FILTER 0
- #define CONFIG_NOFORMAT_FILTER 0
-@@ -1488,14 +1512,19 @@
- #define CONFIG_OVERLAY_FILTER 0
- #define CONFIG_OWDENOISE_FILTER 0
- #define CONFIG_PAD_FILTER 0
-+#define CONFIG_PALETTEGEN_FILTER 0
-+#define CONFIG_PALETTEUSE_FILTER 0
- #define CONFIG_PERMS_FILTER 0
- #define CONFIG_PERSPECTIVE_FILTER 0
- #define CONFIG_PHASE_FILTER 0
- #define CONFIG_PIXDESCTEST_FILTER 0
- #define CONFIG_PP_FILTER 0
-+#define CONFIG_PP7_FILTER 0
- #define CONFIG_PSNR_FILTER 0
- #define CONFIG_PULLUP_FILTER 0
-+#define CONFIG_QP_FILTER 0
- #define CONFIG_REMOVELOGO_FILTER 0
-+#define CONFIG_REPEATFIELDS_FILTER 0
- #define CONFIG_ROTATE_FILTER 0
- #define CONFIG_SAB_FILTER 0
- #define CONFIG_SCALE_FILTER 0
-@@ -1508,6 +1537,7 @@
- #define CONFIG_SETSAR_FILTER 0
- #define CONFIG_SETTB_FILTER 0
- #define CONFIG_SHOWINFO_FILTER 0
-+#define CONFIG_SHOWPALETTE_FILTER 0
- #define CONFIG_SHUFFLEPLANES_FILTER 0
- #define CONFIG_SIGNALSTATS_FILTER 0
- #define CONFIG_SMARTBLUR_FILTER 0
-@@ -1517,6 +1547,7 @@
- #define CONFIG_SUBTITLES_FILTER 0
- #define CONFIG_SUPER2XSAI_FILTER 0
- #define CONFIG_SWAPUV_FILTER 0
-+#define CONFIG_TBLEND_FILTER 0
- #define CONFIG_TELECINE_FILTER 0
- #define CONFIG_THUMBNAIL_FILTER 0
- #define CONFIG_TILE_FILTER 0
-@@ -1524,6 +1555,7 @@
- #define CONFIG_TRANSPOSE_FILTER 0
- #define CONFIG_TRIM_FILTER 0
- #define CONFIG_UNSHARP_FILTER 0
-+#define CONFIG_USPP_FILTER 0
- #define CONFIG_VFLIP_FILTER 0
- #define CONFIG_VIDSTABDETECT_FILTER 0
- #define CONFIG_VIDSTABTRANSFORM_FILTER 0
-@@ -1551,15 +1583,18 @@
- #define CONFIG_SHOWCQT_FILTER 0
- #define CONFIG_SHOWSPECTRUM_FILTER 0
- #define CONFIG_SHOWWAVES_FILTER 0
-+#define CONFIG_SHOWWAVESPIC_FILTER 0
- #define CONFIG_AMOVIE_FILTER 0
- #define CONFIG_MOVIE_FILTER 0
- #define CONFIG_H263_VAAPI_HWACCEL 0
- #define CONFIG_H263_VDPAU_HWACCEL 0
- #define CONFIG_H264_DXVA2_HWACCEL 0
-+#define CONFIG_H264_QSV_HWACCEL 0
- #define CONFIG_H264_VAAPI_HWACCEL 0
- #define CONFIG_H264_VDA_HWACCEL 0
- #define CONFIG_H264_VDA_OLD_HWACCEL 0
- #define CONFIG_H264_VDPAU_HWACCEL 0
-+#define CONFIG_HEVC_DXVA2_HWACCEL 0
- #define CONFIG_MPEG1_XVMC_HWACCEL 0
- #define CONFIG_MPEG1_VDPAU_HWACCEL 0
- #define CONFIG_MPEG2_XVMC_HWACCEL 0
-@@ -1673,6 +1708,7 @@
- #define CONFIG_MPJPEG_MUXER 0
- #define CONFIG_MXF_MUXER 0
- #define CONFIG_MXF_D10_MUXER 0
-+#define CONFIG_MXF_OPATOM_MUXER 0
- #define CONFIG_NULL_MUXER 0
- #define CONFIG_NUT_MUXER 0
- #define CONFIG_OGA_MUXER 0
-@@ -1705,6 +1741,7 @@
- #define CONFIG_ROQ_MUXER 0
- #define CONFIG_RSO_MUXER 0
- #define CONFIG_RTP_MUXER 0
-+#define CONFIG_RTP_MPEGTS_MUXER 0
- #define CONFIG_RTSP_MUXER 0
- #define CONFIG_SAP_MUXER 0
- #define CONFIG_SEGMENT_MUXER 0
-diff --git a/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h b/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
-index 4fd8d0a..93c926c 100644
---- a/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
-+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h
-@@ -1,12 +1,12 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
--#define CONFIG_THIS_YEAR 2014
-+#define CONFIG_THIS_YEAR 2015
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
- #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
--#define CC_IDENT "gcc 4.8 (Ubuntu/Linaro 4.8.2-13ubuntu1)"
-+#define CC_IDENT "gcc 4.9 (Tizen)"
- #define av_restrict restrict
- #define EXTERN_PREFIX ""
- #define EXTERN_ASM
-@@ -69,7 +69,7 @@
- #define HAVE_CPUNOP 0
- #define HAVE_I686 0
- #define HAVE_MIPSFPU 0
--#define HAVE_MIPS32R2 0
-+#define HAVE_MIPS32R2 1
- #define HAVE_MIPSDSPR1 0
- #define HAVE_MIPSDSPR2 0
- #define HAVE_LOONGSON 1
-@@ -174,7 +174,6 @@
- #define HAVE_ASM_TYPES_H 1
- #define HAVE_CDIO_PARANOIA_H 0
- #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
--#define HAVE_CL_CL_H 0
- #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
- #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
- #define HAVE_DEV_IC_BT8XX_H 0
-@@ -266,7 +265,6 @@
- #define HAVE_LZO1X_999_COMPRESS 0
- #define HAVE_MACH_ABSOLUTE_TIME 0
- #define HAVE_MAPVIEWOFFILE 0
--#define HAVE_MOVEFILEEXA 0
- #define HAVE_MEMALIGN 1
- #define HAVE_MKSTEMP 1
- #define HAVE_MMAP 1
-@@ -291,6 +289,7 @@
- #define HAVE_W32THREADS 0
- #define HAVE_AS_DN_DIRECTIVE 0
- #define HAVE_AS_FUNC 1
-+#define HAVE_AS_OBJECT_ARCH 0
- #define HAVE_ASM_MOD_Q 0
- #define HAVE_ATTRIBUTE_MAY_ALIAS 1
- #define HAVE_ATTRIBUTE_PACKED 1
-@@ -303,13 +302,14 @@
- #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
- #define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
- #define HAVE_PRAGMA_DEPRECATED 1
--#define HAVE_RSYNC_CONTIMEOUT 1
-+#define HAVE_RSYNC_CONTIMEOUT 0
- #define HAVE_SYMVER_ASM_LABEL 0
- #define HAVE_SYMVER_GNU_ASM 1
- #define HAVE_VFP_ARGS 0
- #define HAVE_XFORM_ASM 0
- #define HAVE_XMM_CLOBBERS 0
- #define HAVE_CONDITION_VARIABLE_PTR 0
-+#define HAVE_DXVA_PICPARAMS_HEVC 0
- #define HAVE_SOCKLEN_T 0
- #define HAVE_STRUCT_ADDRINFO 0
- #define HAVE_STRUCT_GROUP_SOURCE_REQ 0
-@@ -330,13 +330,15 @@
- #define HAVE_LIBC_MSVCRT 0
- #define HAVE_LIBDC1394_1 0
- #define HAVE_LIBDC1394_2 0
--#define HAVE_MAKEINFO 1
--#define HAVE_MAKEINFO_HTML 1
-+#define HAVE_MAKEINFO 0
-+#define HAVE_MAKEINFO_HTML 0
- #define HAVE_PERL 1
- #define HAVE_POD2MAN 1
- #define HAVE_SDL 0
-+#define HAVE_SECTION_DATA_REL_RO 1
- #define HAVE_TEXI2HTML 0
- #define HAVE_THREADS 1
-+#define HAVE_VAAPI_X11 0
- #define HAVE_VDPAU_X11 0
- #define HAVE_XLIB 0
- #define CONFIG_BSFS 0
-@@ -351,10 +353,10 @@
- #define CONFIG_PARSERS 1
- #define CONFIG_PROTOCOLS 0
- #define CONFIG_DOC 0
--#define CONFIG_HTMLPAGES 1
--#define CONFIG_MANPAGES 1
--#define CONFIG_PODPAGES 1
--#define CONFIG_TXTPAGES 1
-+#define CONFIG_HTMLPAGES 0
-+#define CONFIG_MANPAGES 0
-+#define CONFIG_PODPAGES 0
-+#define CONFIG_TXTPAGES 0
- #define CONFIG_AVIO_READING_EXAMPLE 1
- #define CONFIG_DECODING_ENCODING_EXAMPLE 1
- #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
-@@ -364,6 +366,7 @@
- #define CONFIG_FILTERING_VIDEO_EXAMPLE 0
- #define CONFIG_METADATA_EXAMPLE 1
- #define CONFIG_MUXING_EXAMPLE 0
-+#define CONFIG_QSVDEC_EXAMPLE 0
- #define CONFIG_REMUXING_EXAMPLE 1
- #define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
- #define CONFIG_SCALING_VIDEO_EXAMPLE 0
-@@ -385,6 +388,7 @@
- #define CONFIG_LIBCDIO 0
- #define CONFIG_LIBCELT 0
- #define CONFIG_LIBDC1394 0
-+#define CONFIG_LIBDCADEC 0
- #define CONFIG_LIBFAAC 0
- #define CONFIG_LIBFDK_AAC 0
- #define CONFIG_LIBFLITE 0
-@@ -395,12 +399,14 @@
- #define CONFIG_LIBGSM 0
- #define CONFIG_LIBIEC61883 0
- #define CONFIG_LIBILBC 0
-+#define CONFIG_LIBMFX 0
- #define CONFIG_LIBMODPLUG 0
- #define CONFIG_LIBMP3LAME 0
- #define CONFIG_LIBNUT 0
- #define CONFIG_LIBOPENCORE_AMRNB 0
- #define CONFIG_LIBOPENCORE_AMRWB 0
- #define CONFIG_LIBOPENCV 0
-+#define CONFIG_LIBOPENH264 0
- #define CONFIG_LIBOPENJPEG 0
- #define CONFIG_LIBOPUS 0
- #define CONFIG_LIBPULSE 0
-@@ -435,6 +441,7 @@
- #define CONFIG_LIBZMQ 0
- #define CONFIG_LIBZVBI 0
- #define CONFIG_LZMA 0
-+#define CONFIG_NVENC 0
- #define CONFIG_OPENAL 0
- #define CONFIG_OPENCL 0
- #define CONFIG_OPENGL 0
-@@ -507,6 +514,7 @@
- #define CONFIG_FAANDCT 0
- #define CONFIG_FAANIDCT 0
- #define CONFIG_FDCTDSP 0
-+#define CONFIG_FMTCONVERT 0
- #define CONFIG_FRAME_THREAD_ENCODER 0
- #define CONFIG_GCRYPT 0
- #define CONFIG_GOLOMB 1
-@@ -522,6 +530,7 @@
- #define CONFIG_HUFFYUVENCDSP 0
- #define CONFIG_IDCTDSP 0
- #define CONFIG_IIRFILTER 0
-+#define CONFIG_IMDCT15 0
- #define CONFIG_INTRAX8 0
- #define CONFIG_LGPLV3 0
- #define CONFIG_LLAUDDSP 0
-@@ -536,6 +545,7 @@
- #define CONFIG_NETTLE 0
- #define CONFIG_PIXBLOCKDSP 0
- #define CONFIG_QPELDSP 0
-+#define CONFIG_QSV 0
- #define CONFIG_RANGECODER 0
- #define CONFIG_RIFFDEC 1
- #define CONFIG_RIFFENC 0
-@@ -629,10 +639,12 @@
- #define CONFIG_H263P_DECODER 0
- #define CONFIG_H264_DECODER 0
- #define CONFIG_H264_CRYSTALHD_DECODER 0
-+#define CONFIG_H264_QSV_DECODER 0
- #define CONFIG_H264_VDA_DECODER 0
- #define CONFIG_H264_VDPAU_DECODER 0
- #define CONFIG_HEVC_DECODER 0
- #define CONFIG_HNM4_VIDEO_DECODER 0
-+#define CONFIG_HQX_DECODER 0
- #define CONFIG_HUFFYUV_DECODER 0
- #define CONFIG_IDCIN_DECODER 0
- #define CONFIG_IFF_BYTERUN1_DECODER 0
-@@ -719,6 +731,7 @@
- #define CONFIG_SVQ3_DECODER 0
- #define CONFIG_TARGA_DECODER 0
- #define CONFIG_TARGA_Y216_DECODER 0
-+#define CONFIG_TDSC_DECODER 0
- #define CONFIG_THEORA_DECODER 1
- #define CONFIG_THP_DECODER 0
- #define CONFIG_TIERTEXSEQVIDEO_DECODER 0
-@@ -797,6 +810,7 @@
- #define CONFIG_DSD_LSBF_PLANAR_DECODER 0
- #define CONFIG_DSD_MSBF_PLANAR_DECODER 0
- #define CONFIG_DSICINAUDIO_DECODER 0
-+#define CONFIG_DSS_SP_DECODER 0
- #define CONFIG_EAC3_DECODER 0
- #define CONFIG_EVRC_DECODER 0
- #define CONFIG_FFWAVESYNTH_DECODER 0
-@@ -923,6 +937,7 @@
- #define CONFIG_VIMA_DECODER 0
- #define CONFIG_SSA_DECODER 0
- #define CONFIG_ASS_DECODER 0
-+#define CONFIG_CCAPTION_DECODER 0
- #define CONFIG_DVBSUB_DECODER 0
- #define CONFIG_DVDSUB_DECODER 0
- #define CONFIG_JACOSUB_DECODER 0
-@@ -943,6 +958,7 @@
- #define CONFIG_WEBVTT_DECODER 0
- #define CONFIG_XSUB_DECODER 0
- #define CONFIG_LIBCELT_DECODER 0
-+#define CONFIG_LIBDCADEC_DECODER 0
- #define CONFIG_LIBFDK_AAC_DECODER 0
- #define CONFIG_LIBGSM_DECODER 0
- #define CONFIG_LIBGSM_MS_DECODER 0
-@@ -1007,9 +1023,11 @@
- #define CONFIG_DNXHD_DEMUXER 0
- #define CONFIG_DSF_DEMUXER 0
- #define CONFIG_DSICIN_DEMUXER 0
-+#define CONFIG_DSS_DEMUXER 0
- #define CONFIG_DTS_DEMUXER 0
- #define CONFIG_DTSHD_DEMUXER 0
- #define CONFIG_DV_DEMUXER 0
-+#define CONFIG_DVBSUB_DEMUXER 0
- #define CONFIG_DXA_DEMUXER 0
- #define CONFIG_EA_DEMUXER 0
- #define CONFIG_EA_CDATA_DEMUXER 0
-@@ -1235,6 +1253,7 @@
- #define CONFIG_MSMPEG4V2_ENCODER 0
- #define CONFIG_MSMPEG4V3_ENCODER 0
- #define CONFIG_MSVIDEO1_ENCODER 0
-+#define CONFIG_NVENC_ENCODER 0
- #define CONFIG_PAM_ENCODER 0
- #define CONFIG_PBM_ENCODER 0
- #define CONFIG_PCX_ENCODER 0
-@@ -1364,6 +1383,7 @@
- #define CONFIG_LIBXAVS_ENCODER 0
- #define CONFIG_LIBXVID_ENCODER 0
- #define CONFIG_LIBAACPLUS_ENCODER 0
-+#define CONFIG_LIBOPENH264_ENCODER 0
- #define CONFIG_ADELAY_FILTER 0
- #define CONFIG_AECHO_FILTER 0
- #define CONFIG_AEVAL_FILTER 0
-@@ -1400,6 +1420,7 @@
- #define CONFIG_CHANNELMAP_FILTER 0
- #define CONFIG_CHANNELSPLIT_FILTER 0
- #define CONFIG_COMPAND_FILTER 0
-+#define CONFIG_DCSHIFT_FILTER 0
- #define CONFIG_EARWAX_FILTER 0
- #define CONFIG_EBUR128_FILTER 0
- #define CONFIG_EQUALIZER_FILTER 0
-@@ -1432,6 +1453,7 @@
- #define CONFIG_CODECVIEW_FILTER 0
- #define CONFIG_COLORBALANCE_FILTER 0
- #define CONFIG_COLORCHANNELMIXER_FILTER 0
-+#define CONFIG_COLORLEVELS_FILTER 0
- #define CONFIG_COLORMATRIX_FILTER 0
- #define CONFIG_COPY_FILTER 0
- #define CONFIG_CROP_FILTER 0
-@@ -1447,8 +1469,10 @@
- #define CONFIG_DRAWTEXT_FILTER 0
- #define CONFIG_EDGEDETECT_FILTER 0
- #define CONFIG_ELBG_FILTER 0
-+#define CONFIG_EQ_FILTER 0
- #define CONFIG_EXTRACTPLANES_FILTER 0
- #define CONFIG_FADE_FILTER 0
-+#define CONFIG_FFTFILT_FILTER 0
- #define CONFIG_FIELD_FILTER 0
- #define CONFIG_FIELDMATCH_FILTER 0
- #define CONFIG_FIELDORDER_FILTER 0
-@@ -1457,6 +1481,7 @@
- #define CONFIG_FRAMEPACK_FILTER 0
- #define CONFIG_FRAMESTEP_FILTER 0
- #define CONFIG_FREI0R_FILTER 0
-+#define CONFIG_FSPP_FILTER 0
- #define CONFIG_GEQ_FILTER 0
- #define CONFIG_GRADFUN_FILTER 0
- #define CONFIG_HALDCLUT_FILTER 0
-@@ -1478,7 +1503,6 @@
- #define CONFIG_LUTYUV_FILTER 0
- #define CONFIG_MCDEINT_FILTER 0
- #define CONFIG_MERGEPLANES_FILTER 0
--#define CONFIG_MP_FILTER 0
- #define CONFIG_MPDECIMATE_FILTER 0
- #define CONFIG_NEGATE_FILTER 0
- #define CONFIG_NOFORMAT_FILTER 0
-@@ -1488,14 +1512,19 @@
- #define CONFIG_OVERLAY_FILTER 0
- #define CONFIG_OWDENOISE_FILTER 0
- #define CONFIG_PAD_FILTER 0
-+#define CONFIG_PALETTEGEN_FILTER 0
-+#define CONFIG_PALETTEUSE_FILTER 0
- #define CONFIG_PERMS_FILTER 0
- #define CONFIG_PERSPECTIVE_FILTER 0
- #define CONFIG_PHASE_FILTER 0
- #define CONFIG_PIXDESCTEST_FILTER 0
- #define CONFIG_PP_FILTER 0
-+#define CONFIG_PP7_FILTER 0
- #define CONFIG_PSNR_FILTER 0
- #define CONFIG_PULLUP_FILTER 0
-+#define CONFIG_QP_FILTER 0
- #define CONFIG_REMOVELOGO_FILTER 0
-+#define CONFIG_REPEATFIELDS_FILTER 0
- #define CONFIG_ROTATE_FILTER 0
- #define CONFIG_SAB_FILTER 0
- #define CONFIG_SCALE_FILTER 0
-@@ -1508,6 +1537,7 @@
- #define CONFIG_SETSAR_FILTER 0
- #define CONFIG_SETTB_FILTER 0
- #define CONFIG_SHOWINFO_FILTER 0
-+#define CONFIG_SHOWPALETTE_FILTER 0
- #define CONFIG_SHUFFLEPLANES_FILTER 0
- #define CONFIG_SIGNALSTATS_FILTER 0
- #define CONFIG_SMARTBLUR_FILTER 0
-@@ -1517,6 +1547,7 @@
- #define CONFIG_SUBTITLES_FILTER 0
- #define CONFIG_SUPER2XSAI_FILTER 0
- #define CONFIG_SWAPUV_FILTER 0
-+#define CONFIG_TBLEND_FILTER 0
- #define CONFIG_TELECINE_FILTER 0
- #define CONFIG_THUMBNAIL_FILTER 0
- #define CONFIG_TILE_FILTER 0
-@@ -1524,6 +1555,7 @@
- #define CONFIG_TRANSPOSE_FILTER 0
- #define CONFIG_TRIM_FILTER 0
- #define CONFIG_UNSHARP_FILTER 0
-+#define CONFIG_USPP_FILTER 0
- #define CONFIG_VFLIP_FILTER 0
- #define CONFIG_VIDSTABDETECT_FILTER 0
- #define CONFIG_VIDSTABTRANSFORM_FILTER 0
-@@ -1551,15 +1583,18 @@
- #define CONFIG_SHOWCQT_FILTER 0
- #define CONFIG_SHOWSPECTRUM_FILTER 0
- #define CONFIG_SHOWWAVES_FILTER 0
-+#define CONFIG_SHOWWAVESPIC_FILTER 0
- #define CONFIG_AMOVIE_FILTER 0
- #define CONFIG_MOVIE_FILTER 0
- #define CONFIG_H263_VAAPI_HWACCEL 0
- #define CONFIG_H263_VDPAU_HWACCEL 0
- #define CONFIG_H264_DXVA2_HWACCEL 0
-+#define CONFIG_H264_QSV_HWACCEL 0
- #define CONFIG_H264_VAAPI_HWACCEL 0
- #define CONFIG_H264_VDA_HWACCEL 0
- #define CONFIG_H264_VDA_OLD_HWACCEL 0
- #define CONFIG_H264_VDPAU_HWACCEL 0
-+#define CONFIG_HEVC_DXVA2_HWACCEL 0
- #define CONFIG_MPEG1_XVMC_HWACCEL 0
- #define CONFIG_MPEG1_VDPAU_HWACCEL 0
- #define CONFIG_MPEG2_XVMC_HWACCEL 0
-@@ -1673,6 +1708,7 @@
- #define CONFIG_MPJPEG_MUXER 0
- #define CONFIG_MXF_MUXER 0
- #define CONFIG_MXF_D10_MUXER 0
-+#define CONFIG_MXF_OPATOM_MUXER 0
- #define CONFIG_NULL_MUXER 0
- #define CONFIG_NUT_MUXER 0
- #define CONFIG_OGA_MUXER 0
-@@ -1705,6 +1741,7 @@
- #define CONFIG_ROQ_MUXER 0
- #define CONFIG_RSO_MUXER 0
- #define CONFIG_RTP_MUXER 0
-+#define CONFIG_RTP_MPEGTS_MUXER 0
- #define CONFIG_RTSP_MUXER 0
- #define CONFIG_SAP_MUXER 0
- #define CONFIG_SEGMENT_MUXER 0
-diff --git a/third_party/ffmpeg/chromium/config/ChromiumOS/linux/arm64/config.h b/third_party/ffmpeg/chromium/config/ChromiumOS/linux/arm64/config.h
-index 1c2d748..2a28e5d 100644
---- a/third_party/ffmpeg/chromium/config/ChromiumOS/linux/arm64/config.h
-+++ b/third_party/ffmpeg/chromium/config/ChromiumOS/linux/arm64/config.h
-@@ -1,12 +1,12 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-demuxer=flac --enable-decoder=flac --enable-parser=flac"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-demuxer=flac --enable-decoder=flac --enable-parser=flac"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
--#define CONFIG_THIS_YEAR 2014
-+#define CONFIG_THIS_YEAR 2015
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
- #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
--#define CC_IDENT "gcc 4.8 (Ubuntu/Linaro 4.8.2-13ubuntu1)"
-+#define CC_IDENT "gcc 4.9 (Tizen)"
- #define av_restrict restrict
- #define EXTERN_PREFIX ""
- #define EXTERN_ASM
-@@ -69,7 +69,7 @@
- #define HAVE_CPUNOP 0
- #define HAVE_I686 0
- #define HAVE_MIPSFPU 0
--#define HAVE_MIPS32R2 0
-+#define HAVE_MIPS32R2 1
- #define HAVE_MIPSDSPR1 0
- #define HAVE_MIPSDSPR2 0
- #define HAVE_LOONGSON 1
-@@ -174,7 +174,6 @@
- #define HAVE_ASM_TYPES_H 1
- #define HAVE_CDIO_PARANOIA_H 0
- #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
--#define HAVE_CL_CL_H 0
- #define HAVE_DEV_BKTR_IOCTL_BT848_H 0
- #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
- #define HAVE_DEV_IC_BT8XX_H 0
-@@ -266,7 +265,6 @@
- #define HAVE_LZO1X_999_COMPRESS 0
- #define HAVE_MACH_ABSOLUTE_TIME 0
- #define HAVE_MAPVIEWOFFILE 0
--#define HAVE_MOVEFILEEXA 0
- #define HAVE_MEMALIGN 1
- #define HAVE_MKSTEMP 1
- #define HAVE_MMAP 1
-@@ -291,6 +289,7 @@
- #define HAVE_W32THREADS 0
- #define HAVE_AS_DN_DIRECTIVE 0
- #define HAVE_AS_FUNC 1
-+#define HAVE_AS_OBJECT_ARCH 0
- #define HAVE_ASM_MOD_Q 0
- #define HAVE_ATTRIBUTE_MAY_ALIAS 1
- #define HAVE_ATTRIBUTE_PACKED 1
-@@ -303,13 +302,14 @@
- #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
- #define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
- #define HAVE_PRAGMA_DEPRECATED 1
--#define HAVE_RSYNC_CONTIMEOUT 1
-+#define HAVE_RSYNC_CONTIMEOUT 0
- #define HAVE_SYMVER_ASM_LABEL 0
- #define HAVE_SYMVER_GNU_ASM 1
- #define HAVE_VFP_ARGS 0
- #define HAVE_XFORM_ASM 0
- #define HAVE_XMM_CLOBBERS 0
- #define HAVE_CONDITION_VARIABLE_PTR 0
-+#define HAVE_DXVA_PICPARAMS_HEVC 0
- #define HAVE_SOCKLEN_T 0
- #define HAVE_STRUCT_ADDRINFO 0
- #define HAVE_STRUCT_GROUP_SOURCE_REQ 0
-@@ -330,13 +330,15 @@
- #define HAVE_LIBC_MSVCRT 0
- #define HAVE_LIBDC1394_1 0
- #define HAVE_LIBDC1394_2 0
--#define HAVE_MAKEINFO 1
--#define HAVE_MAKEINFO_HTML 1
-+#define HAVE_MAKEINFO 0
-+#define HAVE_MAKEINFO_HTML 0
- #define HAVE_PERL 1
- #define HAVE_POD2MAN 1
- #define HAVE_SDL 0
-+#define HAVE_SECTION_DATA_REL_RO 1
- #define HAVE_TEXI2HTML 0
- #define HAVE_THREADS 1
-+#define HAVE_VAAPI_X11 0
- #define HAVE_VDPAU_X11 0
- #define HAVE_XLIB 0
- #define CONFIG_BSFS 0
-@@ -351,10 +353,10 @@
- #define CONFIG_PARSERS 1
- #define CONFIG_PROTOCOLS 0
- #define CONFIG_DOC 0
--#define CONFIG_HTMLPAGES 1
--#define CONFIG_MANPAGES 1
--#define CONFIG_PODPAGES 1
--#define CONFIG_TXTPAGES 1
-+#define CONFIG_HTMLPAGES 0
-+#define CONFIG_MANPAGES 0
-+#define CONFIG_PODPAGES 0
-+#define CONFIG_TXTPAGES 0
- #define CONFIG_AVIO_READING_EXAMPLE 1
- #define CONFIG_DECODING_ENCODING_EXAMPLE 1
- #define CONFIG_DEMUXING_DECODING_EXAMPLE 1
-@@ -364,6 +366,7 @@
- #define CONFIG_FILTERING_VIDEO_EXAMPLE 0
- #define CONFIG_METADATA_EXAMPLE 1
- #define CONFIG_MUXING_EXAMPLE 0
-+#define CONFIG_QSVDEC_EXAMPLE 0
- #define CONFIG_REMUXING_EXAMPLE 1
- #define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
- #define CONFIG_SCALING_VIDEO_EXAMPLE 0
-@@ -385,6 +388,7 @@
- #define CONFIG_LIBCDIO 0
- #define CONFIG_LIBCELT 0
- #define CONFIG_LIBDC1394 0
-+#define CONFIG_LIBDCADEC 0
- #define CONFIG_LIBFAAC 0
- #define CONFIG_LIBFDK_AAC 0
- #define CONFIG_LIBFLITE 0
-@@ -395,12 +399,14 @@
- #define CONFIG_LIBGSM 0
- #define CONFIG_LIBIEC61883 0
- #define CONFIG_LIBILBC 0
-+#define CONFIG_LIBMFX 0
- #define CONFIG_LIBMODPLUG 0
- #define CONFIG_LIBMP3LAME 0
- #define CONFIG_LIBNUT 0
- #define CONFIG_LIBOPENCORE_AMRNB 0
- #define CONFIG_LIBOPENCORE_AMRWB 0
- #define CONFIG_LIBOPENCV 0
-+#define CONFIG_LIBOPENH264 0
- #define CONFIG_LIBOPENJPEG 0
- #define CONFIG_LIBOPUS 0
- #define CONFIG_LIBPULSE 0
-@@ -435,6 +441,7 @@
- #define CONFIG_LIBZMQ 0
- #define CONFIG_LIBZVBI 0
- #define CONFIG_LZMA 0
-+#define CONFIG_NVENC 0
- #define CONFIG_OPENAL 0
- #define CONFIG_OPENCL 0
- #define CONFIG_OPENGL 0
-@@ -507,6 +514,7 @@
- #define CONFIG_FAANDCT 0
- #define CONFIG_FAANIDCT 0
- #define CONFIG_FDCTDSP 0
-+#define CONFIG_FMTCONVERT 0
- #define CONFIG_FRAME_THREAD_ENCODER 0
- #define CONFIG_GCRYPT 0
- #define CONFIG_GOLOMB 1
-@@ -522,6 +530,7 @@
- #define CONFIG_HUFFYUVENCDSP 0
- #define CONFIG_IDCTDSP 0
- #define CONFIG_IIRFILTER 0
-+#define CONFIG_IMDCT15 0
- #define CONFIG_INTRAX8 0
- #define CONFIG_LGPLV3 0
- #define CONFIG_LLAUDDSP 0
-@@ -536,6 +545,7 @@
- #define CONFIG_NETTLE 0
- #define CONFIG_PIXBLOCKDSP 0
- #define CONFIG_QPELDSP 0
-+#define CONFIG_QSV 0
- #define CONFIG_RANGECODER 0
- #define CONFIG_RIFFDEC 1
- #define CONFIG_RIFFENC 0
-@@ -629,10 +639,12 @@
- #define CONFIG_H263P_DECODER 0
- #define CONFIG_H264_DECODER 0
- #define CONFIG_H264_CRYSTALHD_DECODER 0
-+#define CONFIG_H264_QSV_DECODER 0
- #define CONFIG_H264_VDA_DECODER 0
- #define CONFIG_H264_VDPAU_DECODER 0
- #define CONFIG_HEVC_DECODER 0
- #define CONFIG_HNM4_VIDEO_DECODER 0
-+#define CONFIG_HQX_DECODER 0
- #define CONFIG_HUFFYUV_DECODER 0
- #define CONFIG_IDCIN_DECODER 0
- #define CONFIG_IFF_BYTERUN1_DECODER 0
-@@ -719,6 +731,7 @@
- #define CONFIG_SVQ3_DECODER 0
- #define CONFIG_TARGA_DECODER 0
- #define CONFIG_TARGA_Y216_DECODER 0
-+#define CONFIG_TDSC_DECODER 0
- #define CONFIG_THEORA_DECODER 1
- #define CONFIG_THP_DECODER 0
- #define CONFIG_TIERTEXSEQVIDEO_DECODER 0
-@@ -797,6 +810,7 @@
- #define CONFIG_DSD_LSBF_PLANAR_DECODER 0
- #define CONFIG_DSD_MSBF_PLANAR_DECODER 0
- #define CONFIG_DSICINAUDIO_DECODER 0
-+#define CONFIG_DSS_SP_DECODER 0
- #define CONFIG_EAC3_DECODER 0
- #define CONFIG_EVRC_DECODER 0
- #define CONFIG_FFWAVESYNTH_DECODER 0
-@@ -923,6 +937,7 @@
- #define CONFIG_VIMA_DECODER 0
- #define CONFIG_SSA_DECODER 0
- #define CONFIG_ASS_DECODER 0
-+#define CONFIG_CCAPTION_DECODER 0
- #define CONFIG_DVBSUB_DECODER 0
- #define CONFIG_DVDSUB_DECODER 0
- #define CONFIG_JACOSUB_DECODER 0
-@@ -943,6 +958,7 @@
- #define CONFIG_WEBVTT_DECODER 0
- #define CONFIG_XSUB_DECODER 0
- #define CONFIG_LIBCELT_DECODER 0
-+#define CONFIG_LIBDCADEC_DECODER 0
- #define CONFIG_LIBFDK_AAC_DECODER 0
- #define CONFIG_LIBGSM_DECODER 0
- #define CONFIG_LIBGSM_MS_DECODER 0
-@@ -1007,9 +1023,11 @@
- #define CONFIG_DNXHD_DEMUXER 0
- #define CONFIG_DSF_DEMUXER 0
- #define CONFIG_DSICIN_DEMUXER 0
-+#define CONFIG_DSS_DEMUXER 0
- #define CONFIG_DTS_DEMUXER 0
- #define CONFIG_DTSHD_DEMUXER 0
- #define CONFIG_DV_DEMUXER 0
-+#define CONFIG_DVBSUB_DEMUXER 0
- #define CONFIG_DXA_DEMUXER 0
- #define CONFIG_EA_DEMUXER 0
- #define CONFIG_EA_CDATA_DEMUXER 0
-@@ -1235,6 +1253,7 @@
- #define CONFIG_MSMPEG4V2_ENCODER 0
- #define CONFIG_MSMPEG4V3_ENCODER 0
- #define CONFIG_MSVIDEO1_ENCODER 0
-+#define CONFIG_NVENC_ENCODER 0
- #define CONFIG_PAM_ENCODER 0
- #define CONFIG_PBM_ENCODER 0
- #define CONFIG_PCX_ENCODER 0
-@@ -1364,6 +1383,7 @@
- #define CONFIG_LIBXAVS_ENCODER 0
- #define CONFIG_LIBXVID_ENCODER 0
- #define CONFIG_LIBAACPLUS_ENCODER 0
-+#define CONFIG_LIBOPENH264_ENCODER 0
- #define CONFIG_ADELAY_FILTER 0
- #define CONFIG_AECHO_FILTER 0
- #define CONFIG_AEVAL_FILTER 0
-@@ -1400,6 +1420,7 @@
- #define CONFIG_CHANNELMAP_FILTER 0
- #define CONFIG_CHANNELSPLIT_FILTER 0
- #define CONFIG_COMPAND_FILTER 0
-+#define CONFIG_DCSHIFT_FILTER 0
- #define CONFIG_EARWAX_FILTER 0
- #define CONFIG_EBUR128_FILTER 0
- #define CONFIG_EQUALIZER_FILTER 0
-@@ -1432,6 +1453,7 @@
- #define CONFIG_CODECVIEW_FILTER 0
- #define CONFIG_COLORBALANCE_FILTER 0
- #define CONFIG_COLORCHANNELMIXER_FILTER 0
-+#define CONFIG_COLORLEVELS_FILTER 0
- #define CONFIG_COLORMATRIX_FILTER 0
- #define CONFIG_COPY_FILTER 0
- #define CONFIG_CROP_FILTER 0
-@@ -1447,8 +1469,10 @@
- #define CONFIG_DRAWTEXT_FILTER 0
- #define CONFIG_EDGEDETECT_FILTER 0
- #define CONFIG_ELBG_FILTER 0
-+#define CONFIG_EQ_FILTER 0
- #define CONFIG_EXTRACTPLANES_FILTER 0
- #define CONFIG_FADE_FILTER 0
-+#define CONFIG_FFTFILT_FILTER 0
- #define CONFIG_FIELD_FILTER 0
- #define CONFIG_FIELDMATCH_FILTER 0
- #define CONFIG_FIELDORDER_FILTER 0
-@@ -1457,6 +1481,7 @@
- #define CONFIG_FRAMEPACK_FILTER 0
- #define CONFIG_FRAMESTEP_FILTER 0
- #define CONFIG_FREI0R_FILTER 0
-+#define CONFIG_FSPP_FILTER 0
- #define CONFIG_GEQ_FILTER 0
- #define CONFIG_GRADFUN_FILTER 0
- #define CONFIG_HALDCLUT_FILTER 0
-@@ -1478,7 +1503,6 @@
- #define CONFIG_LUTYUV_FILTER 0
- #define CONFIG_MCDEINT_FILTER 0
- #define CONFIG_MERGEPLANES_FILTER 0
--#define CONFIG_MP_FILTER 0
- #define CONFIG_MPDECIMATE_FILTER 0
- #define CONFIG_NEGATE_FILTER 0
- #define CONFIG_NOFORMAT_FILTER 0
-@@ -1488,14 +1512,19 @@
- #define CONFIG_OVERLAY_FILTER 0
- #define CONFIG_OWDENOISE_FILTER 0
- #define CONFIG_PAD_FILTER 0
-+#define CONFIG_PALETTEGEN_FILTER 0
-+#define CONFIG_PALETTEUSE_FILTER 0
- #define CONFIG_PERMS_FILTER 0
- #define CONFIG_PERSPECTIVE_FILTER 0
- #define CONFIG_PHASE_FILTER 0
- #define CONFIG_PIXDESCTEST_FILTER 0
- #define CONFIG_PP_FILTER 0
-+#define CONFIG_PP7_FILTER 0
- #define CONFIG_PSNR_FILTER 0
- #define CONFIG_PULLUP_FILTER 0
-+#define CONFIG_QP_FILTER 0
- #define CONFIG_REMOVELOGO_FILTER 0
-+#define CONFIG_REPEATFIELDS_FILTER 0
- #define CONFIG_ROTATE_FILTER 0
- #define CONFIG_SAB_FILTER 0
- #define CONFIG_SCALE_FILTER 0
-@@ -1508,6 +1537,7 @@
- #define CONFIG_SETSAR_FILTER 0
- #define CONFIG_SETTB_FILTER 0
- #define CONFIG_SHOWINFO_FILTER 0
-+#define CONFIG_SHOWPALETTE_FILTER 0
- #define CONFIG_SHUFFLEPLANES_FILTER 0
- #define CONFIG_SIGNALSTATS_FILTER 0
- #define CONFIG_SMARTBLUR_FILTER 0
-@@ -1517,6 +1547,7 @@
- #define CONFIG_SUBTITLES_FILTER 0
- #define CONFIG_SUPER2XSAI_FILTER 0
- #define CONFIG_SWAPUV_FILTER 0
-+#define CONFIG_TBLEND_FILTER 0
- #define CONFIG_TELECINE_FILTER 0
- #define CONFIG_THUMBNAIL_FILTER 0
- #define CONFIG_TILE_FILTER 0
-@@ -1524,6 +1555,7 @@
- #define CONFIG_TRANSPOSE_FILTER 0
- #define CONFIG_TRIM_FILTER 0
- #define CONFIG_UNSHARP_FILTER 0
-+#define CONFIG_USPP_FILTER 0
- #define CONFIG_VFLIP_FILTER 0
- #define CONFIG_VIDSTABDETECT_FILTER 0
- #define CONFIG_VIDSTABTRANSFORM_FILTER 0
-@@ -1551,15 +1583,18 @@
- #define CONFIG_SHOWCQT_FILTER 0
- #define CONFIG_SHOWSPECTRUM_FILTER 0
- #define CONFIG_SHOWWAVES_FILTER 0
-+#define CONFIG_SHOWWAVESPIC_FILTER 0
- #define CONFIG_AMOVIE_FILTER 0
- #define CONFIG_MOVIE_FILTER 0
- #define CONFIG_H263_VAAPI_HWACCEL 0
- #define CONFIG_H263_VDPAU_HWACCEL 0
- #define CONFIG_H264_DXVA2_HWACCEL 0
-+#define CONFIG_H264_QSV_HWACCEL 0
- #define CONFIG_H264_VAAPI_HWACCEL 0
- #define CONFIG_H264_VDA_HWACCEL 0
- #define CONFIG_H264_VDA_OLD_HWACCEL 0
- #define CONFIG_H264_VDPAU_HWACCEL 0
-+#define CONFIG_HEVC_DXVA2_HWACCEL 0
- #define CONFIG_MPEG1_XVMC_HWACCEL 0
- #define CONFIG_MPEG1_VDPAU_HWACCEL 0
- #define CONFIG_MPEG2_XVMC_HWACCEL 0
-@@ -1673,6 +1708,7 @@
- #define CONFIG_MPJPEG_MUXER 0
- #define CONFIG_MXF_MUXER 0
- #define CONFIG_MXF_D10_MUXER 0
-+#define CONFIG_MXF_OPATOM_MUXER 0
- #define CONFIG_NULL_MUXER 0
- #define CONFIG_NUT_MUXER 0
- #define CONFIG_OGA_MUXER 0
-@@ -1705,6 +1741,7 @@
- #define CONFIG_ROQ_MUXER 0
- #define CONFIG_RSO_MUXER 0
- #define CONFIG_RTP_MUXER 0
-+#define CONFIG_RTP_MPEGTS_MUXER 0
- #define CONFIG_RTSP_MUXER 0
- #define CONFIG_SAP_MUXER 0
- #define CONFIG_SEGMENT_MUXER 0
-diff --git a/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/libavutil/ffversion.h b/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/libavutil/ffversion.h
-new file mode 100644
-index 0000000..e2ce7a6
---- /dev/null
-+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/arm64/libavutil/ffversion.h
-@@ -0,0 +1,4 @@
-+#ifndef AVUTIL_FFVERSION_H
-+#define AVUTIL_FFVERSION_H
-+#define FFMPEG_VERSION "2.5.git"
-+#endif /* AVUTIL_FFVERSION_H */
-diff --git a/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/libavutil/ffversion.h b/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/libavutil/ffversion.h
-new file mode 100644
-index 0000000..e2ce7a6
---- /dev/null
-+++ b/third_party/ffmpeg/chromium/config/ChromeOS/linux/arm64/libavutil/ffversion.h
-@@ -0,0 +1,4 @@
-+#ifndef AVUTIL_FFVERSION_H
-+#define AVUTIL_FFVERSION_H
-+#define FFMPEG_VERSION "2.5.git"
-+#endif /* AVUTIL_FFVERSION_H */
-diff --git a/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/libavutil/ffversion.h b/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/libavutil/ffversion.h
-new file mode 100644
-index 0000000..e2ce7a6
---- /dev/null
-+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/libavutil/ffversion.h
-@@ -0,0 +1,4 @@
-+#ifndef AVUTIL_FFVERSION_H
-+#define AVUTIL_FFVERSION_H
-+#define FFMPEG_VERSION "2.5.git"
-+#endif /* AVUTIL_FFVERSION_H */
-diff --git a/third_party/ffmpeg/chromium/config/ChromiumOS/linux/arm64/libavutil/ffversion.h b/third_party/ffmpeg/chromium/config/ChromiumOS/linux/arm64/libavutil/ffversion.h
-new file mode 100644
-index 0000000..e2ce7a6
---- /dev/null
-+++ b/third_party/ffmpeg/chromium/config/ChromiumOS/linux/arm64/libavutil/ffversion.h
-@@ -0,0 +1,4 @@
-+#ifndef AVUTIL_FFVERSION_H
-+#define AVUTIL_FFVERSION_H
-+#define FFMPEG_VERSION "2.5.git"
-+#endif /* AVUTIL_FFVERSION_H */
-diff --git a/third_party/ffmpeg/chromium/scripts/generate_gyp.py b/third_party/ffmpeg/chromium/scripts/generate_gyp.py
-index b7b0220..9b7ece0 100755
---- a/third_party/ffmpeg/chromium/scripts/generate_gyp.py
-+++ b/third_party/ffmpeg/chromium/scripts/generate_gyp.py
-@@ -140,7 +140,7 @@ GN_SOURCE_END = """]
- """
-
- # Controls GYP conditional stanza generation.
--SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon', 'x64', 'mipsel']
-+SUPPORTED_ARCHITECTURES = ['ia32', 'arm', 'arm-neon', 'x64', 'mipsel', 'aarch64', 'arm64']
- SUPPORTED_TARGETS = ['Chromium', 'Chrome', 'ChromiumOS', 'ChromeOS', 'Ensemble']
- # Mac doesn't have any platform specific files, so just use linux and win.
- SUPPORTED_PLATFORMS = ['linux', 'win']
-diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
-index 3edf373..87f5487 100644
---- a/third_party/ffmpeg/ffmpeg.gyp
-+++ b/third_party/ffmpeg/ffmpeg.gyp
-@@ -323,6 +323,9 @@
- # exported.
- '-fvisibility=hidden',
- ],
-+ 'sources': [
-+ '<@(asm_sources)',
-+ ],
- 'link_settings': {
- 'ldflags': [
- '-Wl,-Bsymbolic',
-diff --git a/third_party/ffmpeg/ffmpeg_generated.gypi b/third_party/ffmpeg/ffmpeg_generated.gypi
-index ce4bad9..ad3cc05 100644
---- a/third_party/ffmpeg/ffmpeg_generated.gypi
-+++ b/third_party/ffmpeg/ffmpeg_generated.gypi
-@@ -181,6 +181,7 @@
- 'libavcodec/mpegvideo_motion.c',
- 'libavcodec/mpegvideodsp.c',
- 'libavcodec/msgsmdec.c',
-+ 'libavcodec/neon/mpegvideo.c',
- 'libavcodec/pixblockdsp.c',
- 'libavcodec/qpeldsp.c',
- 'libavcodec/simple_idct.c',
-@@ -352,6 +353,33 @@
- 'libavformat/mp3dec.c',
- ],
- }], # (1) and (ffmpeg_branding == "ChromeOS" or ffmpeg_branding == "Chrome" or ffmpeg_branding == "Ensemble") and (1)
-+ ['(target_arch == "arm64") and (ffmpeg_branding == "Chrome" or ffmpeg_branding == "ChromeOS") and (1)', {
-+ 'c_sources': [
-+ 'libavcodec/aarch64/h264chroma_init_aarch64.c',
-+ 'libavcodec/aarch64/h264dsp_init_aarch64.c',
-+ 'libavcodec/aarch64/h264qpel_init_aarch64.c',
-+ 'libavcodec/aarch64/imdct15_init.c',
-+ 'libavcodec/aarch64/mpegaudiodsp_init.c',
-+ ],
-+ 'asm_sources': [
-+ 'libavcodec/aarch64/h264cmc_neon.S',
-+ 'libavcodec/aarch64/h264dsp_neon.S',
-+ 'libavcodec/aarch64/h264idct_neon.S',
-+ 'libavcodec/aarch64/h264qpel_neon.S',
-+ 'libavcodec/aarch64/imdct15_neon.S',
-+ 'libavcodec/aarch64/mpegaudiodsp_neon.S',
-+ ],
-+ }], # (target_arch == "arm64") and (ffmpeg_branding == "Chrome" or ffmpeg_branding == "ChromeOS") and (1)
-+ ['(target_arch == "arm64") and (ffmpeg_branding == "ChromiumOS" or ffmpeg_branding == "ChromeOS") and (1)', {
-+ 'c_sources': [
-+ 'libavcodec/flac.c',
-+ 'libavcodec/flac_parser.c',
-+ 'libavcodec/flacdata.c',
-+ 'libavcodec/flacdec.c',
-+ 'libavcodec/flacdsp.c',
-+ 'libavformat/flacdec.c',
-+ ],
-+ }], # (target_arch == "arm64") and (ffmpeg_branding == "ChromiumOS" or ffmpeg_branding == "ChromeOS") and (1)
- ['(1) and (ffmpeg_branding == "ChromiumOS" or ffmpeg_branding == "Chrome" or ffmpeg_branding == "ChromeOS" or ffmpeg_branding == "Ensemble") and (1)', {
- 'c_sources': [
- 'libavformat/rawdec.c',
-@@ -490,6 +518,24 @@
- 'libavutil/utils.c',
- ],
- }], # (1) and (1) and (1)
-+ ['(target_arch == "arm64") and (ffmpeg_branding == "Chrome" or ffmpeg_branding == "ChromiumOS" or ffmpeg_branding == "Chromium" or ffmpeg_branding == "ChromeOS") and (1)', {
-+ 'c_sources': [
-+ 'libavcodec/aarch64/fft_init_aarch64.c',
-+ 'libavcodec/aarch64/hpeldsp_init_aarch64.c',
-+ 'libavcodec/aarch64/videodsp_init.c',
-+ 'libavcodec/aarch64/vorbisdsp_init.c',
-+ 'libavutil/aarch64/cpu.c',
-+ 'libavutil/aarch64/float_dsp_init.c',
-+ ],
-+ 'asm_sources': [
-+ 'libavcodec/aarch64/fft_neon.S',
-+ 'libavcodec/aarch64/hpeldsp_neon.S',
-+ 'libavcodec/aarch64/mdct_neon.S',
-+ 'libavcodec/aarch64/videodsp.S',
-+ 'libavcodec/aarch64/vorbisdsp_neon.S',
-+ 'libavutil/aarch64/float_dsp_neon.S',
-+ ],
-+ }], # (target_arch == "arm64") and (ffmpeg_branding == "Chrome" or ffmpeg_branding == "ChromiumOS" or ffmpeg_branding == "Chromium" or ffmpeg_branding == "ChromeOS") and (1)
- ], # conditions
- },
- }
+++ /dev/null
-diff --git a/third_party/angle/src/libGLESv2.gypi b/src/libGLESv2.gypi
-index bc021c5..29c93fc 100644
---- a/third_party/angle/src/libGLESv2.gypi
-+++ b/third_party/angle/src/libGLESv2.gypi
-@@ -744,7 +744,7 @@
- {
- 'msvs_enable_winphone' : '1',
- }],
-- ['OS=="linux"',
-+ ['OS=="linux" and use_wayland==0',
- {
- 'link_settings': {
- 'ldflags': [
--- /dev/null
+diff --git a/third_party/ffmpeg/libavcodec/aarch64/fft_init_aarch64.c b/third_party/ffmpeg/libavcodec/aarch64/fft_init_aarch64.c
+index 8514d3b..4860c5f 100644
+--- a/third_party/ffmpeg/libavcodec/aarch64/fft_init_aarch64.c
++++ b/third_party/ffmpeg/libavcodec/aarch64/fft_init_aarch64.c
+@@ -35,12 +35,12 @@ av_cold void ff_fft_init_aarch64(FFTContext *s)
+ int cpu_flags = av_get_cpu_flags();
+
+ if (have_neon(cpu_flags)) {
+- s->fft_permute = ff_fft_permute_neon;
+- s->fft_calc = ff_fft_calc_neon;
++// s->fft_permute = ff_fft_permute_neon;
++// s->fft_calc = ff_fft_calc_neon;
+ #if CONFIG_MDCT
+- s->imdct_calc = ff_imdct_calc_neon;
+- s->imdct_half = ff_imdct_half_neon;
+- s->mdct_calc = ff_mdct_calc_neon;
++// s->imdct_calc = ff_imdct_calc_neon;
++// s->imdct_half = ff_imdct_half_neon;
++// s->mdct_calc = ff_mdct_calc_neon;
+ s->mdct_permutation = FF_MDCT_PERM_INTERLEAVE;
+ #endif
+ }
+diff --git a/third_party/ffmpeg/libavcodec/aarch64/h264pred_init.c b/third_party/ffmpeg/libavcodec/aarch64/h264pred_init.c
+index b144376..db4d4bd 100644
+--- a/third_party/ffmpeg/libavcodec/aarch64/h264pred_init.c
++++ b/third_party/ffmpeg/libavcodec/aarch64/h264pred_init.c
+@@ -53,7 +53,7 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id,
+
+ if (high_depth)
+ return;
+-
++/*
+ if (chroma_format_idc <= 1) {
+ h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon;
+ h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon;
+@@ -81,6 +81,7 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id,
+ if (codec_id != AV_CODEC_ID_SVQ3 && codec_id != AV_CODEC_ID_RV40 &&
+ codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8)
+ h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon;
++*/
+ }
+
+ av_cold void ff_h264_pred_init_aarch64(H264PredContext *h, int codec_id,
+diff --git a/third_party/ffmpeg/libavcodec/aarch64/hpeldsp_init_aarch64.c b/third_party/ffmpeg/libavcodec/aarch64/hpeldsp_init_aarch64.c
+index 144ae2b..790edbe 100644
+--- a/third_party/ffmpeg/libavcodec/aarch64/hpeldsp_init_aarch64.c
++++ b/third_party/ffmpeg/libavcodec/aarch64/hpeldsp_init_aarch64.c
+@@ -86,7 +86,7 @@ void ff_avg_pixels16_xy2_no_rnd_neon(uint8_t *block, const uint8_t *pixels,
+ av_cold void ff_hpeldsp_init_aarch64(HpelDSPContext *c, int flags)
+ {
+ int cpu_flags = av_get_cpu_flags();
+-
++/*
+ if (have_neon(cpu_flags)) {
+ c->put_pixels_tab[0][0] = ff_put_pixels16_neon;
+ c->put_pixels_tab[0][1] = ff_put_pixels16_x2_neon;
+@@ -120,4 +120,5 @@ av_cold void ff_hpeldsp_init_aarch64(HpelDSPContext *c, int flags)
+ c->avg_no_rnd_pixels_tab[2] = ff_avg_pixels16_y2_no_rnd_neon;
+ c->avg_no_rnd_pixels_tab[3] = ff_avg_pixels16_xy2_no_rnd_neon;
+ }
++*/
+ }
+diff --git a/third_party/ffmpeg/libavcodec/aarch64/videodsp_init.c b/third_party/ffmpeg/libavcodec/aarch64/videodsp_init.c
+index 6f667a6..e7094e0 100644
+--- a/third_party/ffmpeg/libavcodec/aarch64/videodsp_init.c
++++ b/third_party/ffmpeg/libavcodec/aarch64/videodsp_init.c
+@@ -27,6 +27,6 @@ av_cold void ff_videodsp_init_aarch64(VideoDSPContext *ctx, int bpc)
+ {
+ int cpu_flags = av_get_cpu_flags();
+
+- if (have_armv8(cpu_flags))
+- ctx->prefetch = ff_prefetch_aarch64;
++// if (have_armv8(cpu_flags))
++// ctx->prefetch = ff_prefetch_aarch64;
+ }
+diff --git a/third_party/ffmpeg/libavcodec/aarch64/vorbisdsp_init.c b/third_party/ffmpeg/libavcodec/aarch64/vorbisdsp_init.c
+index c796f95..84610a6 100644
+--- a/third_party/ffmpeg/libavcodec/aarch64/vorbisdsp_init.c
++++ b/third_party/ffmpeg/libavcodec/aarch64/vorbisdsp_init.c
+@@ -28,7 +28,7 @@ av_cold void ff_vorbisdsp_init_aarch64(VorbisDSPContext *c)
+ {
+ int cpu_flags = av_get_cpu_flags();
+
+- if (have_neon(cpu_flags)) {
+- c->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_neon;
+- }
++// if (have_neon(cpu_flags)) {
++// c->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_neon;
++// }
+ }
+diff --git a/third_party/ffmpeg/libavutil/aarch64/float_dsp_init.c b/third_party/ffmpeg/libavutil/aarch64/float_dsp_init.c
+index 4325071..34bf9e9 100644
+--- a/third_party/ffmpeg/libavutil/aarch64/float_dsp_init.c
++++ b/third_party/ffmpeg/libavutil/aarch64/float_dsp_init.c
+@@ -54,7 +54,7 @@ float ff_scalarproduct_float_neon(const float *v1, const float *v2, int len);
+ av_cold void ff_float_dsp_init_aarch64(AVFloatDSPContext *fdsp)
+ {
+ int cpu_flags = av_get_cpu_flags();
+-
++/*
+ if (have_neon(cpu_flags)) {
+ fdsp->butterflies_float = ff_butterflies_float_neon;
+ fdsp->scalarproduct_float = ff_scalarproduct_float_neon;
+@@ -66,4 +66,5 @@ av_cold void ff_float_dsp_init_aarch64(AVFloatDSPContext *fdsp)
+ fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_neon;
+ fdsp->vector_fmul_window = ff_vector_fmul_window_neon;
+ }
++*/
+ }
}
DataFetcherImplTizen* DataFetcherImplTizen::GetInstance() {
- return Singleton<DataFetcherImplTizen,
- LeakySingletonTraits<DataFetcherImplTizen> >::get();
+ return base::Singleton<DataFetcherImplTizen,
+ base::LeakySingletonTraits<DataFetcherImplTizen> >::get();
}
bool DataFetcherImplTizen::StartFetchingDeviceMotionData(
#include "content/common/device_sensors/device_motion_hardware_buffer.h"
#include "content/common/device_sensors/device_orientation_hardware_buffer.h"
+namespace base {
template<typename T> struct DefaultSingletonTraits;
+}
namespace content {
static void onAccelerationChanged(sensor_h sensor, sensor_event_s *event, void* userData);
private:
- friend struct DefaultSingletonTraits<DataFetcherImplTizen>;
+ friend struct base::DefaultSingletonTraits<DataFetcherImplTizen>;
void SetOrientationBufferReadyStatus(bool ready);
// static
WebAudioDecoderGStreamer* WebAudioDecoderGStreamer::GetInstance() {
- return Singleton<WebAudioDecoderGStreamer>::get();
+ return base::Singleton<WebAudioDecoderGStreamer>::get();
}
WebAudioDecoderGStreamer::WebAudioDecoderGStreamer()
#include "base/bind.h"
#include "base/cancelable_callback.h"
#include "base/memory/ref_counted.h"
+#include "base/thread_task_runner_handle.h"
#include "build/tizen_version.h"
#include "cc/blink/context_provider_web_context.h"
#include "cc/output/gl_frame_data.h"
base::Closure closure =
base::Bind(&MailboxOutputSurfaceEfl::DrawTexture,
base::Unretained(this), base::Passed(&gl_frame_data));
- base::MessageLoopProxy::current()->PostTask(FROM_HERE, closure);
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, closure);
}
client_->DidSwapBuffersComplete();
}
DCHECK(surface_size_ == current_backing_.size);
DCHECK(frame->gl_frame_data->size == current_backing_.size);
DCHECK(!current_backing_.mailbox.IsZero() ||
- context_provider_->IsContextLost());
+ context_provider_->ContextGL()->GetGraphicsResetStatusKHR() !=
+ GL_NO_ERROR);
frame->gl_frame_data->mailbox = current_backing_.mailbox;
}
void OnSwapBuffersCompleted(
- const std::vector<ui::LatencyInfo>& latency_info) {
+ const std::vector<ui::LatencyInfo>& latency_info,
+ gfx::SwapResult result) {
content::RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);
OutputSurface::OnSwapBuffersComplete();
}
- base::CancelableCallback<void(const std::vector<ui::LatencyInfo>&)>
+ base::CancelableCallback<void(const std::vector<ui::LatencyInfo>&,
+ gfx::SwapResult)>
swap_buffers_completion_callback_;
- scoped_refptr<base::MessageLoopProxy> main_thread_;
base::WeakPtr<ui::ContextFactoryEfl> context_factory_efl_;
TransferableFrame current_backing_;
}
-ContextFactoryEfl::ContextFactoryEfl(content::ContextFactoryDelegate* delegate,
- int surface_id)
+ContextFactoryEfl::ContextFactoryEfl(content::ContextFactoryDelegate* delegate)
: delegate_(delegate),
- surface_id_(surface_id),
next_surface_id_namespace_(1),
schedule_draw_factory_(this) {
}
return false;
}
-uint32 ContextFactoryEfl::GetImageTextureTarget() {
+uint32 ContextFactoryEfl::GetImageTextureTarget(gfx::BufferFormat format,
+ gfx::BufferUsage usage) {
return GL_TEXTURE_2D;
}
class ContextFactoryEfl : public ContextFactory {
public:
- ContextFactoryEfl(content::ContextFactoryDelegate* delegate, int surface_id);
+ ContextFactoryEfl(content::ContextFactoryDelegate* delegate);
void CreateOutputSurface(base::WeakPtr<Compositor> compositor) override;
bool DoesCreateTestContexts() override;
- uint32 GetImageTextureTarget() override;
+ uint32 GetImageTextureTarget(gfx::BufferFormat format,
+ gfx::BufferUsage usage) override;
cc::SharedBitmapManager* GetSharedBitmapManager() override;
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_efl.h"
#include "third_party/icu/source/common/unicode/uchar.h"
-#include "wtf/unicode/icu/UnicodeIcu.h"
+#include "wtf/text/icu/UnicodeIcu.h"
#ifdef IM_CTX_DEBUG
#define IM_CTX_LOG_CHANNEL LOG(ERROR)
// Enables RenderWidget's IME related events, so that we can be notified
// when WebKit wants to enable or disable IME.
RenderWidgetHostImpl *rwhi = GetRenderWidgetHostImpl();
+#if !defined(EWK_BRINGUP)
+// [M47_2526] The SetInputMethodActive API was removed in RenderWidgetHostImpl class
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14513
if (rwhi)
rwhi->SetInputMethodActive(true);
+#endif
}
void IMContextEfl::OnFocusOut() {
// Disable RenderWidget's IME related events to save bandwidth.
RenderWidgetHostImpl *rwhi = GetRenderWidgetHostImpl();
+#if !defined(EWK_BRINGUP)
+// [M47_2526] The SetInputMethodActive API was removed in RenderWidgetHostImpl class
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14513
if (rwhi)
rwhi->SetInputMethodActive(false);
+#endif
}
void IMContextEfl::ResetIMFContext() {
evas_gl_initialized_ = true;
- context_factory_ = new ui::ContextFactoryEfl(this, host_->surface_id());
+ context_factory_ = new ui::ContextFactoryEfl(this);
- compositor_ = new ui::Compositor(GetNativeViewId(),
- context_factory_,
+ compositor_ = new ui::Compositor(context_factory_,
base::ThreadTaskRunnerHandle::Get());
#if defined(TIZEN_DISABLE_GPU_THREAD)
disambiguation_popup_->Dismiss();
}
-void RenderWidgetHostViewEfl::TextInputTypeChanged(ui::TextInputType type,
- ui::TextInputMode input_mode,
- bool can_compose_inline,
- int flags) {
- if (GetSelectionController()) {
- GetSelectionController()->SetSelectionEditable(
- type != ui::TEXT_INPUT_TYPE_NONE);
- }
+void RenderWidgetHostViewEfl::TextInputStateChanged(
+ const ViewHostMsg_TextInputState_Params& params) {
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Need to implement this API
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14518
+#endif
}
void RenderWidgetHostViewEfl::OnTextInputStateChanged(
void RenderWidgetHostViewEfl::CopyFromCompositingSurface(
const gfx::Rect& src_subrect,
const gfx::Size& output_size,
- ReadbackRequestCallback& callback,
+ const ReadbackRequestCallback& callback,
const SkColorType color_type) {
// FIXME(venu.musham): should find a way to do it effectively.
delegated_frame_host_->CopyFromCompositingSurface(src_subrect, output_size,
}
void RenderWidgetHostViewEfl::GetSnapshotAsync(const gfx::Rect& snapshot_area, int request_id) {
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME:
if (!IsDelegatedRendererEnabled())
Send(new ViewMsg_GetSnapshotFromRender(host_->GetRoutingID(), snapshot_area, request_id));
else {
// http://107.108.218.239/bugzilla/show_bug.cgi?id=9858
NOTIMPLEMENTED();
}
+#endif
}
bool RenderWidgetHostViewEfl::RequestSnapshotAsync(const Eina_Rectangle rect,
return true;
}
-// CopyFromCompositingSurfaceToVideoFrame implementation borrowed from Aura port
-bool RenderWidgetHostViewEfl::CanSubscribeFrame() const {
- return delegated_frame_host_->CanSubscribeFrame();
-}
-
void RenderWidgetHostViewEfl::BeginFrameSubscription(
scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) {
delegated_frame_host_->BeginFrameSubscription(subscriber.Pass());
RenderWidgetHostViewBase::GetDefaultScreenInfo(results);
}
+bool RenderWidgetHostViewEfl::GetScreenColorProfile(std::vector<char>* color_profile) {
+ DCHECK(color_profile->empty());
+ NOTREACHED();
+ return false;
+}
+
gfx::Rect RenderWidgetHostViewEfl::GetBoundsInRootWindow() {
Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_);
int x, y, w, h;
return gfx::ConvertRectToDIP(device_scale_factor_, gfx::Rect(x, y, w, h));
}
-gfx::GLSurfaceHandle RenderWidgetHostViewEfl::GetCompositingSurface() {
- return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::NULL_TRANSPORT);
-}
-
void RenderWidgetHostViewEfl::RenderProcessGone(base::TerminationStatus, int error_code) {
Destroy();
}
ui::ER_HANDLED : ui::ER_UNHANDLED;
scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
- gestures.reset(gesture_recognizer_->AckAsyncTouchEvent(
- result, this));
+ gestures.reset(gesture_recognizer_->AckTouchEvent(
+ touch.event.uniqueTouchEventId, result, this));
+
if (gestures) {
for (size_t j = 0; j < gestures->size(); ++j) {
ui::GestureEvent* event = gestures->get().at(j);
// ack is sent by delegated frame host
delegated_frame_host_->SwapDelegatedFrame(
output_surface_id, frame->delegated_frame_data.Pass(),
- frame->metadata.device_scale_factor, frame->metadata.latency_info);
+ frame->metadata.device_scale_factor, frame->metadata.latency_info,
+ &frame->metadata.satisfies_sequences);
return;
- } else if (frame->software_frame_data) {
- LOG(ERROR) << "Software frame is not supported.";
- ack.last_software_frame_id = frame->software_frame_data->id;
+ } else {
+ NOTREACHED();
}
// TODO(prashant.n): Check if ack should be sent after frame is drawn.
ack);
}
+void RenderWidgetHostViewEfl::ClearCompositorFrame () {
+ delegated_frame_host_->ClearDelegatedFrame();
+}
+
void RenderWidgetHostViewEfl::ScrollFocusedEditableNode() {
host_->ScrollFocusedEditableNodeIntoRect(gfx::Rect(0, 0, 0, 0));
}
void UpdateCursor(const WebCursor&) override;
void SetIsLoading(bool) override;
+ // Updates the state of the input method attached to the view.
+ void TextInputStateChanged(
+ const ViewHostMsg_TextInputState_Params& params) override;
+
void OnTextInputInFormStateChanged(bool is_in_form_tag);
void OnTextInputStateChanged(const ViewHostMsg_TextInputState_Params& params);
- void TextInputTypeChanged(ui::TextInputType type,
- ui::TextInputMode mode,
- bool can_compose_inline,
- int flags) override;
-
void ImeCancelComposition() override;
void ImeCompositionRangeChanged(const gfx::Range&, const std::vector<gfx::Rect>&) override;
void FocusedNodeChanged(bool is_editable_node) override;
const base::Callback<void(bool)>&) override;
bool CanCopyToVideoFrame() const override;
- bool CanSubscribeFrame() const override;
void BeginFrameSubscription(
scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) override;
void EndFrameSubscription() override;
void DidOverscroll(const DidOverscrollParams& params) override;
bool HasAcceleratedSurface(const gfx::Size&) override;
void GetScreenInfo(blink::WebScreenInfo*) override;
+ bool GetScreenColorProfile(std::vector<char>* color_profile) override;
gfx::Rect GetBoundsInRootWindow() override;
- gfx::GLSurfaceHandle GetCompositingSurface() override;
void RenderProcessGone(base::TerminationStatus, int) override;
bool OnMessageReceived(const IPC::Message&) override;
void OnSwapCompositorFrame(
uint32 output_surface_id, scoped_ptr<cc::CompositorFrame> frame) override;
+ void ClearCompositorFrame () override;
+
// ui::GestureEventHelper implementation.
bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override;
void DispatchCancelTouchEvent(ui::TouchEvent* event) override;
#include "base/macros.h"
#include "content/public/browser/screen_orientation_delegate.h"
-#include "third_party/WebKit/public/platform/WebScreenOrientationLockType.h"
+#include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h"
namespace content {
LOG(INFO) << "Traces: Recording started, categories = [" << categories
<< "], trace options = [" << trace_options << "]";
- // TODO(prashant.n): Generate options from trace_options argument.
- base::trace_event::TraceOptions options(
- base::trace_event::TraceRecordMode::RECORD_CONTINUOUSLY);
- base::trace_event::CategoryFilter categories_(categories);
+
+ base::trace_event::TraceConfig config_(categories, "record-continuously");
is_tracing_ = TracingController::GetInstance()->EnableRecording(
- categories_, options, TracingController::EnableRecordingDoneCallback());
+ config_, TracingController::EnableRecordingDoneCallback());
return is_tracing_;
}
namespace content {
+bool FindMatchingProcess(int render_process_id,
+ bool* did_match_process,
+ FrameTreeNode* node) {
+ if (node->current_frame_host()->GetProcess()->GetID() == render_process_id) {
+ *did_match_process = true;
+ return false;
+ }
+ return true;
+}
+
WebContentsImplEfl::WebContentsImplEfl(BrowserContext* browser_context,
- WebContentsImpl* opener,
void* platform_data)
- : WebContentsImpl(browser_context, opener)
+ : WebContentsImpl(browser_context)
, platform_data_(platform_data) {
}
}
void WebContentsImplEfl::CreateNewWindow(
- int render_process_id,
+ SiteInstance* source_site_instance,
int route_id,
int main_frame_route_id,
const ViewHostMsg_CreateWindow_Params& params,
scoped_refptr<SiteInstance> site_instance =
params.opener_suppressed && !is_guest ?
SiteInstance::CreateForURL(GetBrowserContext(), params.target_url) :
- GetSiteInstance();
+ source_site_instance;
// A message to create a new window can only come from the active process for
// this WebContentsImpl instance. If any other process sends the request,
// it is invalid and the process must be terminated.
- if (GetRenderProcessHost()->GetID() != render_process_id) {
- RenderProcessHost* rph = RenderProcessHost::FromID(render_process_id);
+ int render_process_id = source_site_instance->GetProcess()->GetID();
+ bool did_match_process = false;
+ frame_tree_.ForEach(
+ base::Bind(&FindMatchingProcess, render_process_id, &did_match_process));
+ if (!did_match_process) {
+ RenderProcessHost* rph = source_site_instance->GetProcess();
base::ProcessHandle process_handle = rph->GetHandle();
if (process_handle != base::kNullProcessHandle) {
RecordAction(
CreateParams create_params(GetBrowserContext(), site_instance.get());
create_params.routing_id = route_id;
create_params.main_frame_routing_id = main_frame_route_id;
- create_params.opener = this;
+ create_params.opener_render_process_id = render_process_id;
+ create_params.opener_render_frame_id = params.opener_render_frame_id;
create_params.opener_suppressed = params.opener_suppressed;
if (params.disposition == NEW_BACKGROUND_TAB)
create_params.initially_hidden = true;
create_params.context = view_->GetNativeView();
create_params.initial_size = GetContainerBounds().size();
new_contents = new WebContentsImplEfl(
- create_params.browser_context, NULL, platform_data);
+ create_params.browser_context, platform_data);
new_contents->Init(create_params);
} else {
new_contents = static_cast<WebContentsImplEfl*>(
namespace content {
+class SiteInstance;
class WebContentsEflDelegate;
class CONTENT_EXPORT WebContentsImplEfl : public WebContentsImpl {
public:
// See WebContents::Create for a description of these parameters.
WebContentsImplEfl(BrowserContext* browser_context,
- WebContentsImpl* opener,
void* platform_data);
void CreateNewWindow(
- int render_process_id,
+ SiteInstance* source_site_instance,
int route_id,
int main_frame_route_id,
const ViewHostMsg_CreateWindow_Params& params,
// processes in a largely platform independent way. WebDragDestEfl
// will result in spurious messages being sent to the guest process which
// will violate assumptions.
- if (host->GetProcess() && host->GetProcess()->IsIsolatedGuest()) {
+ if (host->GetProcess() && host->GetProcess()->IsForGuestsOnly()) {
DCHECK(!drag_dest_);
return;
}
namespace content {
struct GpuChildThreadEfl : public content::GpuChildThread {
- explicit GpuChildThreadEfl(const content::InProcessChildThreadParams& params)
- : GpuChildThread(params) { }
+ explicit GpuChildThreadEfl(const content::InProcessChildThreadParams& params,
+ GpuMemoryBufferFactory* gpu_memory_buffer_factory,
+ gpu::SyncPointManager* sync_point_manager)
+ : GpuChildThread(params, gpu_memory_buffer_factory, sync_point_manager) { }
bool OnControlMessageReceived(const IPC::Message& msg) override {
bool handled = true;
struct InProcessGpuThreadEfl : public content::InProcessGpuThread {
- explicit InProcessGpuThreadEfl(const content::InProcessChildThreadParams& params)
- : InProcessGpuThread(params) { }
+ explicit InProcessGpuThreadEfl(const content::InProcessChildThreadParams& params,
+ gpu::SyncPointManager* sync_point_manager_override)
+ : InProcessGpuThread(params, sync_point_manager_override) { }
void Init() override {
gpu_process_ = new content::GpuProcess();
// The process object takes ownership of the thread object, so do not
// save and delete the pointer.
- gpu_process_->set_main_thread(new GpuChildThreadEfl(params_));
+ gpu_process_->set_main_thread(new GpuChildThreadEfl(params_,
+ gpu_memory_buffer_factory_.get(),
+ sync_point_manager_override_));
}
};
base::Thread* CreateInProcessGpuThread(const content::InProcessChildThreadParams& params) {
- return new InProcessGpuThreadEfl(params);
+ return new InProcessGpuThreadEfl(params, nullptr);
}
} // namespace content
elm_win_resize_object_add(window, box);
evas_object_show(box);
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME:
if (!base::CommandLine::ForCurrentProcess()->
HasSwitch(switches::kDumpRenderTree))
CreateURLBar(box);
+#endif
Evas_Object* view = static_cast<Evas_Object*>(
shell->web_contents()->GetNativeView());
JavaScriptDialogManager* Shell::GetJavaScriptDialogManager(WebContents* source) {
if (!dialog_manager_) {
const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME:
if (command_line.HasSwitch(switches::kDumpRenderTree)) {
dialog_manager_.reset(new LayoutTestJavaScriptDialogManager);
} else {
dialog_manager_.reset(new JavaScriptDialogManagerEfl);
}
+#endif
}
return dialog_manager_.get();
}
void ShellWebContentsViewDelegate::ShowContextMenu(
RenderFrameHost* render_frame_host,
const ContextMenuParams& params) {
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME:
if (base::CommandLine::ForCurrentProcess()->
HasSwitch(switches::kDumpRenderTree))
return;
+#endif
if (g_context_menu) {
elm_menu_close(g_context_menu);
int* time) const {
DCHECK(time != NULL);
bool charging = false;
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14521
if (device_battery_is_charging(&charging) != DEVICE_ERROR_NONE ||
charging == false)
return DEVICE_ERROR_OPERATION_FAILED;
+#endif
int temp_time = 0;
if (vconf_get_int(VCONFKEY_PM_BATTERY_TIMETOFULL, &temp_time) < 0 ||
int* time) const {
DCHECK(time != NULL);
bool charging = false;
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14521
if (device_battery_is_charging(&charging) != DEVICE_ERROR_NONE ||
charging == true)
return DEVICE_ERROR_OPERATION_FAILED;
+#endif
int temp_time = 0;
if (vconf_get_int(VCONFKEY_PM_BATTERY_TIMETOEMPTY, time) < 0 ||
bool BatteryStatusManagerTizen::StartListeningBatteryChange() {
if (vconf_notify_key_changed(
VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW, OnChargingStatusChanged, this) ||
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14521
device_battery_set_cb(OnLevelChanged, this) != DEVICE_ERROR_NONE ||
+#endif
SetRemainingTimeUntilFullyChargedCb(OnChargingTimeChanged, this)
!= DEVICE_ERROR_NONE ||
SetRemainingTimeUntilDischargedCb(OnDischargingTimeChanged, this)
return false;
int level = 0, charging_time = 0, discharging_time = 0;
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14521
device_battery_get_percent(&level);
+#endif
GetRemainingTimeUntilFullyCharged(&charging_time);
GetRemainingTimeUntilDischarged(&discharging_time);
UnsetRemainingTimeUntilDischargedCb();
vconf_ignore_key_changed(VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW,
OnChargingStatusChanged);
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14521
device_battery_unset_cb();
+#endif
}
} // namespace device
scoped_ptr<VibrationProviderClient> VibrationManagerImplEfl::provider_client_ = scoped_ptr<VibrationProviderClient>();
-// static
-VibrationManagerImplEfl* VibrationManagerImplEfl::Create() {
- return new VibrationManagerImplEfl();
-}
-
void VibrationManagerImplEfl::Vibrate(int64 milliseconds) {
if (provider_client_.get())
provider_client_->Vibrate(milliseconds);
// static
void VibrationManagerImpl::Create(
mojo::InterfaceRequest<VibrationManager> request) {
- BindToRequest(VibrationManagerImplEfl::Create(), &request);
+ new VibrationManagerImplEfl(request.Pass());
}
} // namespace device
#include "base/memory/scoped_ptr.h"
#include "device/vibration/vibration_export.h"
#include "device/vibration/vibration_provider_client.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
namespace device {
-class DEVICE_VIBRATION_EXPORT VibrationManagerImplEfl : public mojo::InterfaceImpl<VibrationManager> {
+class DEVICE_VIBRATION_EXPORT VibrationManagerImplEfl : public VibrationManager {
public:
- static VibrationManagerImplEfl* Create();
+ explicit VibrationManagerImplEfl(
+ mojo::InterfaceRequest<VibrationManager> request)
+ : binding_(this, request.Pass()) {}
+ ~VibrationManagerImplEfl() override {}
void Vibrate(int64 milliseconds) override;
void Cancel() override;
static void RegisterProviderClient(VibrationProviderClient* provider_client);
private:
+ friend VibrationManagerImpl;
+
+ // The binding between this object and the other end of the pipe.
+ mojo::StrongBinding<VibrationManager> binding_;
+
static scoped_ptr<VibrationProviderClient> provider_client_;
- VibrationManagerImplEfl() {}
- ~VibrationManagerImplEfl() override {}
};
} // namespace device
cmdline.AppendSwitchASCII(switches::kUseGL,
gfx::kGLImplementationEGLName);
cmdline.AppendSwitch(switches::kInProcessGPU);
- cmdline.AppendSwitch(switches::kUIDisableThreadedCompositing);
- cmdline.AppendSwitch(switches::kEnableDelegatedRenderer);
#if !defined(EWK_BRINGUP)
// [M44_2403] Temporary disabling the codes for switching to new chromium
sub_string = version_string.substr(begin, end - begin);
else
sub_string = version_string.substr(begin);
- std::vector<std::string> pieces;
- base::SplitString(sub_string, '.', &pieces);
+ std::vector<std::string> pieces = base::SplitString(sub_string,
+ ".",
+ base::TRIM_WHITESPACE,
+ base::SPLIT_WANT_ALL);
if (pieces.size() < 2)
return "0";
return pieces[0] + "." + pieces[1];
DCHECK(gpu_info);
gpu_info->can_lose_context = false;
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for resolving crash issue
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14531
// Create a short-lived context on the UI thread to collect the GL strings.
// Make sure we restore the existing context if there is one.
ScopedRestoreNonOwnedEGLContext restore_context;
+#endif
CollectInfoResult result = CollectGraphicsInfoGL(gpu_info);
gpu_info->basic_info_state = result;
gpu_info->context_info_state = result;
MediaPlayerManager* manager)
: MediaPlayerEfl(player_id, manager),
demuxer_(demuxer.Pass()),
- main_loop_(base::MessageLoopProxy::current()),
+ task_runner_(base::ThreadTaskRunnerHandle::Get()),
playing_(false),
weak_this_(this),
#if defined(TIZEN_MULTIMEDIA_PIXMAP_SUPPORT)
destructing_ = true;
Release();
- main_loop_->DeleteSoon(FROM_HERE, this);
+ task_runner_->DeleteSoon(FROM_HERE, this);
}
void MediaSourcePlayerGstreamer::Play() {
LOG(ERROR) << "GST is deinitializing. Just return";
return;
}
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE, base::Bind(&MediaSourcePlayerGstreamer::ReadDemuxedData,
base::Unretained(this),
type));
// Get details only after prerolling.
if (pending >= GST_STATE_PAUSED)
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE,
base::Bind(&MediaSourcePlayerGstreamer::OnGetFrameDetails,
base::Unretained(this)));
void MediaSourcePlayerGstreamer::OnVideoConfigsChanged() {
if (!pipeline_ || error_occured_)
return;
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE,
base::Bind(&MediaSourcePlayerGstreamer::VideoConfigsChanged,
base::Unretained(this)));
break;
}
case GST_MESSAGE_EOS:
- main_loop_->PostTask(FROM_HERE, base::Bind(
+ task_runner_->PostTask(FROM_HERE, base::Bind(
&MediaSourcePlayerGstreamer::OnPlaybackComplete,
base::Unretained(this)));
break;
case GST_MESSAGE_ASYNC_DONE:
if (is_seeking_) {
is_seeking_iframe_ = false;
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE,
base::Bind(&MediaSourcePlayerGstreamer::UpdateSeekState,
base::Unretained(this),
// Initiate play for internal seeks.
if (playing_)
- main_loop_->PostTask(FROM_HERE,
- base::Bind(&MediaSourcePlayerGstreamer::Play,
- base::Unretained(this)));
+ task_runner_->PostTask(FROM_HERE,
+ base::Bind(&MediaSourcePlayerGstreamer::Play,
+ base::Unretained(this)));
manager()->OnTimeUpdate(GetPlayerId(), GetCurrentTime());
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE,
base::Bind(&MediaSourcePlayerGstreamer::OnTimeChanged,
base::Unretained(this)));
case GST_MESSAGE_STATE_CHANGED:
if (strcmp(kPipelineName, GST_MESSAGE_SRC_NAME(message)))
break;
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE,
base::Bind(&MediaSourcePlayerGstreamer::OnUpdateStates,
base::Unretained(this)));
video_buffered_ = buffered;
if (playing_) {
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE,
base::Bind(&MediaSourcePlayerGstreamer::HandleBufferingMessage,
base::Unretained(this)));
}
void MediaSourcePlayerGstreamer::OnUpdateStates() {
- DCHECK(main_loop_->BelongsToCurrentThread());
+ DCHECK(task_runner_->BelongsToCurrentThread());
if (!pipeline_ || IsPlayerDestructing() || error_occured_)
return;
}
void MediaSourcePlayerGstreamer::OnTimeChanged() {
- DCHECK(main_loop_->BelongsToCurrentThread());
+ DCHECK(task_runner_->BelongsToCurrentThread());
manager()->OnTimeChanged(GetPlayerId());
}
#include "base/cancelable_callback.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
#include "base/threading/thread.h"
#include "base/time/default_tick_clock.h"
#include "base/timer/timer.h"
scoped_ptr<DemuxerEfl> demuxer_;
- const scoped_refptr<base::MessageLoopProxy> main_loop_;
+ const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
// Stats about the media.
bool playing_;
#include "base/basictypes.h"
#include "base/logging.h"
-#include "base/message_loop/message_loop_proxy.h"
#include "base/strings/string_util.h"
#include "media/base/efl/media_player_manager_efl.h"
#include "media/base/efl/media_player_util_efl.h"
#else
previous_packet_(NULL),
#endif
- main_loop_(base::MessageLoopProxy::current()),
+ task_runner_(base::ThreadTaskRunnerHandle::Get()),
player_(NULL),
media_type_(0),
player_width_(0),
previous_packet_ = NULL;
}
#endif
- main_loop_->DeleteSoon(FROM_HERE, this);
+ task_runner_->DeleteSoon(FROM_HERE, this);
}
void MediaPlayerBridgeCapi::Play() {
}
void MediaPlayerBridgeCapi::OnTimeChanged() {
- DCHECK(main_loop_->BelongsToCurrentThread());
+ DCHECK(task_runner_->BelongsToCurrentThread());
manager()->OnTimeChanged(GetPlayerId());
}
#if !defined(TIZEN_MULTIMEDIA_PIXMAP_SUPPORT)
void MediaPlayerBridgeCapi::OnMediaPacketUpdated(media_packet_h packet) {
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE, base::Bind(&MediaPlayerBridgeCapi::MediaPacketUpdated,
base::Unretained(this), packet));
}
#endif
void MediaPlayerBridgeCapi::OnPlaybackCompleteUpdate() {
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE, base::Bind(&MediaPlayerBridgeCapi::PlaybackCompleteUpdate,
base::Unretained(this)));
}
void MediaPlayerBridgeCapi::OnSeekCompleteUpdate() {
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE, base::Bind(&MediaPlayerBridgeCapi::SeekCompleteUpdate,
base::Unretained(this)));
}
void MediaPlayerBridgeCapi::OnPlayerPrepared() {
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE, base::Bind(&MediaPlayerBridgeCapi::PlayerPrepared,
base::Unretained(this)));
}
void MediaPlayerBridgeCapi::OnHandleBufferingStatus(int percent) {
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE, base::Bind(&MediaPlayerBridgeCapi::HandleBufferingStatus,
base::Unretained(this), percent));
}
void MediaPlayerBridgeCapi::OnHandleError(int error_code, const char *msg) {
- main_loop_->PostTask(
+ task_runner_->PostTask(
FROM_HERE, base::Bind(&MediaPlayerBridgeCapi::HandleError,
base::Unretained(this), error_code, msg));
}
media_packet_h previous_packet_;
#endif
- const scoped_refptr<base::MessageLoopProxy> main_loop_;
+ const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
player_h player_;
#include <camera.h>
-#include "media/video/capture/tizen/video_capture_device_tizen.h"
+#include "media/capture/video/tizen/video_capture_device_tizen.h"
namespace {
#ifndef MEDIA_VIDEO_CAPTURE_TIZEN_VIDEO_CAPTURE_DEVICE_FACTORY_TIZEN_H_
#define MEDIA_VIDEO_CAPTURE_TIZEN_VIDEO_CAPTURE_DEVICE_FACTORY_TIZEN_H_
-#include "media/video/capture/video_capture_device_factory.h"
+#include "media/capture/video/video_capture_device_factory.h"
namespace media {
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/video/capture/tizen/video_capture_device_tizen.h"
+#include "media/capture/video/tizen/video_capture_device_tizen.h"
#include "third_party/libyuv/include/libyuv.h"
#include <camera.h>
#include "base/threading/thread.h"
-#include "media/video/capture/video_capture_device.h"
+#include "media/capture/video/video_capture_device.h"
namespace media {
'TIZEN_VIDEO_CAPTURE_SUPPORT=1',
],
'sources/': [
- [ 'exclude', 'video/capture/linux/video_capture_device_factory_linux.cc$' ],
- [ 'exclude', 'video/capture/linux/video_capture_device_factory_linux.h$' ],
- [ 'exclude', 'video/capture/linux/video_capture_device_linux.h$' ],
- [ 'exclude', 'video/capture/linux/video_capture_device_linux.cc$' ],
+ [ 'exclude', 'capture/video/linux/video_capture_device_factory_linux.cc$' ],
+ [ 'exclude', 'capture/video/linux/video_capture_device_factory_linux.h$' ],
+ [ 'exclude', 'capture/video/linux/video_capture_device_linux.h$' ],
+ [ 'exclude', 'capture/video/linux/video_capture_device_linux.cc$' ],
],
'sources': [
- 'video/capture/tizen/video_capture_device_tizen.cc',
- 'video/capture/tizen/video_capture_device_tizen.h',
- 'video/capture/tizen/video_capture_device_factory_tizen.cc',
- 'video/capture/tizen/video_capture_device_factory_tizen.h',
+ 'capture/video/tizen/video_capture_device_tizen.cc',
+ 'capture/video/tizen/video_capture_device_tizen.h',
+ 'capture/video/tizen/video_capture_device_factory_tizen.cc',
+ 'capture/video/tizen/video_capture_device_factory_tizen.h',
],
}],
} // namespace
ClipboardHelperEfl* ClipboardHelperEfl::GetInstance() {
- return Singleton<ClipboardHelperEfl>::get();
+ return base::Singleton<ClipboardHelperEfl>::get();
}
ClipboardHelperEfl::ClipboardHelperEfl() {
#include "ecore_x_wayland_wrapper.h"
#include "base/basictypes.h"
+#include "base/memory/singleton.h"
#include "ui/base/ui_base_export.h"
// This class is based on ClipboardHelper class in WK2/Tizen.
private:
ClipboardHelperEfl();
- friend struct DefaultSingletonTraits<ClipboardHelperEfl>;
+ friend struct base::DefaultSingletonTraits<ClipboardHelperEfl>;
// TODO: Webview TG will implement following for Wayland.
#if !defined(WAYLAND_BRINGUP)
}
static GestureConfigurationEfl* GetInstance() {
- return Singleton<GestureConfigurationEfl>::get();
+ return base::Singleton<GestureConfigurationEfl>::get();
}
private:
set_gesture_begin_end_types_enabled(true);
}
- friend struct DefaultSingletonTraits<GestureConfigurationEfl>;
+ friend struct base::DefaultSingletonTraits<GestureConfigurationEfl>;
DISALLOW_COPY_AND_ASSIGN(GestureConfigurationEfl);
};
return true;
}
-void GLImageEflPixmap::ReleaseTexImage(unsigned target) {
- in_use_ = false;
-}
-
-bool GLImageEflPixmap::CopyTexImage(unsigned target) {
+bool GLImageEflPixmap::CopyTexSubImage(unsigned target,
+ const gfx::Point& offset,
+ const gfx::Rect& rect) {
return false;
}
virtual gfx::Size GetSize() override;
virtual bool BindTexImage(unsigned target) override;
virtual void ReleaseTexImage(unsigned target) override;
- virtual bool CopyTexImage(unsigned target) override;
+ virtual bool CopyTexSubImage(unsigned target,
+ const gfx::Point& offset,
+ const gfx::Rect& rect) override;
virtual void WillUseTexImage() override {}
virtual void DidUseTexImage() override {}
virtual void WillModifyTexImage() override {}
#endif
}
- void Destroy() override {
- NOTREACHED();
- }
-
#if defined(TIZEN_DISABLE_GPU_THREAD)
bool MakeCurrent(gfx::GLSurface* surface) override {
if (use_native_surface_) {
--- /dev/null
+// Copyright (c) 2015 Samsung Electronics. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/ozone/client_native_pixmap_factory_efl.h"
+
+#include "ui/ozone/common/stub_client_native_pixmap_factory.h"
+
+namespace ui {
+
+ClientNativePixmapFactory* CreateClientNativePixmapFactoryEfl() {
+ return CreateStubClientNativePixmapFactory();
+}
+
+} // namespace ui
+
--- /dev/null
+// Copyright (c) 2015 Samsung Electronics. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef OZONE_PIXMAP_FACTORY_EFL_H_
+#define OZONE_PIXMAP_FACTORY_EFL_H_
+
+namespace ui {
+
+class ClientNativePixmapFactory;
+
+// Constructor hook for use in constructor_list.cc
+ClientNativePixmapFactory* CreateClientNativePixmapFactoryEfl();
+
+} // namespace ui
+
+#endif // OZONE_PIXMAP_FACTORY_EFL_H_
+
}],
],
'sources': [
+ 'client_native_pixmap_factory_efl.h',
+ 'client_native_pixmap_factory_efl.cc',
'media_ozone_platform_efl.cc',
'ozone_platform_efl.h',
'ozone_platform_efl.cc',
#include "base/logging.h"
#include "ui/display/types/native_display_delegate.h"
+#include "ui/ozone/common/stub_overlay_manager.h"
#include "ui/ozone/public/gpu_platform_support.h"
#include "ui/ozone/public/gpu_platform_support_host.h"
#include "ui/ozone/public/system_input_injector.h"
namespace ui {
OzonePlatformEfl::OzonePlatformEfl()
- : OzonePlatform() {
- surface_factory_.reset(new SurfaceFactoryEfl);
+ : surface_factory_(new SurfaceFactoryEfl) {
}
SurfaceFactoryOzone* OzonePlatformEfl::GetSurfaceFactoryOzone() {
return surface_factory_.get();
}
+OverlayManagerOzone* OzonePlatformEfl::GetOverlayManager() {
+ return overlay_manager_.get();
+}
+
CursorFactoryOzone* OzonePlatformEfl::GetCursorFactoryOzone() {
NOTIMPLEMENTED();
return NULL;
return NULL;
}
+base::ScopedFD OzonePlatformEfl::OpenClientNativePixmapDevice() const {
+ return base::ScopedFD();
+}
+
void OzonePlatformEfl::InitializeUI() {
gpu_platform_host_.reset(CreateStubGpuPlatformSupportHost());
+ overlay_manager_.reset(new StubOverlayManager());
}
void OzonePlatformEfl::InitializeGPU() {
#define OZONE_OZONE_PLATFORM_EFL_H_
#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/surface_factory_efl.h"
#include "base/memory/scoped_ptr.h"
OzonePlatformEfl();
SurfaceFactoryOzone* GetSurfaceFactoryOzone() override;
+ OverlayManagerOzone* GetOverlayManager() override;
CursorFactoryOzone* GetCursorFactoryOzone() override;
InputController* GetInputController() override;
GpuPlatformSupport* GetGpuPlatformSupport() override;
const gfx::Rect& bounds) override;
scoped_ptr<ui::NativeDisplayDelegate>
CreateNativeDisplayDelegate() override;
+ base::ScopedFD OpenClientNativePixmapDevice() const override;
private:
void InitializeUI() override;
void InitializeGPU() override;
- scoped_ptr<SurfaceFactoryOzone> surface_factory_;
+ scoped_ptr<SurfaceFactoryEfl> surface_factory_;
scoped_ptr<GpuPlatformSupport> gpu_platform_;
scoped_ptr<GpuPlatformSupportHost> gpu_platform_host_;
+ scoped_ptr<OverlayManagerOzone> overlay_manager_;
DISALLOW_COPY_AND_ASSIGN(OzonePlatformEfl);
};
{
if (delegate_) {
if (index < values_.size())
- delegate_->DidAcceptSuggestion(values_[index].value, values_[index].frontend_id);
+ delegate_->DidAcceptSuggestion(values_[index].value, values_[index].frontend_id, index);
}
}
NOTIMPLEMENTED();
}
-void AutofillManagerDelegateEfl::LinkClicked(
- const GURL& url,
- WindowOpenDisposition disposition) {
+bool AutofillManagerDelegateEfl::IsContextSecure(const GURL& form_origin) {
+#if defined(EWK_BRINGUP)
+// [M47_2526] Need to implement this API
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14517
NOTIMPLEMENTED();
+ return false;
+#endif
}
IdentityProvider* AutofillManagerDelegateEfl::GetIdentityProvider() {
bool HasCreditCardScanFeature() override;
void ScanCreditCard(const CreditCardScanCallback& callback) override;
void OnFirstUserGestureObserved() override;
- void LinkClicked(const GURL& url, WindowOpenDisposition disposition) override;
+ bool IsContextSecure(const GURL& form_origin) override;
+
IdentityProvider* GetIdentityProvider() override;
rappor::RapporService* GetRapporService() override;
void HideAutofillPopup() override;
}
void AutofillPrefStore::SetValue(const std::string& key,
- base::Value* value,
+ scoped_ptr<base::Value> value,
uint32 flags) {
DCHECK(value);
- if (prefs_.SetValue(key, value))
+ if (prefs_.SetValue(key, value.Pass()))
ReportValueChanged(key, flags);
}
void AutofillPrefStore::SetValueSilently(const std::string& key,
- base::Value* value,
+ scoped_ptr<base::Value> value,
uint32 flags) {
- prefs_.SetValue(key, value);
+ prefs_.SetValue(key, value.Pass());
}
void AutofillPrefStore::RemoveValue(const std::string& key, uint32 flags) {
base::Value** result) override;
void ReportValueChanged(const std::string& key, uint32 flags) override;
void SetValue(const std::string& key,
- base::Value* value,
+ scoped_ptr<base::Value> value,
uint32 flags) override;
void SetValueSilently(const std::string& key,
- base::Value* value,
+ scoped_ptr<base::Value> value,
uint32 flags) override;
void RemoveValue(const std::string& key, uint32 flags) override;
bool ReadOnly() const override;
PersistentPrefStore::PrefReadError ReadPrefs() override;
void ReadPrefsAsync(ReadErrorDelegate* error_delegate) override;
void CommitPendingWrite() override {}
+ void SchedulePendingLossyWrites() override {}
protected:
virtual ~AutofillPrefStore();
// Stores the preference values.
PrefValueMap prefs_;
- ObserverList<PrefStore::Observer, true> observers_;
+
base::ObserverList<PrefStore::Observer, true> observers_;
DISALLOW_COPY_AND_ASSIGN(AutofillPrefStore);
};
namespace autofill {
// static
PersonalDataManagerFactory* PersonalDataManagerFactory::GetInstance() {
- return Singleton<PersonalDataManagerFactory>::get();
+ return
base::Singleton<PersonalDataManagerFactory>::get();
}
void PersonalDataManagerFactory::PersonalDataManagerAdd(content::BrowserContext* ctx) {
#include "base/memory/singleton.h"
#include "components/autofill/core/browser/personal_data_manager_observer.h"
+namespace base {
template <typename T> struct DefaultSingletonTraits;
+}
namespace content {
class BrowserContext;
void OnPersonalDataChanged() override;
private:
- friend struct DefaultSingletonTraits<PersonalDataManagerFactory>;
+ friend struct
base::DefaultSingletonTraits<PersonalDataManagerFactory>;
PersonalDataManagerFactory();
~PersonalDataManagerFactory();
#include "browser/favicon/favicon_commands.h"
#include "browser/favicon/favicon_database_p.h"
#include "third_party/sqlite/sqlite3.h"
-#include "base/message_loop/message_loop_proxy.h"
#include <iostream>
#define CHECK_RESULT(qry, var, res, st, ret) if (var != res) {\
sqlite3 *sqlite;
base::Lock mutex;
- base::RepeatingTimer<FaviconDatabase> timer;
+ base::RepeatingTimer timer;
std::queue<Command *> commands;
base::WeakPtrFactory<FaviconDatabasePrivate> weakPtrFactory;
#include "eweb_view_callbacks.h"
#include "private/ewk_geolocation_private.h"
-using web_contents_utils::WebContentsFromViewID;
+using web_contents_utils::WebContentsFromFrameID;
using web_contents_utils::WebViewFromWebContents;
namespace content {
void GeolocationPermissionContextEfl::RequestPermissionOnUIThread(
int render_process_id,
- int render_view_id,
+ int render_frame_id,
const GURL& requesting_frame,
base::Callback<void(PermissionStatus)> callback) const {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
- WebContents* web_contents = WebContentsFromViewID(render_process_id, render_view_id);
+ WebContents* web_contents = WebContentsFromFrameID(render_process_id, render_frame_id);
if (!web_contents)
return;
void GeolocationPermissionContextEfl::RequestPermission(
int render_process_id,
- int render_view_id,
+ int render_frame_id,
const GURL& requesting_frame,
base::Callback<void(PermissionStatus)> callback) const {
content::BrowserThread::PostTask(
&GeolocationPermissionContextEfl::RequestPermissionOnUIThread,
weak_ptr_factory_.GetWeakPtr(),
render_process_id,
- render_view_id,
+ render_frame_id,
requesting_frame,
callback));
}
void GeolocationPermissionContextEfl::CancelPermissionRequest(
int /*render_process_id*/,
- int /*render_view_id*/,
+ int /*render_frame_id*/,
int /*bridge_id*/,
const GURL& /*requesting_frame*/) const {
// There is currently no mechanism to inform the application
// When the answer to a permission request has been determined, |callback|
// should be called with the result.
void RequestPermission(int render_process_id,
- int render_view_id,
+ int render_frame_id,
const GURL& requesting_frame,
base::Callback<void(PermissionStatus)> callback) const;
// The renderer is cancelling a pending permission request.
void CancelPermissionRequest(int render_process_id,
- int render_view_id,
+ int render_frame_id,
int bridge_id,
const GURL& requesting_frame) const;
private:
void RequestPermissionOnUIThread(int render_process_id,
- int render_view_id,
+ int render_frame_id,
const GURL& requesting_frame,
base::Callback<void(PermissionStatus)> callback) const;
#include "base/memory/singleton.h"
MimeOverrideManagerEfl* MimeOverrideManagerEfl::GetInstance() {
- return Singleton<MimeOverrideManagerEfl>::get();
+ return base::Singleton<MimeOverrideManagerEfl>::get();
}
void MimeOverrideManagerEfl::PushOverriddenMime(
#include "base/synchronization/lock.h"
+namespace base {
template <typename T> struct DefaultSingletonTraits;
+}
typedef std::map<std::string, std::string> MimeOverrideMap;
class MimeOverrideManagerEfl {
private:
MimeOverrideManagerEfl() {}
- friend struct DefaultSingletonTraits<MimeOverrideManagerEfl>;
+ friend struct base::DefaultSingletonTraits<MimeOverrideManagerEfl>;
base::Lock lock_;
MimeOverrideMap mime_override_map_;
notification_callback_user_data_ = user_data;
}
+bool NotificationControllerEfl::GetDisplayedPersistentNotifications(
+ BrowserContext* browser_context,
+ std::set<std::string>* displayed_notifications) {
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Need to implement this API
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14515
+#else
+ // This line should be removed after resolving above issue
+ return false;
+#endif
+}
+
}//namespace
BrowserContext* browser_context,
int64_t persistent_notification_id) override;
+ // Writes the ids of all currently displaying persistent notifications for the
+ // given |browser_context| to |displayed_notifications|. Returns whether the
+ // platform is able to provide such a set.
+ bool GetDisplayedPersistentNotifications(
+ BrowserContext* browser_context,
+ std::set<std::string>* displayed_notifications) override;
private:
blink::WebNotificationPermission CheckPermissionForOrigin(
#include "components/autofill/core/browser/validation.h"
#include "components/autofill/core/common/password_form.h"
#include "components/password_manager/core/browser/password_store.h"
+#include "content/public/common/origin_util.h"
using autofill::FormStructure;
using autofill::PasswordForm;
user_action_(kUserActionNone),
submit_result_(kSubmitResultNotSubmitted) {
if (observed_form_.origin.is_valid())
- base::SplitString(observed_form_.origin.path(), '/', &form_path_tokens_);
+ form_path_tokens_ = base::SplitString(observed_form_.origin.path(),
+ "/",
+ base::TRIM_WHITESPACE,
+ base::SPLIT_WANT_ALL);
observed_form_.ssl_valid = ssl_valid;
}
// form.
if (!((form.origin == observed_form_.origin) ||
(form.origin == observed_form_.action))) {
- if (form.origin.SchemeIsSecure() &&
- !observed_form_.origin.SchemeIsSecure()) {
+ if (content::IsOriginSecure(form.origin) &&
+ !content::IsOriginSecure(observed_form_.origin)) {
// Compare origins, ignoring scheme. There is no easy way to do this
// with GURL because clearing the scheme would result in an invalid url.
// This is for some sites (such as Hotmail) that begin on an http page and
}
bool PasswordFormManager::IsPendingCredentialsPublicSuffixMatch() {
- return pending_credentials_.IsPublicSuffixMatch();
+ return pending_credentials_.is_public_suffix_match;
}
void PasswordFormManager::SetHasGeneratedPassword() {
continue;
}
if (current_score == best_score) {
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14523
best_matches_[logins_result[i]->username_value] = logins_result[i];
+#endif
} else if (current_score > best_score) {
best_score = current_score;
// This new login has a better score than all those up to this point
STLDeleteValues(&best_matches_);
best_matches_.clear();
preferred_match_ = NULL; // Don't delete, its owned by best_matches_.
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14523
best_matches_[logins_result[i]->username_value] = logins_result[i];
+#endif
}
preferred_match_ = logins_result[i]->preferred ? logins_result[i]
: preferred_match_;
// If we don't already have a result with the same username, add the
// lower-scored match (if it had equal score it would already be in
// best_matches_).
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14523
if (best_matches_.find(it->username_value) == best_matches_.end())
best_matches_[it->username_value] = new PasswordForm(*it);
+#endif
}
UMA_HISTOGRAM_COUNTS("PasswordManager.NumPasswordsNotShown",
driver_->IsOffTheRecord() ||
observed_form_.action.GetWithEmptyPath() !=
preferred_match_->action.GetWithEmptyPath() ||
- preferred_match_->IsPublicSuffixMatch();
+ preferred_match_->is_public_suffix_match;
if (wait_for_username)
manager_action_ = kManagerActionNone;
else
void PasswordFormManager::UpdatePreferredLoginState(
PasswordStore* password_store) {
DCHECK(password_store);
- PasswordFormMap::iterator iter;
+ PasswordFormMap::const_iterator iter;
for (iter = best_matches_.begin(); iter != best_matches_.end(); iter++) {
if (iter->second->username_value != pending_credentials_.username_value &&
iter->second->preferred) {
// |pending.form_data| is considered uploadable.
bool success =
autofill_manager->UploadPasswordForm(
- pending.form_data,autofill::ACCOUNT_CREATION_PASSWORD);
+ pending.form_data, pending.username_element,
+ autofill::ACCOUNT_CREATION_PASSWORD,
+ observed_structure.FormSignature());
UMA_HISTOGRAM_BOOLEAN("PasswordGeneration.UploadStarted", success);
}
}
} else {
// Walk the origin URL paths one directory at a time to see how
// deep the two match.
- std::vector<std::string> candidate_path_tokens;
- base::SplitString(candidate.origin.path(), '/', &candidate_path_tokens);
+ std::vector<std::string> candidate_path_tokens =
+ base::SplitString(candidate.origin.path(),
+ "/",
+ base::TRIM_WHITESPACE,
+ base::SPLIT_WANT_ALL);
size_t depth = 0;
size_t max_dirs = std::min(form_path_tokens_.size(),
candidate_path_tokens.size());
score += (depth > 0) ? 1 << 5 : 0;
}
if (observed_form_.scheme == PasswordForm::SCHEME_HTML) {
- if (!candidate.IsPublicSuffixMatch())
+ if (!candidate.is_public_suffix_match)
score += 1 << 4;
if (candidate.action == observed_form_.action)
score += 1 << 3;
}
// Returns the best matches.
- const autofill::PasswordFormMap best_matches() const {
+ const autofill::PasswordFormMap& best_matches() const {
return best_matches_;
}
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect_f.h"
namespace autofill {
#include "components/password_manager/core/browser/password_manager_metrics_util.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
+#include "content/public/common/origin_util.h"
using autofill::PasswordForm;
using autofill::PasswordFormMap;
// If there is no corresponding PasswordFormManager, we create one. This is
// not the common case, and should only happen when there is a bug in our
// ability to detect forms.
- bool ssl_valid = (form.origin.SchemeIsSecure() &&
+ bool ssl_valid = (content::IsOriginSecure(form.origin) &&
!driver_->DidLastPageLoadEncounterSSLErrors());
PasswordFormManager* manager = new PasswordFormManager(
this, client_, driver_, form, ssl_valid);
// Always save generated passwords, as the user expresses explicit intent for
// Chrome to manage such passwords. For other passwords, respect the
// autocomplete attribute if autocomplete='off' is not ignored.
- if (!manager->HasGeneratedPassword() &&
- !form.password_autocomplete_set) {
+ if (!manager->HasGeneratedPassword()) {
RecordFailure(AUTOCOMPLETE_OFF, form.origin.host());
return;
}
PasswordForm provisionally_saved_form(form);
provisionally_saved_form.ssl_valid =
- form.origin.SchemeIsSecure() &&
+ content::IsOriginSecure(form.origin) &&
!driver_->DidLastPageLoadEncounterSSLErrors();
provisionally_saved_form.preferred = true;
PasswordFormManager::OtherPossibleUsernamesAction action =
iter != forms.end(); ++iter) {
// Don't involve the password manager if this form corresponds to
// SpdyProxy authentication, as indicated by the realm.
- if (EndsWith(iter->signon_realm, kSpdyProxyRealm, true))
+ if (base::EndsWith(iter->signon_realm, kSpdyProxyRealm, base::CompareCase::SENSITIVE))
continue;
- bool ssl_valid = iter->origin.SchemeIsSecure() && !had_ssl_error;
+ bool ssl_valid = content::IsOriginSecure(iter->origin) && !had_ssl_error;
PasswordFormManager* manager = new PasswordFormManager(
this, client_, driver_, *iter, ssl_valid);
pending_login_managers_.push_back(manager);
// Observers to be notified of LoginModel events. This is mutable to allow
// notification in const member functions.
- mutable ObserverList<LoginModelObserver> observers_;
+ mutable base::ObserverList<LoginModelObserver> observers_;
// Callbacks to be notified when a password form has been submitted.
std::vector<PasswordSubmittedCallback> submission_callbacks_;
// static
PasswordStoreFactory* PasswordStoreFactory::GetInstance()
{
- return Singleton<PasswordStoreFactory>::get();
+ return
base::Singleton<PasswordStoreFactory>::get();
}
PasswordStoreFactory::PasswordStoreFactory()
}
scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner(
- base::MessageLoopProxy::current());
+ base::ThreadTaskRunnerHandle::Get());
scoped_refptr<base::SingleThreadTaskRunner> db_thread_runner(
content::BrowserThread::GetMessageLoopProxyForThread(
content::BrowserThread::DB));
PasswordStoreService* GetService() { return service_; }
private:
- friend struct DefaultSingletonTraits<PasswordStoreFactory>;
+ friend struct
base::DefaultSingletonTraits<PasswordStoreFactory>;
void Init();
PasswordStoreFactory();
virtual ~PasswordStoreFactory();
#include "content_main_delegate_efl.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/permission_type.h"
+#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
-#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "ewk_global_data.h"
}
void PermissionManagerEfl::RequestPermission(PermissionType permission,
- WebContents* web_contents,
+ content::RenderFrameHost* render_frame_host,
int request_id,
const GURL& requesting_origin,
bool user_gesture,
const base::Callback<void(PermissionStatus)>& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ content::WebContents* web_contents =
+ content::WebContents::FromRenderFrameHost(render_frame_host);
+
switch (permission) {
case PermissionType::GEOLOCATION: {
BrowserContextEfl* browser_context =
const GeolocationPermissionContextEfl& geolocation_permission_context =
browser_context->GetGeolocationPermissionContext();
- int render_process_id = web_contents->GetRenderProcessHost()->GetID();
- int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
+
+ int render_process_id = render_frame_host->GetProcess()->GetID();
+ int render_frame_id = render_frame_host->GetRoutingID();
geolocation_permission_context.RequestPermission(render_process_id,
- render_view_id,
+ render_frame_id,
requesting_origin,
callback);
break;
cbce->GetNotificationController()->RequestPermission(web_contents,
requesting_origin,
callback);
+
#else
callback.Run(PermissionStatus::PERMISSION_STATUS_DENIED);
#endif
}
}
-void PermissionManagerEfl::CancelPermissionRequest(PermissionType permission,
- WebContents* web_contents,
- int request_id,
- const GURL& requesting_origin) {
+void PermissionManagerEfl::CancelPermissionRequest(
+ PermissionType permission,
+ content::RenderFrameHost* render_frame_host,
+ int request_id,
+ const GURL& requesting_origin) {
}
PermissionStatus PermissionManagerEfl::GetPermissionStatus(
void RequestPermission(
PermissionType permission,
- WebContents* web_contents,
+ content::RenderFrameHost* render_frame_host,
int request_id,
const GURL& requesting_origin,
bool user_gesture,
const base::Callback<void(PermissionStatus)>& callback) override;
void CancelPermissionRequest(PermissionType permission,
- WebContents* web_contents,
+ content::RenderFrameHost* render_frame_host,
int request_id,
const GURL& requesting_origin) override;
} // namespace
WebDataServiceWrapper* WebDataServiceWrapper::GetInstance(){
- return Singleton<WebDataServiceWrapper>::get();
+ return base::Singleton<WebDataServiceWrapper>::get();
}
WebDataServiceWrapper::WebDataServiceWrapper() {
PathService::Get(PathsEfl::WEB_DATABASE_DIR, &db_path);
base::FilePath path = db_path.Append(FILE_PATH_LITERAL(".FormData.db"));
- scoped_refptr<base::MessageLoopProxy> ui_thread =
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
- scoped_refptr<base::MessageLoopProxy> db_thread =
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB);
- web_database_ = new WebDatabaseService(path, ui_thread, db_thread);
+ web_database_ =
+ new WebDatabaseService(
+ path,
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB));
// All tables objects that participate in managing the database must
// be added here.
- web_database_->AddTable(
- scoped_ptr<WebDatabaseTable>(new autofill::AutofillTable(
- EWebView::GetPlatformLocale())));
-
+ web_database_->AddTable(make_scoped_ptr(new autofill::AutofillTable));
web_database_->LoadDatabase();
- autofill_web_data_ = new AutofillWebDataService(
- web_database_, ui_thread, db_thread, base::Bind(
- &ProfileErrorCallback, 0));
+ autofill_web_data_ =
+ new AutofillWebDataService(
+ web_database_,
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
+ base::Bind(&ProfileErrorCallback, 0));
autofill_web_data_->Init();
web_data_ = new WebDataService(
// static
WebDataServiceFactory* WebDataServiceFactory::GetInstance() {
- return Singleton<WebDataServiceFactory>::get();
+ return base::Singleton<WebDataServiceFactory>::get();
}
#endif // TIZEN_AUTOFILL_SUPPORT
static WebDataServiceFactory* GetInstance();
private:
- friend struct DefaultSingletonTraits<WebDataServiceFactory>;
+ friend struct base::DefaultSingletonTraits<WebDataServiceFactory>;
WebDataServiceFactory();
virtual ~WebDataServiceFactory();
PrefRegistrySimple* pref_registry = new PrefRegistrySimple();
pref_registry->RegisterBooleanPref(kAutofillEnabled, true);
- pref_registry->RegisterBooleanPref(kAutofillAuxiliaryProfilesEnabled, true);
pref_registry->RegisterDoublePref(kAutofillPositiveUploadRate, 0.0);
pref_registry->RegisterDoublePref(kAutofillNegativeUploadRate, 0.0);
p_command_line->AppendSwitch(switches::kEnablePinch);
p_command_line->AppendSwitch(switches::kUseMobileUserAgent);
p_command_line->AppendSwitch(switches::kUseMobileViewportStyle);
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14510
p_command_line->AppendSwitch(switches::kEnableViewportMeta);
+#endif
// [M42_2231] FIXME: Need Parallel Canvas patch for S-Chromium/S-Blink/S-Skia
p_command_line->AppendSwitchASCII(
switches::kAcceleratedCanvas2dMSAASampleCount, "4");
bool opener_suppressed,
ResourceContext* context,
int render_process_id,
- int opener_id,
+ int opener_render_view_id,
+ int opener_render_frame_id,
bool* no_javascript_access) {
if (!user_gesture) {
*no_javascript_access = true;
bool opener_suppressed,
ResourceContext* context,
int render_process_id,
- int opener_id,
+ int opener_render_view_id,
+ int opener_render_frame_id,
bool* no_javascript_access) override;
virtual void ResourceDispatcherHostCreated() override;
GURL url = web_contents_.GetVisibleURL();
std::string selected_link (url.host().c_str());
if (!selected_link.empty()) {
- if (StartsWithASCII(selected_link, std::string("mailto:"), false)
- || StartsWithASCII(selected_link, std::string("tel:"), false)) {
+ if (base::StartsWith(selected_link,
+ std::string("mailto:"),
+ base::CompareCase::INSENSITIVE_ASCII)
+ || base::StartsWith(selected_link,
+ std::string("tel:"),
+ base::CompareCase::INSENSITIVE_ASCII)) {
std::vector<std::string> link_split;
size_t current_pos = 0;
size_t next_delimiter = 0;
} else {
std::string selected_image (url.host().c_str());
if (!selected_image.empty()) {
- if (StartsWithASCII(selected_image, std::string("data:"), false))
+ if (base::StartsWith(selected_image,
+ std::string("data:"),
+ base::CompareCase::INSENSITIVE_ASCII))
elm_object_part_text_set(popup_, "title,text", "data:");
else
elm_object_part_text_set(popup_, "title,text", selected_image.c_str());
return std::string();
}
+content::DevToolsExternalAgentProxyDelegate*
+DevToolsDelegateEfl::HandleWebSocketConnection(const std::string& path) {
+ return nullptr;
+}
+
} // namespace content
virtual std::string GetDiscoveryPageHTML() override;
virtual std::string GetFrontendResource(const std::string& path) override;
virtual std::string GetPageThumbnailData(const GURL& url) override;
+
+ // Allows embedder to handle custom websocket-based protocol connection
+ // pointing remote debugging port. Returns ownership.
+ virtual content::DevToolsExternalAgentProxyDelegate*
+ HandleWebSocketConnection(const std::string& path) override;
+
+
DevToolsHttpHandler* devtools_http_handler() {
return devtools_http_handler_.get();
}
virtual std::string GetDescription() const override { return std::string(); }
virtual GURL GetURL() const override { return agent_host_->GetURL(); }
virtual GURL GetFaviconURL() const override { return favicon_url_; }
- virtual base::Time GetLastActiveTime() const override {
+ virtual base::TimeTicks GetLastActivityTime() const override {
return last_activity_time_;
}
virtual bool IsAttached() const override {
std::string title_;
GURL url_;
GURL favicon_url_;
- base::Time last_activity_time_;
+ base::TimeTicks last_activity_time_;
};
Target::Target(scoped_refptr<content::DevToolsAgentHost> agent_host)
'<(DEPTH)/tizen_src/chromium_impl/efl/efl.gyp:efl-init',
'<(DEPTH)/base/base.gyp:base_static',
- '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
'<(DEPTH)/content/content.gyp:content',
'<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_resources',
'<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_pak',
'<(DEPTH)/components/components.gyp:plugins_renderer',
'<(DEPTH)/components/components.gyp:variations',
'<(DEPTH)/device/vibration/vibration.gyp:device_vibration',
- '<(DEPTH)/extensions/extensions.gyp:extensions_shell_and_test_pak',
'<(DEPTH)/printing/printing.gyp:printing',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/storage/storage_browser.gyp:storage',
'renderer/editorclient_agent.h',
'renderer/plugins/plugin_placeholder_efl.cc',
'renderer/plugins/plugin_placeholder_efl.h',
- 'renderer/plugins/shadow_dom_plugin_placeholder.cc',
- 'renderer/plugins/shadow_dom_plugin_placeholder.h',
'renderer/print_web_view_helper_efl.cc',
'renderer/print_web_view_helper_efl.h',
'renderer/render_frame_observer_efl.cc',
net::ProxyService* proxy_service =
url_request_context_getter->GetURLRequestContext()->proxy_service();
proxy_service->ResetConfigService(
- new net::ProxyConfigServiceFixed(proxy_config));
+ make_scoped_ptr(new net::ProxyConfigServiceFixed(proxy_config)));
done->Signal();
}
void* user_data,
content::StoragePartition* partition) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
- storage::DatabaseQuotaClient client(base::MessageLoopProxy::current().get(), partition->GetDatabaseTracker());
+ storage::DatabaseQuotaClient client(
+ base::ThreadTaskRunnerHandle::Get().get(),
+ partition->GetDatabaseTracker());
client.GetOriginsForType(storage::kStorageTypeTemporary,
base::Bind(&OnGetWebDBOrigins, callback, user_data));
}
scoped_refptr<password_manager::PasswordStore> store =
password_manager::PasswordStoreFactory::GetPasswordStore();
if (store.get())
- store->RemoveLoginsCreatedBetween(base::Time(), base::Time::Max());
+ store->RemoveLoginsCreatedBetween(base::Time(), base::Time::Max(), base::Closure());
#else
DLOG(WARNING) << "TIZEN_AUTOFILL_SUPPORT is not enabled";
#endif
#include "common/render_messages_ewk.h"
#include "common/version_info.h"
#include "common/web_contents_utils.h"
-#include "components/sessions/serialized_navigation_entry.h"
#include "components/sessions/content/content_serialized_navigation_builder.h"
+#include "components/sessions/core/serialized_navigation_entry.h"
#include "private/ewk_back_forward_list_private.h"
#include "private/ewk_context_private.h"
#include "private/ewk_frame_private.h"
text_zoom_factor_ = text_zoom_factor;
RenderViewHost* render_view_host = web_contents_->GetRenderViewHost();
+#if !defined(EWK_BRINGUP)
+// [M47_2526] The SetTextZoomFactor API was removed in RenderViewHost class
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14514
if (render_view_host)
render_view_host->SetTextZoomFactor(text_zoom_factor);
+#endif
}
double EWebView::GetPageZoomFactor() const {
static const int MAX_SESSION_ENTRY_SIZE = std::numeric_limits<int>::max();
NavigationController &navigationController = web_contents_->GetController();
- Pickle sessionPickle;
+ base::Pickle sessionPickle;
const int itemCount = navigationController.GetEntryCount();
sessionPickle.WriteInt(itemCount);
}
bool EWebView::RestoreFromSessionData(const char *data, unsigned length) {
- Pickle sessionPickle(data, length);
- PickleIterator pickleIterator(sessionPickle);
+ base::Pickle sessionPickle(data, length);
+ base::PickleIterator pickleIterator(sessionPickle);
int entryCount;
int currentEntry;
if (currentEntry >= static_cast<int>(navigationEntries.size()))
currentEntry = navigationEntries.size() - 1;
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for switching to new chromium
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14524
navigationController.Restore(currentEntry,
NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY,
&navigationEntries);
+#endif
return true;
}
WebContents::CreateParams params(context_->browser_context());
params.initial_size = gfx::Size(width, height);
web_contents_.reset(new WebContentsImplEfl(
- context_->browser_context(), NULL, this));
+ context_->browser_context(), this));
static_cast<WebContentsImpl*>(web_contents_.get())->Init(params);
VLOG(1) << "Initial WebContents size: " << params.initial_size.ToString();
} else {
content::MainFunctionParams main_funtion_params =
CommandLineEfl::GetDefaultPortParams();
- instance_->content_main_runner_->Initialize(params);
- instance_->browser_main_runner_->Initialize(main_funtion_params);
-
#if defined(USE_OZONE)
ui::OzonePlatform::InitializeForUI();
#endif
+ instance_->content_main_runner_->Initialize(params);
+ instance_->browser_main_runner_->Initialize(main_funtion_params);
+
base::ThreadRestrictions::SetIOAllowed(true);
base::FilePath pak_dir;
MessagePumpForUIEfl::MessagePumpForUIEfl()
: pipe_(ecore_pipe_add(&PipeCallback, this))
, schedule_delayed_work_timer_(NULL)
- , delegate_(base::MessageLoopForUI::current())
- , run_loop_(new RunLoop())
+ , run_loop_(NULL)
, work_scheduled_(false) {
- // Since the RunLoop was just created above, BeforeRun should be guaranteed to
- // return true (it only returns false if the RunLoop has been Quit already).
- bool result = run_loop_->BeforeRun();
- DCHECK(result);
}
MessagePumpForUIEfl::~MessagePumpForUIEfl() {
ecore_pipe_del(pipe_);
if (schedule_delayed_work_timer_)
ecore_timer_del(schedule_delayed_work_timer_);
- DCHECK(run_loop_->running());
- run_loop_->AfterRun();
- delete run_loop_;
- run_loop_ = NULL;
+ if (run_loop_) {
+ DCHECK(run_loop_->running());
+ run_loop_->AfterRun();
+ delete run_loop_;
+ run_loop_ = NULL;
+ }
pipe_ = NULL;
schedule_delayed_work_timer_ = NULL;
}
work_scheduled_ = false;
}
- bool more_work_is_plausible = delegate_->DoWork();
+ Delegate* delegate = base::MessageLoopForUI::current();
+ if (!run_loop_) {
+ run_loop_ = new RunLoop();
+ bool result = run_loop_->BeforeRun();
+ DCHECK(result);
+ }
+
+ bool more_work_is_plausible = delegate->DoWork();
base::TimeTicks delayed_work_time;
- more_work_is_plausible |= delegate_->DoDelayedWork(&delayed_work_time);
+ more_work_is_plausible |= delegate->DoDelayedWork(&delayed_work_time);
if (more_work_is_plausible) {
ScheduleWork();
return;
}
- more_work_is_plausible |= delegate_->DoIdleWork();
+ more_work_is_plausible |= delegate->DoIdleWork();
if (more_work_is_plausible) {
ScheduleWork();
return;
void MessagePumpForUIEfl::DoDelayedWork() {
base::TimeTicks next_delayed_work_time;
- delegate_->DoDelayedWork(&next_delayed_work_time);
+ base::MessageLoopForUI::current()->DoDelayedWork(&next_delayed_work_time);
if (!next_delayed_work_time.is_null())
ScheduleDelayedWork(next_delayed_work_time);
return true;
}
-bool NetworkDelegateEfl::OnCanThrottleRequest(const URLRequest& request) const {
- return true;
-}
-
-
}; // namespace net
CookieOptions* options) override;
virtual bool OnCanAccessFile(const URLRequest& request,
const base::FilePath& path) const override;
- virtual bool OnCanThrottleRequest(const URLRequest& request) const override;
scoped_refptr<CookieManager> cookie_manager_;
};
Name: chromium-ewk
Description: EWK API based on chromium-efl engine
-Version: 44.2403.0.31-1
+Version: 47.2526.0.43-1
Requires: chromium-efl
Libs: -L${libdir} -lchromium-ewk
Cflags: -I${includedir}/chromium-ewk
: navigation_controller_(controller) {
notification_registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_CHANGED,
content::NotificationService::AllBrowserContextsAndSources());
+#if !defined(EWK_BRINGUP)
+// [M47_2526] content::NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED was removed
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14512
notification_registrar_.Add(this,
content::NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED,
content::NotificationService::AllBrowserContextsAndSources());
+#endif
notification_registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllBrowserContextsAndSources());
}
UpdateItemWithEntry(entry);
break;
}
+#if !defined(EWK_BRINGUP)
+// [M47_2526] content::NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED was removed
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14512
case content::NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED: {
content::Details<std::pair<content::NavigationEntry*, bool> > d = details;
const content::NavigationEntry* entry = d->first;
UpdateItemWithEntry(entry);
break;
}
+#endif
default: {
return;
}
#include <assert.h>
// // TODO: remove dependency to chromium internal
-#include <base/message_loop/message_loop_proxy.h>
#include <base/bind.h>
#include <base/location.h>
+#include "base/thread_task_runner_handle.h"
+
using namespace base;
-static scoped_refptr<MessageLoopProxy> g_message_loop;
+static scoped_refptr<base::SingleThreadTaskRunner> g_task_runner;
void ewk_dispatcher_touch()
{
- // Check: "Message loop initialized twice."
- //DCHECK(!g_message_loop);
- g_message_loop = MessageLoopProxy::current();
+ g_task_runner = base::ThreadTaskRunnerHandle::Get();
}
void ewk_dispatcher_dispatch(ewk_dispatch_callback cb, void *user_data, unsigned delay)
{
- // Check: "Message loop not initialized."
- //DCHECK(!!g_message_loop);
- // Check: "Callback not provided."
- //DCHECK(!!cb);
-
if (delay) {
- g_message_loop->PostDelayedTask(FROM_HERE,
- Bind(cb, user_data),
- TimeDelta::FromMilliseconds(delay));
+ g_task_runner->PostDelayedTask(FROM_HERE,
+ Bind(cb, user_data),
+ TimeDelta::FromMilliseconds(delay));
} else {
- g_message_loop->PostTask(FROM_HERE,
- Bind(cb, user_data));
+ g_task_runner->PostTask(FROM_HERE,
+ Bind(cb, user_data));
}
}
#include "content/child/request_extra_data.h"
#include "renderer/editorclient_agent.h"
#include "renderer/plugins/plugin_placeholder_efl.h"
-#include "renderer/plugins/shadow_dom_plugin_placeholder.h"
#include "renderer/render_frame_observer_efl.h"
#include "renderer/render_view_observer_efl.h"
#include "components/visitedlink/renderer/visitedlink_slave.h"
new content::RenderFrameObserverEfl(render_frame);
#if defined(TIZEN_AUTOFILL_SUPPORT)
- PasswordGenerationAgent* password_generation_agent =
- new PasswordGenerationAgent(render_frame);
PasswordAutofillAgent* password_autofill_agent =
new PasswordAutofillAgent(render_frame);
+ PasswordGenerationAgent* password_generation_agent =
+ new PasswordGenerationAgent(render_frame, password_autofill_agent);
new AutofillAgent(render_frame,
password_autofill_agent,
password_generation_agent);
#endif
}
-scoped_ptr<blink::WebPluginPlaceholder>
-ContentRendererClientEfl::CreatePluginPlaceholder(
- content::RenderFrame* render_frame,
- blink::WebLocalFrame* frame,
- const blink::WebPluginParams& params) {
- return CreateShadowDOMPlaceholderForMissingPlugin();
-}
-
bool ContentRendererClientEfl::OverrideCreatePlugin(
content::RenderFrame* render_frame,
blink::WebLocalFrame* frame,
return true;
}
-bool ContentRendererClientEfl::HandleNavigation(content::RenderFrame* render_frame,
- content::DocumentState* document_state,
- int opener_id,
- blink::WebFrame* frame,
- const blink::WebURLRequest& request,
- blink::WebNavigationType type,
- blink::WebNavigationPolicy default_policy,
- bool is_redirect) {
- const content::RenderView* render_view =
- content::RenderView::FromWebView(frame->view());
- bool result = false;
- GURL referrer_url(GURL(request.httpHeaderField(blink::WebString::fromUTF8("Referer"))));
- blink::WebReferrerPolicy referrer_policy =
- request.isNull() ? frame->document().referrerPolicy() : request.referrerPolicy();
- int render_view_id = render_view->GetRoutingID();
-
- NavigationPolicyParams params;
- params.render_view_id = render_view_id;
- params.url = request.url();
- params.httpMethod = request.httpMethod().utf8();
- params.referrer = content::Referrer(referrer_url, referrer_policy);
- params.auth = request.httpHeaderField(blink::WebString::fromUTF8("Authorization"));
- params.policy = default_policy;
- params.is_main_frame = (frame->view()->mainFrame() == frame);
- params.type = type;
- params.is_redirect = is_redirect;
- params.cookie = request.httpHeaderField(blink::WebString::fromUTF8("Cookie")).utf8();
-
- blink::WebDataSource* ds = frame->provisionalDataSource();
- params.should_replace_current_entry = (ds ? ds->replacesCurrentHistoryItem() : false);
-
- // Sync message, renderer is blocked here.
- content::RenderThread::Get()->Send(new EwkHostMsg_DecideNavigationPolicy(
- params, &result));
-
- return result;
-}
-
bool ContentRendererClientEfl::WillSendRequest(blink::WebFrame* frame,
ui::PageTransition transition_type,
const GURL& url,
void RenderViewCreated(content::RenderView* render_view) override;
- scoped_ptr<blink::WebPluginPlaceholder> CreatePluginPlaceholder(
- content::RenderFrame* render_frame,
- blink::WebLocalFrame* frame,
- const blink::WebPluginParams& params) override;
-
bool OverrideCreatePlugin(
content::RenderFrame* render_frame,
blink::WebLocalFrame* frame,
return m_settings.javascript_can_open_windows;
}
- // Note that this API requires a change in
- // content/public/renderer/content_renderer_client.h
- // The base class declares this method for OS_ANDROID only.
- bool HandleNavigation(content::RenderFrame* render_frame,
- content::DocumentState* document_state,
- int opener_id,
- blink::WebFrame* frame,
- const blink::WebURLRequest& request,
- blink::WebNavigationType type,
- blink::WebNavigationPolicy default_policy,
- bool is_redirect) override;
-
bool WillSendRequest(blink::WebFrame* frame,
ui::PageTransition transition_type,
const GURL& url,
const blink::WebPluginParams& params,
const std::string& html_data)
: plugins::LoadablePluginPlaceholder(
- render_frame, frame, params, html_data,
- GURL(kPluginPlaceholderDataURL)) {
+ render_frame, frame, params, html_data) {
}
PluginPlaceholderEfl::~PluginPlaceholderEfl() {
// |missing_plugin| will destroy itself when its WebViewPlugin is going away.
PluginPlaceholderEfl* missing_plugin = new PluginPlaceholderEfl(
render_frame, frame, params, kPluginMissingMessage);
- missing_plugin->set_allow_loading(true);
+ missing_plugin->AllowLoading();
return missing_plugin;
}
-void PluginPlaceholderEfl::BindWebFrame(blink::WebFrame* frame) {
- v8::Isolate* isolate = blink::mainThreadIsolate();
- v8::HandleScope handle_scope(isolate);
- v8::Handle<v8::Context> context = frame->mainWorldScriptContext();
- DCHECK(!context.IsEmpty());
-
- v8::Context::Scope context_scope(context);
- v8::Handle<v8::Object> global = context->Global();
- global->Set(gin::StringToV8(isolate, "plugin"),
- gin::CreateHandle(isolate, this).ToV8());
+blink::WebPlugin* PluginPlaceholderEfl::CreatePlugin() {
}
-blink::WebPlugin* PluginPlaceholderEfl::CreatePlugin() {
+v8::Local<v8::Value> PluginPlaceholderEfl::GetV8Handle(v8::Isolate* isolate) {
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Need to implement this API
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14516
+#endif
}
~PluginPlaceholderEfl() override;
// WebViewPlugin::Delegate (via PluginPlaceholder) method
- void BindWebFrame(blink::WebFrame* frame) override;
+ v8::Local<v8::Value> GetV8Handle(v8::Isolate*) override;
blink::WebPlugin* CreatePlugin() override;
DISALLOW_COPY_AND_ASSIGN(PluginPlaceholderEfl);
+++ /dev/null
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "renderer/plugins/shadow_dom_plugin_placeholder.h"
-
-#include <libintl.h>
-
-namespace {
-
-class MissingPluginPlaceholder : public blink::WebPluginPlaceholder {
- public:
- // blink::WebPluginPlaceholder overrides
- blink::WebString message() const override {
- return blink::WebString::fromUTF8(
- std::string(dgettext("WebKit", "IDS_WEBVIEW_BODY_PLUG_IN_MISSING")));
- }
-};
-
-} // namespace
-
-scoped_ptr<blink::WebPluginPlaceholder>
-CreateShadowDOMPlaceholderForMissingPlugin() {
- return make_scoped_ptr(new MissingPluginPlaceholder);
-}
+++ /dev/null
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef SHADOW_DOM_PLUGIN_PLACEHOLDER_H_
-#define SHADOW_DOM_PLUGIN_PLACEHOLDER_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "third_party/WebKit/public/web/WebPluginPlaceholder.h"
-
-// Creates a placeholder suitable for representing a missing plugin.
-scoped_ptr<blink::WebPluginPlaceholder>
-CreateShadowDOMPlaceholderForMissingPlugin();
-
-#endif // SHADOW_DOM_PLUGIN_PLACEHOLDER_H_
WebElementCollection select_elements = document.getElementsByHTMLTagName("select");
int count = 0;
int index = 0;
+#if !defined(EWK_BRINGUP)
+// [M47_2526] The hasNonEmptyBoundingBox was removed
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14509
for (WebElement e = select_elements.firstItem();
!e.isNull(); e = select_elements.nextItem()) {
// take only visible elements into account
++count;
}
}
+#endif
if (count) {
bool prev_status = index > 0;
blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
+#if !defined(EWK_BRINGUP)
+// [M47_2526] The maximumScrollOffset was removed in WebLocalFrameImpl class
+// FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14511
if (max_scroll_offset_ != frame->maximumScrollOffset()) {
max_scroll_offset_ = frame->maximumScrollOffset();
Send(new EwkHostMsg_DidChangeMaxScrollOffset(render_frame()->GetRoutingID(),
frame->maximumScrollOffset().width,
frame->maximumScrollOffset().height));
}
+#endif
if (last_scroll_offset_ != frame->scrollOffset()) {
last_scroll_offset_ = frame->scrollOffset();
size_t endPos = input.find(")");
std::string value = input.substr(startPos + 1, endPos - startPos - 1);
- std::vector<std::string> colorValues;
- base::SplitString(value, ',', &colorValues);
+ std::vector<std::string> colorValues = base::SplitString(value,
+ ",",
+ base::TRIM_WHITESPACE,
+ base::SPLIT_WANT_ALL);
if (colorValues.size() == 4 || colorValues.size() == 3) {
base::StringToInt(colorValues[0], r);
base::StringToInt(colorValues[1], g);
params->context = static_cast<Ewk_Hit_Test_Result_Context>(context);
if (params->mode & EWK_HIT_TEST_MODE_NODE_DATA) {
- params->nodeData.tagName = web_hit_test.node().nodeName().utf8();
params->nodeData.nodeValue = web_hit_test.node().nodeValue().utf8();
}
continue;
}
std::string rel = elem.getAttribute("rel").utf8();
- if (LowerCaseEqualsASCII(rel, "apple-touch-icon") || // Apple's way
- LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed")) {
+ if (base::LowerCaseEqualsASCII(rel, "apple-touch-icon") || // Apple's way
+ base::LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed")) {
appleIconUrl = document.completeURL(elem.getAttribute("href")).string().utf8();
break;
- } else if (LowerCaseEqualsASCII(rel, "icon")) { // Google's way
+ } else if (base::LowerCaseEqualsASCII(rel, "icon")) { // Google's way
iconUrl = document.completeURL(elem.getAttribute("href")).string().utf8();
}
}
continue;
}
std::string rel = elem.getAttribute("rel").utf8();
- if (LowerCaseEqualsASCII(rel, "apple-touch-icon") || // Apple's way
- LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed") || // same here
- LowerCaseEqualsASCII(rel, "icon")) { // Google's way
+ if (base::LowerCaseEqualsASCII(rel, "apple-touch-icon") || // Apple's way
+ base::LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed") || // same here
+ base::LowerCaseEqualsASCII(rel, "icon")) { // Google's way
std::string iconSize = elem.getAttribute("sizes").utf8();
std::string iconUrl = document.completeURL(elem.getAttribute("href")).string().utf8();
continue;
std::string name = elem.getAttribute("name").utf8();
- if (LowerCaseEqualsASCII(name, "apple-mobile-web-app-capable") || // Apple's way
- LowerCaseEqualsASCII(name, "mobile-web-app-capable")) { // Google's way
+ if (base::LowerCaseEqualsASCII(name, "apple-mobile-web-app-capable") || // Apple's way
+ base::LowerCaseEqualsASCII(name, "mobile-web-app-capable")) { // Google's way
std::string content = elem.getAttribute("content").utf8();
- if (LowerCaseEqualsASCII(content, "yes")) {
+ if (base::LowerCaseEqualsASCII(content, "yes")) {
capable = true;
}
break;
float cached_min_page_scale_factor_;
float cached_max_page_scale_factor_;
gfx::Size last_sent_contents_size_;
- base::OneShotTimer<RenderViewObserverEfl> check_contents_size_timer_;
+ base::OneShotTimer check_contents_size_timer_;
bool link_effect_enabled_;
//static
TextEncodingMapEfl* TextEncodingMapEfl::GetInstance() {
- return Singleton<TextEncodingMapEfl>::get();
+ return base::Singleton<TextEncodingMapEfl>::get();
}
bool TextEncodingMapEfl::isTextEncodingValid(const char* name) {
#include <Eina.h>
#include "base/containers/hash_tables.h"
+namespace base {
template <typename T> struct DefaultSingletonTraits;
+}
class TextEncodingMapEfl {
public:
static TextEncodingMapEfl* GetInstance();
bool isTextEncodingValid(const char* name);
private:
- friend struct DefaultSingletonTraits<TextEncodingMapEfl>;
+ friend struct base::DefaultSingletonTraits<TextEncodingMapEfl>;
TextEncodingMapEfl();
base::hash_set<std::string> encoding_name_set_;
};
it != protocol_handlers->end();
++it) {
bool set_protocol = job_factory->SetProtocolHandler(
- it->first, it->second.release());
+ it->first, make_scoped_ptr(it->second.release()));
DCHECK(set_protocol);
}
protocol_handlers->clear();
if (protocol_handlers)
std::swap(protocol_handlers_, *protocol_handlers);
- proxy_config_service_.reset(
- net::ProxyService::CreateSystemProxyConfigService(
- io_task_runner, file_task_runner));
+ proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService(
+ io_task_runner, file_task_runner);
}
URLRequestContextGetterEfl::~URLRequestContextGetterEfl() {
storage_->set_channel_id_service(make_scoped_ptr(new net::ChannelIDService(
new net::DefaultChannelIDStore(NULL),
base::WorkerPool::GetTaskRunner(true))));
- storage_->set_http_user_agent_settings(new HttpUserAgentSettingsEfl());
+ storage_->set_http_user_agent_settings(
+ make_scoped_ptr(new HttpUserAgentSettingsEfl()));
scoped_ptr<net::HostResolver> host_resolver(
net::HostResolver::CreateDefaultResolver(
url_request_context_->net_log()));
storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
- storage_->set_transport_security_state(new net::TransportSecurityState);
+ storage_->set_transport_security_state(
+ make_scoped_ptr(new net::TransportSecurityState));
// TODO(jam): use v8 if possible, look at chrome code.
storage_->set_proxy_service(
net::ProxyService::CreateUsingSystemProxyResolver(
- proxy_config_service_.release(),
+ proxy_config_service_.Pass(),
0,
url_request_context_->net_log()));
new net::HttpServerPropertiesImpl()));
net::HttpCache::DefaultBackend* main_backend = NULL;
- scoped_refptr<base::MessageLoopProxy> message_loop_proxy =
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE);
if (base_path_.empty()) {
main_backend = new net::HttpCache::DefaultBackend(
net::MEMORY_CACHE,
net::CACHE_BACKEND_DEFAULT,
base::FilePath(),
0,
- message_loop_proxy.get());
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
} else {
base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
net::CACHE_BACKEND_DEFAULT,
cache_path,
0,
- message_loop_proxy.get());
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
}
net::HttpNetworkSession::Params network_session_params;
network_session_params.cert_verifier =
net::HttpCache* main_cache = new net::HttpCache(
network_session_params, main_backend);
- storage_->set_http_transaction_factory(main_cache);
+ storage_->set_http_transaction_factory(make_scoped_ptr(main_cache));
scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
new net::URLRequestJobFactoryImpl());
// ShellContentBrowserClient::IsHandledURL().
InstallProtocolHandlers(job_factory.get(), &protocol_handlers_);
bool set_protocol = job_factory->SetProtocolHandler(
- url::kDataScheme, new net::DataProtocolHandler);
+ url::kDataScheme, make_scoped_ptr(new net::DataProtocolHandler));
DCHECK(set_protocol);
set_protocol = job_factory->SetProtocolHandler(
url::kFileScheme,
- new net::FileProtocolHandler(
+ make_scoped_ptr(new net::FileProtocolHandler(
BrowserThread::GetBlockingPool()->
GetTaskRunnerWithShutdownBehavior(
- base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)));
+ base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))));
DCHECK(set_protocol);
// Set up interceptors in the reverse order.
}
request_interceptors_.weak_clear();
- storage_->set_job_factory(top_job_factory.release());
+ storage_->set_job_factory(make_scoped_ptr(top_job_factory.release()));
}
return url_request_context_.get();
#if defined(OS_TIZEN)
#include "content/public/browser/media_capture_devices.h"
-#include "media/video/capture/tizen/video_capture_device_tizen.h"
+#include "media/capture/video/tizen/video_capture_device_tizen.h"
#endif
#if defined(TIZEN_AUTOFILL_SUPPORT)
int route_id,
int main_frame_route_id,
WindowContainerType window_container_type,
- const string16& /*frame_name*/,
+ const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
SessionStorageNamespace* session_storage_namespace) {
}
void WebContentsDelegateEfl::EnterFullscreenModeForTab(content::WebContents* web_contents,
- const GURL& origin, int display_id) {
+ const GURL& origin) {
is_fullscreen_ = true;
web_view_->SmartCallback<EWebViewCallbacks::EnterFullscreen>().call();
}
int route_id,
int main_frame_route_id,
WindowContainerType,
- const base::string16& frame_name,
+ const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
SessionStorageNamespace* session_storage_namespace) override;
virtual void CloseContents(WebContents* source) override;
void EnterFullscreenModeForTab(content::WebContents* web_contents,
- const GURL& origin,
- int display_id = 0) override;
+ const GURL& origin) override;
void ExitFullscreenModeForTab(content::WebContents* web_contents) override;
virtual bool IsFullscreenForTabOrPending(
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="44.2403.0.31">
+<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="47.2526.0.43">
<label> mini browser application for chromium-efl package </label>
<author href="www.samsung.com" email="sns.park@samsung.com">SWC</author>
<description> mini browser application based on chromium-efl </description>
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.chromium-efl" version="40.2214.38.51">
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.chromium-efl" version="47.2526.0.43">
<label> mini browser application for chromium-efl package </label>
<author href="www.samsung.com" email="sns.park@samsung.com">SWC</author>
<description> mini browser application based on chromium-efl </description>
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="42.2311.0.11">
+<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="47.2526.0.43"
<label> micro browser application for chromium-efl package </label>
<author href="www.samsung.com" email="m.lapinski@samsung.com">SWC</author>
<description> micro browser application based on chromium-efl </description>
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.chromium-efl" version="42.2311.0.11">
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.chromium-efl" version="47.2526.0.43">
<label> micro browser application for chromium-efl package </label>
<author href="www.samsung.com" email="m.lapinski@samsung.com">SWC</author>
<description> micro browser application based on chromium-efl </description>
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="40.2214.0.47">
+<manifest xmlns="http://tizen.org/ns/packages" package="chromium-efl" version="47.2526.0.43">
<label>uBrowser application for chromium-efl package</label>
<author href="www.samsung.com" email="p.tworek@samsung.com">SRPOL</author>
<description>Small reference browser application for chromium-efl port</description>
%define _binary_payload w3.gzdio
Name: chromium-efl-libs
-%define ChromiumVersion 44.2403.0
-%define Week 11
+%define ChromiumVersion 47.2526.0
+%define Week 43
Version: %{ChromiumVersion}.%{Week}
Release: 1
Summary: Chromium-based app runtime, private libraries
Name: chromium-efl
Summary: Chromium EFL
# Set by by scripts/update-chromium-version.sh
-%define ChromiumVersion 44.2403.0
-%define Week 31
+%define ChromiumVersion 47.2526.0
+%define Week 43
Version: %{ChromiumVersion}.%{Week}
Release: 1
# The 'Group' should be specified as one of the following valid group list.
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(minizip)
BuildRequires: pkgconfig(nspr)
+BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(scim)
BuildRequires: pkgconfig(speex)
install -m 0755 "%{OUTPUT_FOLDER}"/lib/libchromium-ewk.so "%{buildroot}"%{_libdir}
-install -m 0755 "%{OUTPUT_FOLDER}"/libffmpegsumo.so "%{buildroot}%{CHROMIUM_EXE_DIR}"
+# [M47_2526] Temporary disabling the codes for switching to new chromium
+# FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14520
+#install -m 0755 "%{OUTPUT_FOLDER}"/libffmpegsumo.so "%{buildroot}%{CHROMIUM_EXE_DIR}"
install -m 0755 "%{OUTPUT_FOLDER}"/efl_webprocess "%{buildroot}%{CHROMIUM_EXE_DIR}"
install -m 0755 "%{OUTPUT_FOLDER}"/icudtl.dat "%{buildroot}%{CHROMIUM_EXE_DIR}"
install -m 0755 "%{OUTPUT_FOLDER}"/natives_blob.bin "%{buildroot}%{CHROMIUM_EXE_DIR}"
%defattr(-,root,root,-)
%{_libdir}/libchromium-ewk.so
%{CHROMIUM_EXE_DIR}/efl_webprocess
-%{CHROMIUM_EXE_DIR}/libffmpegsumo.so
+# [M47_2526] Temporary disabling the codes for switching to new chromium
+# FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14520
+#%{CHROMIUM_EXE_DIR}/libffmpegsumo.so
%{CHROMIUM_EXE_DIR}/icudtl.dat
%{CHROMIUM_EXE_DIR}/natives_blob.bin
%{CHROMIUM_EXE_DIR}/snapshot_blob.bin
%define _binary_payload w3.gzdio
Name: crosswalk-bin
-Version: 15.44.2403.0
+Version: 15.47.2526.0
Release: 0
Summary: Chromium-based app runtime
License: (BSD-3-Clause and LGPL-2.1+)
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Manifest xmlns="http://schemas.tizen.org/2012/12/manifest">
<Id>kmcele1k1p</Id>
- <Version>44.2403.0.31</Version>
+ <Version>47.2526.0.43</Version>
<Type>C++App</Type>
<Descriptions>
<Description Locale="eng-PH"/>
'variables': {
'use_aura%': 0,
'use_efl%' : 1,
+ 'use_default_render_theme%': 1,
'ewk_bringup%': 1,
'wayland_bringup%': 0,
projects / platform / framework / web / chromium-efl.git / commitdiff