platform/upstream/efl.git
7 years agoevas: Fix don't redraw map_surface issue 05/131805/3 accepted/tizen/unified/20170605.150656 submit/tizen/20170602.044537
jiin.moon [Wed, 31 May 2017 00:28:36 +0000 (09:28 +0900)]
evas: Fix don't redraw map_surface issue

Refs: master, <origin/HEAD>, <origin/master>, v1.19.0-726-ge250a27
Author:     jiin.moon <jiin.moon@samsung.com>
AuthorDate: Tue May 30 19:25:37 2017 +0900
Commit:     Jean-Philippe Andre <jp.andre@samsung.com>
CommitDate: Tue May 30 19:25:37 2017 +0900

    evas: Fix don't redraw map_sufarce issue

    Summary:
    map_surface does not redraw in below case.

    1) parent and child are smart object and has map.
    3) drawing objects.
    4) apply new map to child object.

    Test Plan: sample code

    Reviewers: jpeg, cedric, jypark

    Differential Revision: https://phab.enlightenment.org/D4889

Change-Id: I692ff9efe525ff5325a3001123da26ad08cafa45

7 years agoecore_device: propagate a ecore_device's subclass 55/130755/6
JengHyun Kang [Wed, 24 May 2017 01:06:49 +0000 (10:06 +0900)]
ecore_device: propagate a ecore_device's subclass

Change-Id: Ibbcaab69c50055cebfede968a213a29336333a24

7 years agoecore_drm: add a new api to transform touch 15/96015/16
JengHyun Kang [Tue, 30 May 2017 12:16:38 +0000 (21:16 +0900)]
ecore_drm: add a new api to transform touch

 - ecore_drm_device_touch_transformation_set()

 - add functions to calculate touch transform matrix

Change-Id: Ic9aaffe2e58125e64e5d3a98241b88ff7013a64d

7 years agoecore_drm: add a new api to rotate touch 59/93459/11
JengHyun Kang [Tue, 30 May 2017 03:49:33 +0000 (12:49 +0900)]
ecore_drm: add a new api to rotate touch

 - API: ecore_drm_device_touch_rotation_set()

Change-Id: I91a2c9214958dad90260f17b8e387ddee4201318

7 years ago[EvasTBM] Fix the bug when tbm surface is resized. 84/131084/3
Wonsik, Jung [Thu, 25 May 2017 09:49:56 +0000 (18:49 +0900)]
[EvasTBM] Fix the bug when tbm surface is resized.

When tbm surface is resized, tbm_surface_queue_reset should be called to reset tbm surface queue.

Change-Id: If6905f5a91a59bcd56ffc38bf2281ade8aa26296

7 years ago[EXTN_GL] skip iconify callback when extn typs is SHM 80/131980/1
sunghyun kim [Wed, 31 May 2017 11:16:23 +0000 (20:16 +0900)]
[EXTN_GL] skip iconify callback when extn typs is SHM

check extn type before check prop.window.
in 64bit emulator, it has some problem.

Change-Id: I157866466dbd10f6e48ffda4c0970b83b3b5bb6f

7 years agoecore_imf: Add commit content event callback 44/131944/2
Jihoon Kim [Wed, 31 May 2017 09:23:32 +0000 (18:23 +0900)]
ecore_imf: Add commit content event callback

COMMIT_CONTENT is called when the input method commits content such as an image.

Change-Id: Idf238dc9b27811999b1ee733eeba2318d57e54f1
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
7 years agoedje: add part_text_valign property for internal usage 18/115318/6
Youngbok Shin [Fri, 17 Feb 2017 09:08:32 +0000 (18:08 +0900)]
edje: add part_text_valign property for internal usage

There is a need of changing vertical align using API from EFL C# dev team.

@tizen_feature

Change-Id: Ib9376ce4088624654cc96f169a3058f5d4d532be

7 years agoecore_drm: close given fd when there is no matching ecore_drm_evdev device 48/131648/2
Sung-Jin Park [Tue, 30 May 2017 08:45:57 +0000 (17:45 +0900)]
ecore_drm: close given fd when there is no matching ecore_drm_evdev device

Change-Id: I153891f2ae6d9cbee34144b21e405627c1dc22fc
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>
7 years agoeina: Fix broken link in doc to introduce integer hash algorithms 54/131554/1
Jeeyong Um [Tue, 30 May 2017 04:37:18 +0000 (13:37 +0900)]
eina: Fix broken link in doc to introduce integer hash algorithms

Signed-Off-By: Jeeyong Um <jc9.um@samsung.com>
Change-Id: Ic2fa32d92f20f2cf1c558182f99ba22b9f7e560f

7 years ago[EvasGL] update wl_egl_window in wayland egl backend. 83/131083/2
Wonsik, Jung [Thu, 25 May 2017 09:46:30 +0000 (18:46 +0900)]
[EvasGL] update wl_egl_window in wayland egl backend.

wl_egl_window is created in evas_wayland egl backend.
So, wl_egl_window value of _Evas_Engine_Info_Wayland_Egl is needed to update with this value.

Change-Id: I5076cd95ed90c951729d09ed03d5dd6efa93bf9e

7 years agoecore_anim : Add safety code to ecore_anim 16/131216/2 accepted/tizen/unified/20170531.082540 submit/tizen/20170526.054713
jiin.moon [Fri, 26 May 2017 02:19:31 +0000 (11:19 +0900)]
ecore_anim : Add safety code to ecore_anim

Change-Id: I76ce644bc2166597eb49a19a8403115d51527dd5

7 years ago[evas_render] Downstream "evas render - drop eo overhead by using ptrs 14/129614/2
Joogab Yun [Wed, 17 May 2017 07:24:37 +0000 (16:24 +0900)]
[evas_render] Downstream "evas render - drop eo overhead by using ptrs
we already have" [commit id : 51638afbebc225b5a550eb87a0e74c53d866ed2e]

    evas render - drop eo overhead by using ptrs we already have

    several calls, specifically evas_object_change_reset,
    evas_object_cur_prev, and evas_object_clip_changes_clean that are
    called directly or indirectly as part of evas render on at least
every
    active object if not more, were doing full eo obj lookups when their
    calling functions already all had the eo protected data looked up.
    tha's silly and just adds overhead we don't need. my test dropped
    _eo_obj_pointer_get overhead in perf profiles from 4.48% to 2.65%.
see:

       4.48%  libeo.so.1.18.99            [.] _eo_obj_pointer_get
       4.23%  libevas.so.1.18.99          [.]
evas_render_updates_internal
       2.61%  libevas.so.1.18.99          [.]
evas_render_updates_internal_loop
       1.68%  libeo.so.1.18.99            [.] efl_data_scope_get
       1.57%  libc-2.24.so                [.] _int_malloc
       1.42%  libevas.so.1.18.99          [.]
evas_object_smart_changed_get
       1.09%  libevas.so.1.18.99          [.]
evas_object_clip_recalc.part.37
       1.08%  libpthread-2.24.so          [.] pthread_getspecific
       1.05%  libevas.so.1.18.99          [.]
efl_canvas_object_class_get
       1.01%  libevas.so.1.18.99          [.] evas_object_cur_prev
       0.99%  libeo.so.1.18.99            [.]
_efl_object_event_callback_legacy_call
       0.87%  libevas.so.1.18.99          [.]
_evas_render_phase1_object_ctx_render_cache_append
       0.82%  libpthread-2.24.so          [.] pthread_mutex_lock
       0.81%  libevas.so.1.18.99          [.]
_evas_render_phase1_object_process
       0.79%  libc-2.24.so                [.] _int_free

    vs now the improved:

       4.82%  libevas.so.1.18.99          [.]
evas_render_updates_internal
       3.44%  libevas.so.1.18.99          [.]
evas_render_updates_internal_loop
       2.65%  libeo.so.1.18.99            [.] _eo_obj_pointer_get
       2.22%  libc-2.24.so                [.] _int_malloc
       1.46%  libevas.so.1.18.99          [.]
evas_object_smart_changed_get
       1.04%  libeo.so.1.18.99            [.]
_efl_object_event_callback_legacy_call
       1.03%  libevas.so.1.18.99          [.]
_evas_render_phase1_object_ctx_render_cache_append
       0.97%  libeina.so.1.18.99          [.]
eina_chained_mempool_malloc
       0.93%  libevas.so.1.18.99          [.]
evas_object_clip_recalc.part.37
       0.92%  libpthread-2.24.so          [.] pthread_mutex_lock
       0.91%  libevas.so.1.18.99          [.]
_evas_render_phase1_object_process
       0.84%  libc-2.24.so                [.] _int_free
       0.84%  libevas.so.1.18.99          [.] evas_object_cur_prev
       0.83%  libeina.so.1.18.99          [.] eina_chained_mempool_free
       0.80%  libeo.so.1.18.99            [.] efl_data_scope_get

    of course other things "increase their percentage" as oe overhead
now
    dropped, and things seem to move around a bit, but it does make
sense
    to do this with no downsides i can see as we already are accessing
the
    protected data ptr in the parent func.

Change-Id: Iee7740df896537df047fac9fb0d33b450be9759f

7 years ago[evas_native_tbm] memory is mapped but not unmapped properly leads to 63/130763/2
Joogab Yun [Tue, 23 May 2017 23:55:47 +0000 (08:55 +0900)]
[evas_native_tbm] memory is mapped but not unmapped properly leads to
quick low memory
(_evas_common_rgba_image_surface_mmap/_evas_common_rgba_image_surface_munmap)

because setting NULL to image.date at _native_free_cb() before proper unmamp

Change-Id: Ia5cdaa8bc49698b87f3e77ee879dfde979240d59

7 years ago[evas_tbmbuf] changed to not use wl_event_queue 99/130899/2
Joogab Yun [Wed, 24 May 2017 09:23:54 +0000 (18:23 +0900)]
[evas_tbmbuf] changed to not use wl_event_queue

Change-Id: I1923dfecffac7a9050d6751e8528e9310396eff3

7 years agoevas_events: fix build error 18/130818/1
Hosang Kim [Wed, 24 May 2017 05:55:52 +0000 (14:55 +0900)]
evas_events: fix build error

Change-Id: Ib40958220b0c2ee27e11a08214456fde6c57926b

7 years agoevas_events: add missing device information 45/130145/2
Hosang Kim [Fri, 19 May 2017 08:20:11 +0000 (17:20 +0900)]
evas_events: add missing device information

Change-Id: I5de5f4ed5ca53d78f6d3903374c371a7b2fcfdad

7 years agoecore_wayland: free drag source when drag leave event comes. 85/130585/3
Taehyub Kim [Tue, 23 May 2017 04:29:35 +0000 (13:29 +0900)]
ecore_wayland: free drag source when drag leave event comes.

This is relate to triggering ECORE_WL_EVENT_DATA_SOURCE_CANCELLED.

Change-Id: I8af837114a8a9973a3563d1d16aaae91131939d1

7 years agoecore_wayland: set a role property while creating cursor surface (2) 13/130413/1
Doyoun Kang [Mon, 22 May 2017 08:15:11 +0000 (17:15 +0900)]
ecore_wayland: set a role property while creating cursor surface (2)

Change-Id: I981167e20413dfae5ee17fbd337ad1cc730e9620

7 years agoecore_wayland: set a role property while creating cursor surface 05/130405/1
Doyoun Kang [Mon, 22 May 2017 08:04:17 +0000 (17:04 +0900)]
ecore_wayland: set a role property while creating cursor surface

Change-Id: I73ccd65dca9c30de82c085ef5538ed2ba8d686f2

7 years ago[evas_gl_thread] code cleanup : removed unuse code 93/130293/2
Joogab Yun [Sun, 21 May 2017 23:58:32 +0000 (08:58 +0900)]
[evas_gl_thread] code cleanup : removed unuse code

Change-Id: I61dbde80d76a3d4d7588e1d090e7a5848ad810d9

7 years agoRevert "Revert "ecore_evas: Changes the animator source to custom"" 16/129316/2
jiin.moon [Tue, 16 May 2017 04:34:27 +0000 (13:34 +0900)]
Revert "Revert "ecore_evas: Changes the animator source to custom""

This reverts commit 67d0bb47886274544af301bb4221cf8fdc2167ef.

Change-Id: If8a949a4a7a3c1ec550dae05aa163a14bf8a6b2b

7 years agoRevert "Revert "Revert "[evas_gl_thread] default enable EVAS_GL_RENDER_THREAD and""" 37/130237/1 accepted/tizen/unified/20170519.200908 submit/tizen/20170519.132143 tizen_4.0.m1_release
SangHyeon Lee [Fri, 19 May 2017 13:05:34 +0000 (22:05 +0900)]
Revert "Revert "Revert "[evas_gl_thread] default enable EVAS_GL_RENDER_THREAD and"""

This reverts commit 065a378fb86215c94731247e07ac592677d0e5ad.

Change-Id: Ide5ecd38249dad821a6d68170500352a75cb5296
Signed-off-by: SangHyeon Lee <sh10233.lee@samsung.com>
7 years agoecore_wl_dnd: fix double free exception. 24/130224/1
Hosang Kim [Fri, 19 May 2017 12:42:25 +0000 (21:42 +0900)]
ecore_wl_dnd: fix double free exception.

Change-Id: Ia909be41f7b3752949be4dd16862f5fcef105d1f

7 years agoecore_drm_evdev: add missing break 21/130221/2
Hosang Kim [Fri, 19 May 2017 12:32:00 +0000 (21:32 +0900)]
ecore_drm_evdev: add missing break

Change-Id: I9b6ff3f7d21f28a9ab5ebb248eae9690a8cf6c44

7 years agoevas_gl: fix glGetObjectPtrLabel prototype. 66/128266/2
Daekwang Ryu [Mon, 8 May 2017 08:26:56 +0000 (17:26 +0900)]
evas_gl: fix glGetObjectPtrLabel prototype.

Change-Id: I7e3e9b33476f6c9a472f6fe0ba72a546d3144eaf

7 years agoRevert "Revert "ecore_drm: support a palm event using a libinput aux_data event"" 73/129573/1
Sung-Jin Park [Wed, 17 May 2017 04:39:52 +0000 (13:39 +0900)]
Revert "Revert "ecore_drm: support a palm event using a libinput aux_data event""

This reverts commit de9276613f0ce0dc54f90ded7c0f87db3b782952.

Change-Id: Id86b7787f6791bc6ec19da0e904bd95aa5764b7e

7 years agoRevert "ecore_drm: support a palm event using a libinput aux_data event" 81/129381/1
Sung-Jin Park [Tue, 16 May 2017 07:56:18 +0000 (16:56 +0900)]
Revert "ecore_drm: support a palm event using a libinput aux_data event"

This reverts commit 2abc2973523ef8dd4922849bd451f454912d31ea.

Change-Id: I6115c97815ea5e2689caa527aa6820b91d6184d9

7 years agoecore_drm: support a palm event using a libinput aux_data event 40/129140/2
JengHyun Kang [Mon, 15 May 2017 06:56:51 +0000 (15:56 +0900)]
ecore_drm: support a palm event using a libinput aux_data event

Change-Id: Ifa8464f25521b3f5adc8ba1755ed72cc44fe92f7

7 years agoecore_input: add ECORE_AXIS_LABEL_TOUCH_PALM enum 58/129158/2
Sung-Jin Park [Mon, 15 May 2017 08:02:49 +0000 (17:02 +0900)]
ecore_input: add ECORE_AXIS_LABEL_TOUCH_PALM enum

Change-Id: I03af80dea3a7d7e9610ccde6848609f822a32f7f
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>
7 years ago[evas_gl_thread] change mode of glTexImage2D to 'finish mode' in case of GLES1.1 64/128664/2
Joogab Yun [Thu, 11 May 2017 03:57:54 +0000 (12:57 +0900)]
[evas_gl_thread] change mode of glTexImage2D to 'finish mode' in case of GLES1.1

Change-Id: Iafa9a886b3d5abbf9b41bea1c57ec50f0645de94

7 years ago[evas_engine] add stride_get in case of tbm surface 12/128412/2
Joogab Yun [Wed, 10 May 2017 02:08:21 +0000 (11:08 +0900)]
[evas_engine] add stride_get in case of tbm surface

Change-Id: I6963a338c5f7a51a4a2929bcf780687dfd6f39a1

7 years agoRevert "[evas_gl_thread] change mode of glTexImage2D to finish for GLES1.1" 63/128663/2
Joogab Yun [Thu, 11 May 2017 01:43:22 +0000 (10:43 +0900)]
Revert "[evas_gl_thread] change mode of glTexImage2D to finish for GLES1.1"

This reverts commit 76cb3476759840ce6ee91c6028e0539fb46ab0d4.

Change-Id: Iec7521cc4d65b9ae65968893bfc9034b3999ca53

7 years agoRevert "Revert "[evas_gl_thread] default enable EVAS_GL_RENDER_THREAD and"" 40/129040/1
Taehyub Kim [Fri, 12 May 2017 12:23:57 +0000 (21:23 +0900)]
Revert "Revert "[evas_gl_thread] default enable EVAS_GL_RENDER_THREAD and""

This reverts commit 7be48db65396c636ad2ec897afe99c2cea4148fd.

Change-Id: I0bd97feabbb967842b2087461433c1a21de6bd4f

7 years agoRevert "Revert "Revert "Revert "ecore_wayland: free mime types after finish set_selec... 39/129039/1
Taehyub Kim [Fri, 12 May 2017 12:23:12 +0000 (21:23 +0900)]
Revert "Revert "Revert "Revert "ecore_wayland: free mime types after finish set_selection""""

This reverts commit ae6b422adf28397b2c3d3c155461c9ceeb0ca4e4.

Change-Id: Iab21106d1b9b8ae3a4c54e8f7d10439fe676c83e

7 years agoRevert "Revert "Revert "Revert "[Ecore] Memory leak fixed in Ecore Wayland"""" 38/129038/1
Taehyub Kim [Fri, 12 May 2017 12:22:46 +0000 (21:22 +0900)]
Revert "Revert "Revert "Revert "[Ecore] Memory leak fixed in Ecore Wayland""""

This reverts commit e42e0350306099988b285df334efcc9430ac0ac9.

Change-Id: Iaa1c3e97b6c43a9979a2c83341482be257a4b54d

7 years agoRevert "Revert "Revert "[Ecore] Memory leak fixed in Ecore Wayland""" 36/129036/1 accepted/tizen/unified/20170512.170308 submit/tizen/20170512.122151
Taehyub Kim [Fri, 12 May 2017 12:18:29 +0000 (21:18 +0900)]
Revert "Revert "Revert "[Ecore] Memory leak fixed in Ecore Wayland"""

This reverts commit ee4d6eea9bd409c552b861d86309cfe85a789069.

Change-Id: I76c933d5449c523bf47192508b8a78d919d8a8af

7 years agoRevert "Revert "Revert "ecore_wayland: free mime types after finish set_selection""" 35/129035/1
Taehyub Kim [Fri, 12 May 2017 12:18:07 +0000 (21:18 +0900)]
Revert "Revert "Revert "ecore_wayland: free mime types after finish set_selection"""

This reverts commit 00fb6311109e1276fb82d2f7775f8b59b90e51d2.

Change-Id: I006f9ac333bcb086f5849331f164884719cca212

7 years agoRevert "[evas_gl_thread] default enable EVAS_GL_RENDER_THREAD and" 34/129034/1
Taehyub Kim [Fri, 12 May 2017 12:15:45 +0000 (21:15 +0900)]
Revert "[evas_gl_thread] default enable EVAS_GL_RENDER_THREAD and"

This reverts commit b94bc59a5e3127cc207e4c8a56056d5e06e641c2.

Change-Id: Id5e66b37459cb610c1b6590c82b189257478b4fd

7 years agoRevert "evas: consider clipper when handling mouse event" 33/129033/1
Taehyub Kim [Fri, 12 May 2017 12:12:27 +0000 (21:12 +0900)]
Revert "evas: consider clipper when handling mouse event"

This reverts commit 36cf654e126d7328d54b61b103fe84236d9a5a4c.

Change-Id: I5c55eff7ccd0b81fbb523158722f3a8d622a3290

7 years agoevas: Fix can't open tiff file on loader 65/128465/2
jiin.moon [Wed, 10 May 2017 06:10:17 +0000 (15:10 +0900)]
evas: Fix can't open tiff file on loader

Refs: v1.19.0-423-gc89bf7b
Author:     jiin.moon <jiin.moon@samsung.com>
AuthorDate: Mon May 8 15:20:01 2017 +0200
Commit:     Stefan Schmidt <stefan@osg.samsung.com>
CommitDate: Mon May 8 15:20:01 2017 +0200

    evas: Fix can't open tiff file on loader

    Summary:
    Evas can't open tiff file because of no implement in client read api.
    I wrote codes simply for open.

    Test Plan: self

    Reviewers: jpeg, cedric, jypark

    Subscribers: stefan_schmidt

    Differential Revision: https://phab.enlightenment.org/D4857

Change-Id: Iae59a0a918a0e123bdce457df4207e341a55ef4d

7 years ago[evas_gl_thread] default enable EVAS_GL_RENDER_THREAD and 85/127785/4
Joogab Yun [Tue, 2 May 2017 01:26:01 +0000 (10:26 +0900)]
[evas_gl_thread] default enable EVAS_GL_RENDER_THREAD and
EVAS_GL_EVGL_RENDER_THREAD at wayland_egl backend

from now, wayland_egl backend and evas gl work as threads.

Change-Id: Idfa5296c96d8c8b511d4fe75b3b5be3346bbeeef

7 years agoRevert "Revert "ecore_wayland: free mime types after finish set_selection"" 41/128441/1
Minchul Lee [Wed, 10 May 2017 04:58:45 +0000 (13:58 +0900)]
Revert "Revert "ecore_wayland: free mime types after finish set_selection""

This reverts commit bcc4a4b5fe9ad9d47f76dc505c569423e78a46f4.

Change-Id: I7cb97ac23a3d9ba46c78afb3d5658a85dc3c3bb7

7 years agoRevert "Revert "[Ecore] Memory leak fixed in Ecore Wayland"" 39/128439/1
Minchul Lee [Wed, 10 May 2017 04:58:19 +0000 (13:58 +0900)]
Revert "Revert "[Ecore] Memory leak fixed in Ecore Wayland""

This reverts commit 1ccf6046ed469d18aa4816e1fb2422a8e8d98e89.

Change-Id: I1e8b9d8898e75128c5ec8ca90f2d03f74939b400

7 years agoedje: fix more - checking the return value of a function eina_mempool_malloc 08/128408/3 accepted/tizen/unified/20170510.183305 submit/tizen/20170510.073036
Minchul Lee [Wed, 10 May 2017 01:58:36 +0000 (10:58 +0900)]
edje: fix more - checking the return value of a function eina_mempool_malloc

Change-Id: I336470e252d346837bb7a1c3419456d7f532b08f
Signed-off-by: Minchul Lee <slotus.lee@samsung.com>
7 years agoedje: checking the return value of a function eina_mempool_malloc 59/128259/4
Minchul Lee [Mon, 8 May 2017 08:10:37 +0000 (17:10 +0900)]
edje: checking the return value of a function eina_mempool_malloc

Change-Id: I1602b08f6d370c6a756300182ec8fb0aa8a5a70e
Signed-off-by: Minchul Lee <slotus.lee@samsung.com>
7 years agodocs: Fix broken edje tutorial (swallow 2) 62/128262/1
Jeeyong Um [Mon, 8 May 2017 08:19:39 +0000 (17:19 +0900)]
docs: Fix broken edje tutorial (swallow 2)

Signed-Off-By: Jeeyong Um <jc9.um@samsung.com>
Change-Id: Ibe9bfdbe83fd10a109157c1aaf67d2a2ef1e3aac

7 years agoecore_evas_wl: add NULL check 96/127896/2
Boram Park [Tue, 2 May 2017 07:42:31 +0000 (16:42 +0900)]
ecore_evas_wl: add NULL check

Change-Id: Iad73216f709b311e0bbd549ce6e91cd85f3a0cb1

7 years agoecore_wl: remove unreachable code 94/127894/2
Boram Park [Tue, 2 May 2017 07:40:17 +0000 (16:40 +0900)]
ecore_wl: remove unreachable code

Change-Id: I36ef103a7036efcffeb63886e4674cdbe9095fa2

7 years agoecore_drm: free the new-allocated memory when failed 93/127893/2
Boram Park [Tue, 2 May 2017 07:39:21 +0000 (16:39 +0900)]
ecore_drm: free the new-allocated memory when failed

Change-Id: I0c446cf19291a23dc272498a4111b4f65a29da11

7 years agoevas textblock: fix dereferenced after free issue for ellipsis item 31/128131/1
Youngbok Shin [Mon, 8 May 2017 01:00:38 +0000 (10:00 +0900)]
evas textblock: fix dereferenced after free issue for ellipsis item

Change-Id: I31d6fa6afb8cfba015ff2e024cc933b9ecb02081

7 years agoevas: change alloca->malloc for avoid stack overflow 80/126880/2
sunghyun kim [Tue, 25 Apr 2017 05:31:17 +0000 (14:31 +0900)]
evas: change alloca->malloc for avoid stack overflow

when texture upload using memcpy case, sometimes crash happens in enlightenment.
it may be memory corruption problem when alloac is failed because of Stack overflow
so i replace alloca to malloc for avoid stack overflow

Change-Id: I20ad80df73d9e63d832acfdf4a281743841b6b46

7 years ago[evas_gl_thread] change mode of glTexImage2D to finish for GLES1.1 74/127674/2
Joogab Yun [Fri, 28 Apr 2017 08:20:15 +0000 (17:20 +0900)]
[evas_gl_thread] change mode of glTexImage2D to finish for GLES1.1

Change-Id: I23c0454645b134ab9041075fe4fde604f62c9749

7 years agoRevert "[Ecore] Memory leak fixed in Ecore Wayland" 95/127695/1
Minchul Lee [Fri, 28 Apr 2017 09:17:18 +0000 (18:17 +0900)]
Revert "[Ecore] Memory leak fixed in Ecore Wayland"

This reverts commit 08c45aa4a87fba4c1b32ecc14a09acdf2dcaa280.

Change-Id: I53ad4f9d84e963b0bbc6834cf7bac039bb04da61

7 years agoRevert "ecore_wayland: free mime types after finish set_selection" 93/127693/1
Minchul Lee [Fri, 28 Apr 2017 09:16:03 +0000 (18:16 +0900)]
Revert "ecore_wayland: free mime types after finish set_selection"

This reverts commit 51cdd3e7812970cb92e65553905a8ffc1118789d.

Change-Id: If95102db358657e4c967769c0893b56a46460227

7 years agoevas font: Append global font path when Evas initializes Fontconfig 85/127685/2
Youngbok Shin [Fri, 28 Apr 2017 09:01:10 +0000 (18:01 +0900)]
evas font: Append global font path when Evas initializes Fontconfig

@tizen_fix

Change-Id: Ib7e218bbe0b0e74c304760c2fb9bdb376a58d36a

7 years agoedje: fix clipper loop issue caused by clipper object for fade ellipsis 04/127204/4
Youngbok Shin [Thu, 27 Apr 2017 08:00:51 +0000 (17:00 +0900)]
edje: fix clipper loop issue caused by clipper object for fade ellipsis

@tizen_fix
Change-Id: Idc984a01b763e3f63b64b88a7261d20b488f01aa

7 years agoecore_wayland: free mime types after finish set_selection 97/127597/1
Minchul Lee [Thu, 27 Apr 2017 05:39:31 +0000 (14:39 +0900)]
ecore_wayland: free mime types after finish set_selection

When copy operation, device tried to access the mime types
which is already freed. Thus, crash happend. To deliver
them to DATA READY handler, duplicate them and free later.

Change-Id: I9b40a9070d9cc03fb2c3df57586b062d6db8afe6
Signed-off-by: Minchul Lee <slotus.lee@samsung.com>
7 years agoRevert "ecore_evas: Changes the animator source to custom" 94/127494/1 accepted/tizen/unified/20170428.032629 submit/tizen/20170427.080035
jiin.moon [Thu, 27 Apr 2017 12:01:26 +0000 (21:01 +0900)]
Revert "ecore_evas: Changes the animator source to custom"

This reverts commit 30cd575bbc7571e258888d00b72a2682b543a261.

Change-Id: Id425bbd57f8f22b652cb0f5a51badd724d72c9d1

7 years agoecore_wl: ignore_output_transform 15/127315/1
Boram Park [Thu, 13 Apr 2017 07:47:30 +0000 (16:47 +0900)]
ecore_wl: ignore_output_transform

Change-Id: Id7b3bf7e805f18ee1cbc3d41296b023f156b27ea

7 years agogl_drm: fix the ecore_evas rotation behavior 14/127314/1
Boram Park [Fri, 17 Mar 2017 05:13:21 +0000 (14:13 +0900)]
gl_drm: fix the ecore_evas rotation behavior

Change-Id: Ib8e93484d0cb3abe870177efd7d1fa3d4f76573d

7 years agoecore_evas_drm: implementation for ecore_evas rotation 13/127313/1
Boram Park [Fri, 17 Mar 2017 05:14:03 +0000 (14:14 +0900)]
ecore_evas_drm: implementation for ecore_evas rotation

Change-Id: If72d3849a06660c27feb4bb87798e95d28fee6e2

7 years agoecore_evas_wayland: consider output_rotation to manage evas. 12/127312/1
Boram Park [Fri, 17 Mar 2017 04:55:34 +0000 (13:55 +0900)]
ecore_evas_wayland: consider output_rotation to manage evas.

Change-Id: I38885a7e507d8f7480fafaa458401262d622eaae

7 years agoecore_evas_wayland: register the handler to detect the output transform change 11/127311/1
Boram Park [Fri, 17 Mar 2017 04:43:05 +0000 (13:43 +0900)]
ecore_evas_wayland: register the handler to detect the output transform change

Moreover, I added output_rotation to ee becuase ee->rotation is already used as
the window rotation value. It can't include the output rotation value. ee should
be able to distinguish between the window rotation value and the output rotation
value because ee have to hide the output rotation information from the clients.

Change-Id: I432babf0859f8795766e3f6ac0673641e54c03a3

7 years agoecore_wl: add output_find, buffer_transform_set, transform_get functions 10/127310/1
Boram Park [Fri, 17 Mar 2017 04:37:22 +0000 (13:37 +0900)]
ecore_wl: add output_find, buffer_transform_set, transform_get functions

Change-Id: I3f3c62bfd6ada530914d34533c46fad33966b0d0

7 years agoecore_wl: add ECORE_WL_EVENT_OUTPUT_TRANSFORM event 09/127309/1
Boram Park [Fri, 17 Mar 2017 04:34:26 +0000 (13:34 +0900)]
ecore_wl: add ECORE_WL_EVENT_OUTPUT_TRANSFORM event

Change-Id: I265a270587810991e065ff15c297e6b304337484

7 years agoecore_drm: check if dpms is on 08/127308/1
Boram Park [Fri, 17 Mar 2017 03:10:42 +0000 (12:10 +0900)]
ecore_drm: check if dpms is on

Change-Id: I7666a6554dfc5fd95773eef44062d9a116e64bfa

7 years agoAdded a detailed description in ecore_imf_context_prediction_hint_set() 17/126117/5
InHong Han [Thu, 20 Apr 2017 07:02:07 +0000 (16:02 +0900)]
Added a detailed description in ecore_imf_context_prediction_hint_set()

Change-Id: Ia31fca596e08874bbe18a66886113fe6731e5203

7 years agoevas: consider clipper when handling mouse event 08/127208/1
Jaeun Choi [Wed, 26 Apr 2017 11:27:14 +0000 (20:27 +0900)]
evas: consider clipper when handling mouse event

when an object is clipped,
mouse event area should be clipped as well.

this commit comes from upstream patches
f6b3c31561276a6c7afc8fb56ae2e5363772782c: basic logic for clipper
afbe8ade6b7f99d5158be931a13971bb0681509f: added logic for mapped objects

Change-Id: I385552a44c2e4424c7f5104e70d14c5d0d410d1b

7 years ago[evas_gl_thread] provide disable render thread option for webkit 50/127150/1
Joogab Yun [Wed, 26 Apr 2017 08:51:14 +0000 (17:51 +0900)]
[evas_gl_thread] provide disable render thread option for webkit

webkit directly uses egl context in main thread then evas can't handle
at evas render thread side

so provide disable render thread option
when this option is 1, the render thread is turned off.

Change-Id: I196e60b7caef0311570d855097514a60811cef06

7 years agoevas_gl: add Related Features in evas_gl.h 61/127061/1
Daekwang Ryu [Wed, 26 Apr 2017 05:15:46 +0000 (14:15 +0900)]
evas_gl: add Related Features in evas_gl.h

New features were added in Tizen.
 http://tizen.org/feature/opengles.version.3_1
 http://tizen.org/feature/opengles.version.3_2

Change-Id: I01887c7cb294fad99d68b72670587154845c9d92

7 years agoecore_evas: Changes the animator source to custom 51/126651/2
jiin.moon [Mon, 24 Apr 2017 11:55:30 +0000 (20:55 +0900)]
ecore_evas: Changes the animator source to custom

Default source is custom(vsync) same as tizen 2.4

Change-Id: If52ae08e23353ba83533a9160e68b0a442347463

7 years agoevas: round glyph's advance before adding it to pen_x 85/126885/1
Youngbok Shin [Sun, 23 Apr 2017 06:22:42 +0000 (09:22 +0300)]
evas: round glyph's advance before adding it to pen_x

Summary:
Rounding the sum of glyph's advance could cause inconsistency of
each glyph's positions. When Evas enables Harfbuzz library,
Each glyph's position has to be handled by only nearby glyphs.
But, currently, totally unrelated glyph's advacne could change
other glyphs positions.

ex) 1. "connect."
    2. "Tap here to connect."

You can see different gap between "c" and "o" of word "connect".
It should be same even if there was a different text before the word "connect".
@fix

Test Plan: N/A

Reviewers: raster, herdsman, jpeg

Reviewed By: raster

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D4782

Change-Id: I6124eeb7cbe48f355dd5628a84e87a03b4a2b261

7 years agoevas: give width offset when Evas tries to find ellipsis position 84/126884/1
Youngbok Shin [Mon, 10 Apr 2017 03:15:19 +0000 (12:15 +0900)]
evas: give width offset when Evas tries to find ellipsis position

Summary:
If the last item before ellipsis item has bigger width than its advance,
evas_common_font_query_last_up_to_pos() function can find wrong ellipsis position.
When Evas finds a position for non last item, Evas must care about additionally
available space for glyph's width of the given x position.

ex) the last item's glyph before ellipsis item has a tail to draw above the ellipsis item.

@fix

Test Plan:
Test case will added as comment.
(Becasue of font license problem.)

Reviewers: herdsman, raster, jpeg, woohyun

Subscribers: cedric, Blackmole

Differential Revision: https://phab.enlightenment.org/D4727

Change-Id: Ie6dbec6c3dcc98ff0919d88e40969d0551dd898e

7 years ago[evas_thread_render] enhancement render thread. 45/125645/4 accepted/tizen/unified/20170426.061819 submit/tizen/20170425.111935
Joogab Yun [Tue, 18 Apr 2017 07:46:39 +0000 (16:46 +0900)]
[evas_thread_render] enhancement render thread.
 1. Apply async finish mode
 2. change the finish and flush mode for some egl/gl calls

Change-Id: Ia0f7178212e23d22897215bb7db17a7ade999660

7 years agoedje_cc: Keep lookups for removed program 61/126361/2
Jeeyong Um [Fri, 21 Apr 2017 06:23:21 +0000 (15:23 +0900)]
edje_cc: Keep lookups for removed program

================================================================================
commit a6c1c2d08fe10f63911c5dd3880eadbb4ae4316b
Author: Jee-Yong Um <jc9.um@samsung.com>
Date:   Wed Jan 4 11:14:46 2017 +0900

    edje_cc: Keep lookups for removed program

    Summary:
    Program lookups triggered by removed edje program should be removed when removing
    edje program, but program lookups for removed program should be kept to check
    exitence of removed program.
    This patch keeps lookups for removed program.

    Reviewers: cedric, jpeg

    Reviewed By: jpeg

    Differential Revision: https://phab.enlightenment.org/D4544
================================================================================

Signed-Off-By: Jeeyong Um <jc9.um@samsung.com>
Change-Id: I527d2cf98225e5d1c3409e95f861c8a546b2c0c3

7 years agoedje_cc: Keep script block during group inheritance 23/126323/2
Jeeyong Um [Fri, 21 Apr 2017 02:39:00 +0000 (11:39 +0900)]
edje_cc: Keep script block during group inheritance

Currently, script block is removed when an edje group inherits from other group
after defining its own script block.
  group { "somegroup";
    script {
       ...
    }
    parts {
       ...
    }
    inherit: "othergroup"; // <= previous script block is removed here.
  }

If parent group doesn't have script block, it doesn't need to overwrite previous
one. This will keep script block and print warning when script block is overwritten.

Signed-Off-By: Jeeyong Um <jc9.um@samsung.com>
Change-Id: Ie49c4e5c1378658d16bf33e61586f8d5a3a7cd14

7 years agoEvas.Table: Apply mirrored correctly when align is set 67/122767/2
Jeeyong Um [Mon, 3 Apr 2017 09:32:00 +0000 (18:32 +0900)]
Evas.Table: Apply mirrored correctly when align is set

Signed-Off-By: Jeeyong Um <jc9.um@samsung.com>
Change-Id: I087571bcb956eb1fb8a1ee61a90a6116aa54eca9

7 years agoRevert "Revert "ecore_wl: added Ecore_Wl_Event_Window_Pre_Visibility_Change event"" 20/126320/2
Gwanglim Lee [Fri, 21 Apr 2017 01:52:35 +0000 (10:52 +0900)]
Revert "Revert "ecore_wl: added Ecore_Wl_Event_Window_Pre_Visibility_Change event""

This reverts commit ddf7d134c3615e9cad1fdbb50ddadc83d8b80ef6.

Change-Id: I1243f9a1e3062024f471dbeca010035d1d805b4f

7 years agoevas_gl: remove colons of doxygen 00/126300/1
Daekwang Ryu [Fri, 21 Apr 2017 01:39:49 +0000 (10:39 +0900)]
evas_gl: remove colons of doxygen

Change-Id: I37184178562f6a29c4f87380106d1f0119046b35

7 years agoevas textblock: fix top/bottom valign tag reversed issue 69/126169/1
Youngbok Shin [Tue, 4 Apr 2017 09:36:41 +0000 (18:36 +0900)]
evas textblock: fix top/bottom valign tag reversed issue

Summary:
valign tag is for handling vertical align according to line's height and
text's height. But, it worked in a line which has only one font and
one font size, too. And the result was abnormal depending its font.
The line's height is [ascent + descent]. But, Textblock uses max ascent and
items's height(could be used max ascent + max descent according to its position)
when Textblock calculates item's yoff.
So, If Textblock calculate yoff based on line's height,
it should use only ascent and descent instead of max ascent and max descent.
@fix

Test Plan: Will attached in comment section.

Reviewers: raster, herdsman, jpeg, woohyun

Reviewed By: raster

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D4760

Change-Id: I05a552f230dc821d8d749fc05139967c7c82e81a

7 years agoEvas textblock: Apply scale factor to <linesize>, <linegap> formats 62/126162/1
Youngbok Shin [Mon, 11 Jul 2016 08:57:36 +0000 (17:57 +0900)]
Evas textblock: Apply scale factor to <linesize>, <linegap> formats

Summary:
Font size is scaled according to scale factor.
The linesize, linegap formats also have to be scaled properly.
@fix

Test Plan:
Test cases are included.
Run "make check"

Reviewers: woohyun, Jieun, tasn, herdsman

Reviewed By: tasn

Subscribers: raster, cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D3688

Change-Id: Ice06d3200017434ec2ee14215478f0a4d4c9f2f0

7 years agoRevert "efl: fix booting failure issue" 74/125674/2
Shinwoo Kim [Tue, 18 Apr 2017 10:14:22 +0000 (19:14 +0900)]
Revert "efl: fix booting failure issue"

This reverts commit df239644950339622d50fdc54ed6c33d201bb46c.

The root cause is fixed by following patch set.

https://review.tizen.org/gerrit/#/c/125523/

Change-Id: I050fa5cab670b037a2747508aa519ce9ddcc76fa

7 years agoChanged the parameter type in ecore_imf_context_prediction_hint_set() 85/125885/1
InHong Han [Wed, 19 Apr 2017 08:07:14 +0000 (17:07 +0900)]
Changed the parameter type in ecore_imf_context_prediction_hint_set()

Change-Id: I1ce5cb1fb17f481da877f3cae8aa336f7e555fda

7 years agoevas_gl: add creating a debug context 51/125851/3
Daekwang Ryu [Wed, 19 Apr 2017 06:07:27 +0000 (15:07 +0900)]
evas_gl: add creating a debug context

When users create a debug context,
have to check EGL_KHR_create_context extension with
evas_gl_string_query().

Change-Id: I1ebdca515e59c02dcaf315c638e4ee04723387c1

7 years agoevas-gl: Implement GLES 3.2 20/120720/8
Daekwang Ryu [Thu, 16 Feb 2017 05:35:44 +0000 (14:35 +0900)]
evas-gl: Implement GLES 3.2

add a wrapper function for glFramebufferTexture.

Change-Id: I7ab75d749148553c0559bfd042ca19ec5a937983

7 years agoefl: fix booting failure issue 71/125271/1 accepted/tizen/unified/20170419.163251 submit/tizen/20170414.092804 submit/tizen/20170418.072937 submit/tizen/20170418.085103
Youngbok Shin [Fri, 14 Apr 2017 09:12:49 +0000 (18:12 +0900)]
efl: fix booting failure issue

The ecore systemd module was removed from package to fix a SMACK issue
from the following commit. But, it caused booting failure issue in Tizen 4.0.
The SMACK issue and this patch should be handled again.

commit 108f99eda7245a7529578b5801c296973f4612f1
Author: Shinwoo Kim <cinoo.kim@samsung.com>
Date:   Fri Mar 17 18:09:12 2017 +0900

    ecore: not install systemd module.

    The systemd module is not used on the Tizen platform.
    Moreover, the dbus connection is created on launchpad side while it prepares an application
    before the application gets proper SMACK label. And this could be a security problem.

Change-Id: I0c35b5138bf02c5f87d52d858bdc993a7e40c6d4

7 years agoRevert "ecore_wl: added Ecore_Wl_Event_Window_Pre_Visibility_Change event" 93/125193/2 submit/tizen/20170414.060354
Woochan Lee [Fri, 14 Apr 2017 05:53:51 +0000 (14:53 +0900)]
Revert "ecore_wl: added Ecore_Wl_Event_Window_Pre_Visibility_Change event"

It has build dependency with other module.

This reverts commit e9b73972441d8697eb19ba558dde973f810984bd.

Change-Id: I063ca46b6e81815b737e3047aeecd13eb6510a57

7 years agoecore_wl: added Ecore_Wl_Event_Window_Pre_Visibility_Change event 63/125063/1
Gwanglim Lee [Thu, 13 Apr 2017 12:47:40 +0000 (21:47 +0900)]
ecore_wl: added Ecore_Wl_Event_Window_Pre_Visibility_Change event

The compositor sends this event to the client before the window
is shown on the screen. And it needs tizen_policy version 5 which
contains new pre_unobscured event for the tizen_visibility interface.

Change-Id: I50d0dc33b287987f1eaa71208cbd459c666892de

7 years agoRevert "ecore_drm: do not allocate the drm_dumb memory" 19/125019/1
SooChan Lim [Thu, 13 Apr 2017 09:16:39 +0000 (18:16 +0900)]
Revert "ecore_drm: do not allocate the drm_dumb memory"

This reverts commit 802392303aa0c4225d6356e33fe9b287329ff1ad.

Change-Id: I368d7435286336ed77ac8dbf2f071ad12111f5a4

7 years agoLicense: copy correct COPYING file for each pkg 31/121831/5
Sungtaek Hong [Wed, 29 Mar 2017 06:56:55 +0000 (15:56 +0900)]
License: copy correct COPYING file for each pkg

Change-Id: Ia03f19714bb484682ac77942ffd6c04059be3254
Signed-off-by: Sungtaek Hong <sth253.hong@samsung.com>
7 years agoecore_imf: Add ecore_imf_context_prediction_hint_set API 40/124440/6 submit/tizen/20170413.080524
InHong Han [Wed, 29 Mar 2017 06:34:32 +0000 (15:34 +0900)]
ecore_imf: Add ecore_imf_context_prediction_hint_set API

Change-Id: Ic3edb895e8c0ce95eff4672b85ef0540e90b0358

7 years agoefl.spec: add ecore-core.pc 66/124666/1
Bowon Ryu [Wed, 12 Apr 2017 04:44:37 +0000 (13:44 +0900)]
efl.spec: add ecore-core.pc

Change-Id: Ia8f2b01351586de5d49b5250cc8b9697fba837ec
Signed-off-by: Bowon Ryu <bowon.ryu@samsung.com>
7 years agoedje: use proper ellipsis API for textblock 24/124524/1
Youngbok Shin [Tue, 11 Apr 2017 12:14:12 +0000 (21:14 +0900)]
edje: use proper ellipsis API for textblock

@tizen_fix

Change-Id: I093006356a2580a120a9f975d3f818511a1b3483

7 years agoecore_wl: deleted unused variable. 05/124505/1
Hosang Kim [Tue, 11 Apr 2017 11:17:32 +0000 (20:17 +0900)]
ecore_wl: deleted unused variable.

Change-Id: If0adf542f0f7ba16a75f530471e08b5fa115dea8

7 years agoecore: Remove condition about timeout in animator with vsync 99/123099/3
jiin.moon [Mon, 3 Apr 2017 09:56:46 +0000 (18:56 +0900)]
ecore: Remove condition about timeout in animator with vsync

Change-Id: Ie8a68d1346e6b8641ca9dfb0af57ce750ea0cf69

7 years agoedje: Add workaround for misuses of clip_set 85/124185/1
jiin.moon [Mon, 10 Apr 2017 11:21:57 +0000 (20:21 +0900)]
edje: Add workaround for misuses of clip_set

Author:     Jean-Philippe Andre <jp.andre@samsung.com>
AuthorDate: Mon Apr 10 16:01:28 2017 +0900
Commit:     Jean-Philippe Andre <jp.andre@samsung.com>
CommitDate: Mon Apr 10 16:14:45 2017 +0900

    edje: Add workaround for misuses of clip_set

    An unfortunately very common misuse of clip is as follows:

    - Layout A is created (edje object / elm_layout)
    - Object B is swallowed inside A
    - Clipper C is set to clip B

    This is a invalid usage, as layout A takes control over the clip
    property of B (just like it does for geometry, visibility, color...).

    Since 75ec3a7338c9c2406d4 edje_recalc resets the clip at every calc
    loop, as it can change between states.

    In the past, edje_recalc did not reset the clip so anyone could
    (wrongly) swallow an object and then change its clip from C to modify
    its color, mask it, blend it, etc... Even though this was not proper
    use of the API, this is not very clearly documented, and since it
    worked, it has been (ab)used a lot already.

    The result now is that a clipper set from C will become visible
    as an opaque white rectangle covering the entire UI. Booh.

    This patch is a workaround that should have no impact on well
    written applications. As a bonus this avoids an extra call to
    clip_set() from edje.

    @fix

Change-Id: I30f18a34a1812afa54b980222a51c9988374d805

7 years agoevas filters: Fix a rare crash in text render (SW) 68/124168/1
Jean-Philippe Andre [Mon, 10 Apr 2017 07:56:14 +0000 (16:56 +0900)]
evas filters: Fix a rare crash in text render (SW)

There are reports of crashes when y < 0. This case seems
abnormal in case of filters, as I don't know how to reproduce it,
but it's happened.

Thanks Youngbok Shin for the report.

@fix

Change-Id: I75eda197ba035a9508395623bc9f23007b69857d
(cherry picked from commit 01320470baf234b61365272675e6d64624b8a400)

7 years agoevas_gl: skip DEPTH24_STENCIL8 for GLES 1.1 FBO 41/122741/3
Daekwang Ryu [Mon, 3 Apr 2017 07:43:03 +0000 (16:43 +0900)]
evas_gl: skip DEPTH24_STENCIL8 for GLES 1.1 FBO

cap_test is tested on GLES 2.0.
GLES 1.1 doesn't support DEPTH24_STENCIL8.

Change-Id: Idc3bb244e5c4f9c6a8a4d192fa95cfaf3de4b940

7 years ago evas_clip: fix bug _clipper_del_cb function unset current clipper 72/123772/1
Jiyoun Park [Fri, 7 Apr 2017 02:43:35 +0000 (11:43 +0900)]
   evas_clip: fix bug _clipper_del_cb function unset current clipper

   old_clipper = evas_object_clip_get(objA);
   evas_object_clip_unset(obj_A);
   evas_object_clip_set(obj_A, new_clipper);
   evas_object_del(old_clipper);

   when old_clipper deleted, _clipper_del_cb unset the current new_clipper of obj_A.

   opensource_commit: 258b42b47be4cda891c2c92a8be13b6cef199063
   Author: Jiyoun Park <jy0703.park@samsung.com>
   Date:   Fri Apr 7 11:35:55 2017 +0900

Change-Id: Ibc2f494f1d1243116b1ea15804a4222463ee90df