From 3a36b0b5075865a9b0283ea92eab9aece32a4b56 Mon Sep 17 00:00:00 2001 From: "sonal.g1@samsung.com" Date: Tue, 5 May 2015 13:20:01 +0530 Subject: [PATCH] [M40-Merge][WebRTC] Fix audio crash fix by passing ecore Display open There is some problem with ecore_x_display_get() in chromium-efl. So replacing the call with XOpenDisplay() as M34 does to fix the browser crash during webRTC audio enabled. Original gerrit: http://165.213.202.130/gerrit/#/c/75331/ Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=9217 Change-Id: I13fc3e56d56b0ffcf4d00c6c4295f56ee54b7909 Signed-off-by: sonal.g1@samsung.com --- tizen_src/chromium_impl/ui/gfx/x/x11_types_override.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tizen_src/chromium_impl/ui/gfx/x/x11_types_override.cc b/tizen_src/chromium_impl/ui/gfx/x/x11_types_override.cc index 53b50f7..6d5d14c 100644 --- a/tizen_src/chromium_impl/ui/gfx/x/x11_types_override.cc +++ b/tizen_src/chromium_impl/ui/gfx/x/x11_types_override.cc @@ -4,25 +4,20 @@ // Define OpenNewXDisplay and GetXDisplay to some unused name to be able to // replace it with our own implementation. -#define OpenNewXDisplay OpenNewXDisplayOverride #define GetXDisplay GetXDisplayOverride #include "ui/gfx/x/x11_types.cc" #undef GetXDisplay -#undef OpenNewXDisplay #include #include namespace gfx { -Display* OpenNewXDisplay() { - static Display* display = static_cast(ecore_x_display_get()); - return display; -} XDisplay* GetXDisplay() { - return OpenNewXDisplay(); + static Display* display = static_cast(ecore_x_display_get()); + return display; } } -- 2.7.4