Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(966)

Unified Diff: ui/events/platform/x11/x11_event_source_glib.cc

Issue 853133002: Remove glib from the mojo build. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Also use_glib=false on Chromeos Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/platform/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/platform/x11/x11_event_source_glib.cc
diff --git a/ui/events/platform/x11/x11_event_source_glib.cc b/ui/events/platform/x11/x11_event_source_glib.cc
deleted file mode 100644
index 95044226b50dce6213eada078ea09001a252a7f2..0000000000000000000000000000000000000000
--- a/ui/events/platform/x11/x11_event_source_glib.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2014 The Chromium Authors. 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 <glib.h>
-#include <X11/Xlib.h>
-
-namespace ui {
-
-namespace {
-
-struct GLibX11Source : public GSource {
- // Note: The GLibX11Source is created and destroyed by GLib. So its
- // constructor/destructor may or may not get called.
- XDisplay* display;
- GPollFD* poll_fd;
-};
-
-gboolean XSourcePrepare(GSource* source, gint* timeout_ms) {
- GLibX11Source* gxsource = static_cast<GLibX11Source*>(source);
- if (XPending(gxsource->display))
- *timeout_ms = 0;
- else
- *timeout_ms = -1;
- return FALSE;
-}
-
-gboolean XSourceCheck(GSource* source) {
- GLibX11Source* gxsource = static_cast<GLibX11Source*>(source);
- return XPending(gxsource->display);
-}
-
-gboolean XSourceDispatch(GSource* source,
- GSourceFunc unused_func,
- gpointer data) {
- X11EventSource* x11_source = static_cast<X11EventSource*>(data);
- x11_source->DispatchXEvents();
- return TRUE;
-}
-
-GSourceFuncs XSourceFuncs = {
- XSourcePrepare,
- XSourceCheck,
- XSourceDispatch,
- NULL
-};
-
-class X11EventSourceGlib : public X11EventSource {
- public:
- explicit X11EventSourceGlib(XDisplay* display)
- : X11EventSource(display),
- x_source_(NULL) {
- InitXSource(ConnectionNumber(display));
- }
-
- virtual ~X11EventSourceGlib() {
- g_source_destroy(x_source_);
- g_source_unref(x_source_);
- }
-
- private:
- void InitXSource(int fd) {
- CHECK(!x_source_);
- CHECK(display()) << "Unable to get connection to X server";
-
- x_poll_.reset(new GPollFD());
- x_poll_->fd = fd;
- x_poll_->events = G_IO_IN;
- x_poll_->revents = 0;
-
- GLibX11Source* glib_x_source = static_cast<GLibX11Source*>
- (g_source_new(&XSourceFuncs, sizeof(GLibX11Source)));
- glib_x_source->display = display();
- glib_x_source->poll_fd = x_poll_.get();
-
- x_source_ = glib_x_source;
- g_source_add_poll(x_source_, x_poll_.get());
- g_source_set_can_recurse(x_source_, TRUE);
- g_source_set_callback(x_source_, NULL, this, NULL);
- g_source_attach(x_source_, g_main_context_default());
- }
-
- // The GLib event source for X events.
- GSource* x_source_;
-
- // The poll attached to |x_source_|.
- scoped_ptr<GPollFD> x_poll_;
-
- DISALLOW_COPY_AND_ASSIGN(X11EventSourceGlib);
-};
-
-} // namespace
-
-scoped_ptr<PlatformEventSource> PlatformEventSource::CreateDefault() {
- return scoped_ptr<PlatformEventSource>(
- new X11EventSourceGlib(gfx::GetXDisplay()));
-}
-
-} // namespace ui
« no previous file with comments | « ui/events/platform/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698