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

Side by Side Diff: ui/gfx/gl/gl_surface_egl.cc

Issue 9160012: Change PluginWindowHandle to AcceleratedWidget in ui/gfx/gl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops mac Created 8 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/gl/gl_surface_egl.h ('k') | ui/gfx/gl/gl_surface_glx.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/gfx/gl/gl_surface_egl.h" 5 #include "ui/gfx/gl/gl_surface_egl.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.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.h" 10 #include "base/message_loop.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 172
173 EGLDisplay GLSurfaceEGL::GetSoftwareDisplay() { 173 EGLDisplay GLSurfaceEGL::GetSoftwareDisplay() {
174 return g_software_display; 174 return g_software_display;
175 } 175 }
176 176
177 EGLNativeDisplayType GLSurfaceEGL::GetNativeDisplay() { 177 EGLNativeDisplayType GLSurfaceEGL::GetNativeDisplay() {
178 return g_native_display; 178 return g_native_display;
179 } 179 }
180 180
181 NativeViewGLSurfaceEGL::NativeViewGLSurfaceEGL(bool software, 181 NativeViewGLSurfaceEGL::NativeViewGLSurfaceEGL(bool software,
182 gfx::PluginWindowHandle window) 182 gfx::AcceleratedWidget window)
183 : window_(window), 183 : window_(window),
184 surface_(NULL), 184 surface_(NULL),
185 supports_post_sub_buffer_(false) 185 supports_post_sub_buffer_(false)
186 { 186 {
187 software_ = software; 187 software_ = software;
188 } 188 }
189 189
190 NativeViewGLSurfaceEGL::~NativeViewGLSurfaceEGL() { 190 NativeViewGLSurfaceEGL::~NativeViewGLSurfaceEGL() {
191 Destroy(); 191 Destroy();
192 } 192 }
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE, 400 EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE,
401 &handle)) { 401 &handle)) {
402 return NULL; 402 return NULL;
403 } 403 }
404 404
405 return handle; 405 return handle;
406 #endif 406 #endif
407 } 407 }
408 408
409 } // namespace gfx 409 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/gl/gl_surface_egl.h ('k') | ui/gfx/gl/gl_surface_glx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698