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

Side by Side Diff: ui/gl/gl_image_egl.cc

Issue 2014223002: Follow-up fixes to changing namespace gfx to gl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 6 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
« no previous file with comments | « ui/gl/gl_helper.cc ('k') | ui/gl/gl_image_glx.cc » ('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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_image_egl.h" 5 #include "ui/gl/gl_image_egl.h"
6 6
7 #include "ui/gl/egl_util.h" 7 #include "ui/gl/egl_util.h"
8 #include "ui/gl/gl_surface_egl.h" 8 #include "ui/gl/gl_surface_egl.h"
9 9
10 namespace gl { 10 namespace gl {
11 11
12 GLImageEGL::GLImageEGL(const gfx::Size& size) 12 GLImageEGL::GLImageEGL(const gfx::Size& size)
13 : egl_image_(EGL_NO_IMAGE_KHR), size_(size) {} 13 : egl_image_(EGL_NO_IMAGE_KHR), size_(size) {}
14 14
15 GLImageEGL::~GLImageEGL() { 15 GLImageEGL::~GLImageEGL() {
16 DCHECK(thread_checker_.CalledOnValidThread()); 16 DCHECK(thread_checker_.CalledOnValidThread());
17 DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_); 17 DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_);
18 } 18 }
19 19
20 bool GLImageEGL::Initialize(EGLenum target, 20 bool GLImageEGL::Initialize(EGLenum target,
21 EGLClientBuffer buffer, 21 EGLClientBuffer buffer,
22 const EGLint* attrs) { 22 const EGLint* attrs) {
23 DCHECK(thread_checker_.CalledOnValidThread()); 23 DCHECK(thread_checker_.CalledOnValidThread());
24 DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_); 24 DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_);
25 egl_image_ = eglCreateImageKHR(gl::GLSurfaceEGL::GetHardwareDisplay(), 25 egl_image_ = eglCreateImageKHR(GLSurfaceEGL::GetHardwareDisplay(),
26 EGL_NO_CONTEXT, target, buffer, attrs); 26 EGL_NO_CONTEXT, target, buffer, attrs);
27 if (egl_image_ == EGL_NO_IMAGE_KHR) { 27 if (egl_image_ == EGL_NO_IMAGE_KHR) {
28 DLOG(ERROR) << "Error creating EGLImage: " << ui::GetLastEGLErrorString(); 28 DLOG(ERROR) << "Error creating EGLImage: " << ui::GetLastEGLErrorString();
29 return false; 29 return false;
30 } 30 }
31 31
32 return true; 32 return true;
33 } 33 }
34 34
35 void GLImageEGL::Destroy(bool have_context) { 35 void GLImageEGL::Destroy(bool have_context) {
36 DCHECK(thread_checker_.CalledOnValidThread()); 36 DCHECK(thread_checker_.CalledOnValidThread());
37 if (egl_image_ != EGL_NO_IMAGE_KHR) { 37 if (egl_image_ != EGL_NO_IMAGE_KHR) {
38 EGLBoolean result = 38 EGLBoolean result =
39 eglDestroyImageKHR(gl::GLSurfaceEGL::GetHardwareDisplay(), egl_image_); 39 eglDestroyImageKHR(GLSurfaceEGL::GetHardwareDisplay(), egl_image_);
40 if (result == EGL_FALSE) { 40 if (result == EGL_FALSE) {
41 DLOG(ERROR) << "Error destroying EGLImage: " 41 DLOG(ERROR) << "Error destroying EGLImage: "
42 << ui::GetLastEGLErrorString(); 42 << ui::GetLastEGLErrorString();
43 } 43 }
44 egl_image_ = EGL_NO_IMAGE_KHR; 44 egl_image_ = EGL_NO_IMAGE_KHR;
45 } 45 }
46 } 46 }
47 47
48 gfx::Size GLImageEGL::GetSize() { 48 gfx::Size GLImageEGL::GetSize() {
49 return size_; 49 return size_;
(...skipping 23 matching lines...) Expand all
73 73
74 bool GLImageEGL::ScheduleOverlayPlane(gfx::AcceleratedWidget widget, 74 bool GLImageEGL::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
75 int z_order, 75 int z_order,
76 gfx::OverlayTransform transform, 76 gfx::OverlayTransform transform,
77 const gfx::Rect& bounds_rect, 77 const gfx::Rect& bounds_rect,
78 const gfx::RectF& crop_rect) { 78 const gfx::RectF& crop_rect) {
79 return false; 79 return false;
80 } 80 }
81 81
82 } // namespace gl 82 } // namespace gl
OLDNEW
« no previous file with comments | « ui/gl/gl_helper.cc ('k') | ui/gl/gl_image_glx.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698