| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/gl/gl_surface.h" | 5 #include "ui/gl/gl_surface.h" |
| 6 | 6 |
| 7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 } | 334 } |
| 335 case kGLImplementationMockGL: | 335 case kGLImplementationMockGL: |
| 336 return new GLSurfaceStub; | 336 return new GLSurfaceStub; |
| 337 default: | 337 default: |
| 338 NOTREACHED(); | 338 NOTREACHED(); |
| 339 return NULL; | 339 return NULL; |
| 340 } | 340 } |
| 341 } | 341 } |
| 342 | 342 |
| 343 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() { | 343 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() { |
| 344 return gfx::GetXDisplay(); | 344 return XDisplayToEGLNativeDisplay(gfx::GetXDisplay()); |
| 345 } | 345 } |
| 346 | 346 |
| 347 } // namespace gfx | 347 } // namespace gfx |
| OLD | NEW |