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

Unified Diff: ui/gfx/x/x11_types.cc

Issue 2163623003: Linux: Build with xcb (Reland) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added symbol references from ui/gfx/x Created 4 years, 4 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
« chrome/installer/linux/debian/expected_deps_x64 ('K') | « ui/gfx/x/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/x/x11_types.cc
diff --git a/ui/gfx/x/x11_types.cc b/ui/gfx/x/x11_types.cc
index 7540f8ae2887cbcdcebf09982790a8a8ba797314..cb8b630b9d72de1e7a34eb6d7967aefcd8e4d24c 100644
--- a/ui/gfx/x/x11_types.cc
+++ b/ui/gfx/x/x11_types.cc
@@ -5,6 +5,8 @@
#include "ui/gfx/x/x11_types.h"
#include <X11/Xlib.h>
+#include <xcb/xcb.h>
+#include <X11/Xlib-xcb.h>
#include "base/command_line.h"
#include "base/message_loop/message_loop.h"
@@ -14,6 +16,10 @@
namespace gfx {
XDisplay* GetXDisplay() {
+ // TODO(thomasanderson): remove these symbol references once libxcb and
+ // libX11-xcb are used
+ asm volatile("" ::"r"(xcb_connect));
Tom (Use chromium acct) 2016/08/03 19:42:16 Couldn't figure out a better way to do this
sadrul 2016/08/04 15:45:29 What does this do?
Tom (Use chromium acct) 2016/08/04 16:32:53 References symbols so we link against the shared l
+ asm volatile("" ::"r"(XGetXCBConnection));
static XDisplay* display = NULL;
if (!display)
display = OpenNewXDisplay();
@@ -173,4 +179,3 @@ void PutARGBImage(XDisplay* display,
}
} // namespace gfx
-
Tom (Use chromium acct) 2016/08/03 19:42:16 emacs auto-saves the file like this
« chrome/installer/linux/debian/expected_deps_x64 ('K') | « ui/gfx/x/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698