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

Unified Diff: ui/gl/gl_image_surface_texture.cc

Issue 1418483003: Revert of ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 | « ui/gl/gl_image_surface_texture.h ('k') | ui/gl/gl_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_surface_texture.cc
diff --git a/ui/gl/gl_image_surface_texture.cc b/ui/gl/gl_image_surface_texture.cc
index 6ad3667221be59e72f0395bf4a6143e963f6653e..910551da3a40ecb63239bfa5689c3fb72079661d 100644
--- a/ui/gl/gl_image_surface_texture.cc
+++ b/ui/gl/gl_image_surface_texture.cc
@@ -9,8 +9,9 @@
namespace gfx {
-GLImageSurfaceTexture::GLImageSurfaceTexture(const Size& size)
- : size_(size), texture_id_(0) {}
+GLImageSurfaceTexture::GLImageSurfaceTexture(const gfx::Size& size)
+ : size_(size), texture_id_(0) {
+}
GLImageSurfaceTexture::~GLImageSurfaceTexture() {
DCHECK(thread_checker_.CalledOnValidThread());
@@ -31,9 +32,7 @@
texture_id_ = 0;
}
-Size GLImageSurfaceTexture::GetSize() {
- return size_;
-}
+gfx::Size GLImageSurfaceTexture::GetSize() { return size_; }
unsigned GLImageSurfaceTexture::GetInternalFormat() { return GL_RGBA; }
@@ -79,17 +78,13 @@
return true;
}
-bool GLImageSurfaceTexture::CopyTexImage(unsigned target) {
- return false;
-}
-
bool GLImageSurfaceTexture::CopyTexSubImage(unsigned target,
const Point& offset,
const Rect& rect) {
return false;
}
-bool GLImageSurfaceTexture::ScheduleOverlayPlane(AcceleratedWidget widget,
+bool GLImageSurfaceTexture::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
int z_order,
OverlayTransform transform,
const Rect& bounds_rect,
« no previous file with comments | « ui/gl/gl_image_surface_texture.h ('k') | ui/gl/gl_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698