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

Unified Diff: app/gfx/gl/gl_context_linux.cc

Issue 6340004: Linux: --single-process with GPU acceleration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try rebasing off of ToT. Created 9 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 | « app/gfx/gl/gl_context_egl.cc ('k') | chrome/browser/gpu_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/gfx/gl/gl_context_linux.cc
diff --git a/app/gfx/gl/gl_context_linux.cc b/app/gfx/gl/gl_context_linux.cc
index 0f28a1d3f6a48fe5d2a6a6208212a750cd142be4..8b963fc2a0ef23bf2a47748b47d360bbbe7193c0 100644
--- a/app/gfx/gl/gl_context_linux.cc
+++ b/app/gfx/gl/gl_context_linux.cc
@@ -28,16 +28,14 @@ Display* GetXDisplayHelper() {
static Display* display = NULL;
if (!display) {
- if (x11_util::XDisplayExists()) {
- display = x11_util::GetXDisplay();
- } else {
- display = XOpenDisplay(NULL);
- }
+ display = XOpenDisplay(NULL);
+ CHECK(display);
}
+
return display;
}
-}
+} // namespace
namespace gfx {
« no previous file with comments | « app/gfx/gl/gl_context_egl.cc ('k') | chrome/browser/gpu_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698