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

Unified Diff: ui/gl/gl_image_io_surface.mm

Issue 1390143002: Revert of Re-land: ui: Add GLImage unit test framework. (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_io_surface.h ('k') | ui/gl/gl_image_ref_counted_memory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_io_surface.mm
diff --git a/ui/gl/gl_image_io_surface.mm b/ui/gl/gl_image_io_surface.mm
index 3f4964e85438c4e4e6d1e2388ce8bf31e1e01e86..211226a27b373701bda3b7375637823e1c741f66 100644
--- a/ui/gl/gl_image_io_surface.mm
+++ b/ui/gl/gl_image_io_surface.mm
@@ -138,9 +138,11 @@
} // namespace
-GLImageIOSurface::GLImageIOSurface(const gfx::Size& size,
+GLImageIOSurface::GLImageIOSurface(gfx::GenericSharedMemoryId io_surface_id,
+ const gfx::Size& size,
unsigned internalformat)
- : size_(size),
+ : io_surface_id_(io_surface_id),
+ size_(size),
internalformat_(internalformat),
format_(BufferFormat::RGBA_8888) {}
@@ -150,7 +152,6 @@
}
bool GLImageIOSurface::Initialize(IOSurfaceRef io_surface,
- gfx::GenericSharedMemoryId io_surface_id,
BufferFormat format) {
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(!io_surface_);
@@ -167,7 +168,6 @@
format_ = format;
io_surface_.reset(io_surface, base::scoped_policy::RETAIN);
- io_surface_id_ = io_surface_id;
return true;
}
« no previous file with comments | « ui/gl/gl_image_io_surface.h ('k') | ui/gl/gl_image_ref_counted_memory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698