zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete rtc_base/window.h.

Browse Source 
Bug: webrtc:6424
Change-Id: Iaed83b07dd469a9990f48fe41fcdff5e7493eb31
Reviewed-on: https://webrtc-review.googlesource.com/31480
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21194}
This commit is contained in:
Niels Möller
2017-12-08 15:57:38 +01:00
committed by Commit Bot
parent f7b1ed557e
commit 9a44f96ea7
5 changed files with 1 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/base/mediachannel.h
View File

@ -38,7 +38,7 @@
#include "rtc_base/networkroute.h"
#include "rtc_base/sigslot.h"
#include "rtc_base/socket.h"
#include "rtc_base/window.h"
#include "rtc_base/stringencode.h"
namespace rtc {

1
media/base/testutils.h
View File

@ -20,7 +20,6 @@
#include "rtc_base/arraysize.h"
#include "rtc_base/basictypes.h"
#include "rtc_base/sigslot.h"
#include "rtc_base/window.h"
namespace rtc {
class ByteBufferReader;

1
pc/channel.h
View File

@ -43,7 +43,6 @@
#include "rtc_base/criticalsection.h"
#include "rtc_base/network.h"
#include "rtc_base/sigslot.h"
#include "rtc_base/window.h"
namespace webrtc {
class AudioSinkInterface;

1
rtc_base/BUILD.gn
View File

@ -620,7 +620,6 @@ rtc_static_library("rtc_base_generic") {
"sslroots.h",
"transformadapter.cc",
"transformadapter.h",
"window.h",
]
if (is_win) {

78
rtc_base/window.h
View File

@ -1,78 +0,0 @@
/*
* Copyright 2004 The WebRTC Project Authors. All rights reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef RTC_BASE_WINDOW_H_
#define RTC_BASE_WINDOW_H_
#include <stdint.h>
#include "rtc_base/stringencode.h"
// Define platform specific window types.
#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
typedef unsigned long Window; // Avoid include <X11/Xlib.h>.
#elif defined(WEBRTC_WIN)
// We commonly include win32.h in webrtc/rtc_base so just include it here.
#include "rtc_base/win32.h" // Include HWND, HMONITOR.
#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
typedef unsigned int CGWindowID;
typedef unsigned int CGDirectDisplayID;
#endif
namespace rtc {
class WindowId {
public:
// Define WindowT for each platform.
#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
typedef Window WindowT;
#elif defined(WEBRTC_WIN)
typedef HWND WindowT;
#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
typedef CGWindowID WindowT;
#else
typedef unsigned int WindowT;
#endif
static WindowId Cast(uint64_t id) {
#if defined(WEBRTC_WIN)
return WindowId(reinterpret_cast<WindowId::WindowT>(id));
#else
return WindowId(static_cast<WindowId::WindowT>(id));
#endif
}
static uint64_t Format(const WindowT& id) {
#if defined(WEBRTC_WIN)
return static_cast<uint64_t>(reinterpret_cast<uintptr_t>(id));
#else
return static_cast<uint64_t>(id);
#endif
}
WindowId() : id_(0) {}
WindowId(const WindowT& id) : id_(id) {} // NOLINT
const WindowT& id() const { return id_; }
bool IsValid() const { return id_ != 0; }
bool Equals(const WindowId& other) const {
return id_ == other.id();
}
private:
WindowT id_;
};
inline std::string ToString(const WindowId& window) {
return ToString(window.id());
}
} // namespace rtc
#endif // RTC_BASE_WINDOW_H_