Reformat the WebRTC code base
Running clang-format with chromium's style guide. The goal is n-fold: * providing consistency and readability (that's what code guidelines are for) * preventing noise with presubmit checks and git cl format * building on the previous point: making it easier to automatically fix format issues * you name it Please consider using git-hyper-blame to ignore this commit. Bug: webrtc:9340 Change-Id: I694567c4cdf8cee2860958cfe82bfaf25848bb87 Reviewed-on: https://webrtc-review.googlesource.com/81185 Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23660}
This commit is contained in:
@ -38,15 +38,15 @@ class CustomSocketServer : public rtc::PhysicalSocketServer {
|
||||
// different thread. Alternatively we could look at merging the two loops
|
||||
// by implementing a dispatcher for the socket server and/or use
|
||||
// g_main_context_set_poll_func.
|
||||
while (gtk_events_pending())
|
||||
gtk_main_iteration();
|
||||
while (gtk_events_pending())
|
||||
gtk_main_iteration();
|
||||
|
||||
if (!wnd_->IsWindow() && !conductor_->connection_active() &&
|
||||
client_ != NULL && !client_->is_connected()) {
|
||||
message_queue_->Quit();
|
||||
}
|
||||
return rtc::PhysicalSocketServer::Wait(0/*cms == -1 ? 1 : cms*/,
|
||||
process_io);
|
||||
return rtc::PhysicalSocketServer::Wait(0 /*cms == -1 ? 1 : cms*/,
|
||||
process_io);
|
||||
}
|
||||
|
||||
protected:
|
||||
@ -58,15 +58,15 @@ class CustomSocketServer : public rtc::PhysicalSocketServer {
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
gtk_init(&argc, &argv);
|
||||
// g_type_init API is deprecated (and does nothing) since glib 2.35.0, see:
|
||||
// https://mail.gnome.org/archives/commits-list/2012-November/msg07809.html
|
||||
// g_type_init API is deprecated (and does nothing) since glib 2.35.0, see:
|
||||
// https://mail.gnome.org/archives/commits-list/2012-November/msg07809.html
|
||||
#if !GLIB_CHECK_VERSION(2, 35, 0)
|
||||
g_type_init();
|
||||
g_type_init();
|
||||
#endif
|
||||
// g_thread_init API is deprecated since glib 2.31.0, see release note:
|
||||
// http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.html
|
||||
// g_thread_init API is deprecated since glib 2.31.0, see release note:
|
||||
// http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.html
|
||||
#if !GLIB_CHECK_VERSION(2, 31, 0)
|
||||
g_thread_init(NULL);
|
||||
g_thread_init(NULL);
|
||||
#endif
|
||||
|
||||
rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, true);
|
||||
|
||||
Reference in New Issue
Block a user