From 04d33ae90082a9a8f901554d3c24075cdf6d4f05 Mon Sep 17 00:00:00 2001
From: Arnaud Renevier <a.renevier@samsung.com>
Date: Mon, 18 May 2015 14:27:13 -0700
Subject: [PATCH] Remove X11EventSourceEfl

PlatformEventSource::CreateDefault() is called by ozone. So we don't
need to call it anymore ourselves.

Also with ozone, it's the platform event source stub that is used.

So that means we can remove X11EventSourceEfl.
Reviewed by: Antonio Gomes, DaeHyun Ko, SeungSeop Park

Change-Id: Ic9c0552309c1c0521ddbca8720cb5cb5c4c46106
Signed-off-by: Arnaud Renevier <a.renevier@samsung.com>
---
 .../browser/web_contents/web_contents_view_efl.cc  | 13 -----------
 .../ui/events/platform/x11/x11_event_source_efl.cc | 25 ----------------------
 tizen_src/chromium_impl/ui/ui_efl.gypi             | 10 ---------
 3 files changed, 48 deletions(-)
 delete mode 100644 tizen_src/chromium_impl/ui/events/platform/x11/x11_event_source_efl.cc

diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
index be2ea0a..338cb26 100644
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
@@ -22,30 +22,17 @@
 #include "content/public/browser/web_contents_view_efl_delegate.h"
 #include "efl/window_factory.h"
 #include "ui/events/event_switches.h"
-#include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gl/gl_shared_context_efl.h"
 
 namespace content {
 
-namespace {
-
-scoped_ptr<ui::PlatformEventSource> g_event_source;
-
-} // namespace
-
 WebContentsView* CreateWebContentsView(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
   WebContentsViewEfl* view = new WebContentsViewEfl(web_contents, delegate);
   *render_view_host_delegate_view = view;
-
-  if (!ui::PlatformEventSource::GetInstance()) {
-    DCHECK(!g_event_source);
-    g_event_source = ui::PlatformEventSource::CreateDefault();
-  }
-
   return view;
 }
 
diff --git a/tizen_src/chromium_impl/ui/events/platform/x11/x11_event_source_efl.cc b/tizen_src/chromium_impl/ui/events/platform/x11/x11_event_source_efl.cc
deleted file mode 100644
index 8041344..0000000
--- a/tizen_src/chromium_impl/ui/events/platform/x11/x11_event_source_efl.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2014 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/events/platform/x11/x11_event_source.h"
-
-#include <X11/Xlib.h>
-
-namespace ui {
-
-// Dummy Efl X11 event source to replace glib/libevent sources that were
-// stealing X11 events from efl.
-class X11EventSourceEfl : public X11EventSource {
- public:
-  explicit X11EventSourceEfl(XDisplay* display)
-      : X11EventSource(display) {
-  }
-
-};
-scoped_ptr<PlatformEventSource> PlatformEventSource::CreateDefault() {
-  return scoped_ptr<PlatformEventSource>(
-      new X11EventSourceEfl(gfx::GetXDisplay()));
-}
-
-} // namespace ui
diff --git a/tizen_src/chromium_impl/ui/ui_efl.gypi b/tizen_src/chromium_impl/ui/ui_efl.gypi
index 9b5a803..8469437 100644
--- a/tizen_src/chromium_impl/ui/ui_efl.gypi
+++ b/tizen_src/chromium_impl/ui/ui_efl.gypi
@@ -102,16 +102,6 @@
         ],
       }],
 
-      ['_target_name=="x11_events_platform"', {
-        'sources': [
-          'events/platform/x11/x11_event_source_efl.cc',
-        ],
-        'sources/': [
-          ['exclude', 'x11_event_source_glib\\.cc$'],
-          ['exclude', 'x11_event_source_libevent\\.cc$'],
-        ],
-      }],
-
       ['_target_name=="gesture_detection"', {
         'sources/': [
           ['exclude', 'gesture_detection/gesture_configuration_default\\.cc$']
-- 
2.7.4