зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1557271 - [Wayland] Merge nsWaylandDisplayShutdown.h and nsWaylandDisplay.h, r=jhorak
Differential Revision: https://phabricator.services.mozilla.com/D33921 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
5d9ce4b333
Коммит
0f49145143
|
@ -73,7 +73,7 @@
|
|||
#endif
|
||||
|
||||
#ifdef MOZ_WAYLAND
|
||||
# include "mozilla/widget/nsWaylandDisplayShutdown.h"
|
||||
# include "mozilla/widget/nsWaylandDisplay.h"
|
||||
#endif
|
||||
|
||||
#include "nsGkAtoms.h"
|
||||
|
|
|
@ -107,6 +107,7 @@ class nsWaylandDisplay {
|
|||
};
|
||||
|
||||
void WaylandDispatchDisplays();
|
||||
void WaylandDisplayShutdown();
|
||||
nsWaylandDisplay* WaylandDisplayGet(GdkDisplay* aGdkDisplay = nullptr);
|
||||
|
||||
#ifdef HAVE_LIBDRM
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim:expandtab:shiftwidth=4:tabstop=4:
|
||||
*/
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef __MOZ_WAYLAND_DISPLAY_SHUTDOWN_H__
|
||||
#define __MOZ_WAYLAND_DISPLAY_SHUTDOWN_H__
|
||||
|
||||
namespace mozilla {
|
||||
namespace widget {
|
||||
|
||||
void WaylandDisplayShutdown();
|
||||
|
||||
} // namespace widget
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // __MOZ_WAYLAND_DISPLAY_SHUTDOWN_H__
|
Загрузка…
Ссылка в новой задаче