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

Unified Diff: ui/gl/gl_image_shared_memory.cc

Issue 1421903006: ui/gl: Move GLImage into gl namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ozone demo 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
Index: ui/gl/gl_image_shared_memory.cc
diff --git a/ui/gl/gl_image_shared_memory.cc b/ui/gl/gl_image_shared_memory.cc
index aa86600a039ac99e93636cf4537f9f4263dee918..6ea5553229e825b7c509afc9fd33aa08e27bfc50 100644
--- a/ui/gl/gl_image_shared_memory.cc
+++ b/ui/gl/gl_image_shared_memory.cc
@@ -14,9 +14,9 @@
#include "base/trace_event/process_memory_dump.h"
#include "ui/gfx/buffer_format_util.h"
-namespace gfx {
+namespace gl {
-GLImageSharedMemory::GLImageSharedMemory(const Size& size,
+GLImageSharedMemory::GLImageSharedMemory(const gfx::Size& size,
unsigned internalformat)
: GLImageMemory(size, internalformat) {}
@@ -24,10 +24,11 @@ GLImageSharedMemory::~GLImageSharedMemory() {
DCHECK(!shared_memory_);
}
-bool GLImageSharedMemory::Initialize(const base::SharedMemoryHandle& handle,
- GenericSharedMemoryId shared_memory_id,
- BufferFormat format,
- size_t offset) {
+bool GLImageSharedMemory::Initialize(
+ const base::SharedMemoryHandle& handle,
+ gfx::GenericSharedMemoryId shared_memory_id,
+ gfx::BufferFormat format,
+ size_t offset) {
size_t size_in_bytes;
if (!BufferSizeForBufferFormatChecked(GetSize(), format, &size_in_bytes))
return false;
@@ -104,4 +105,4 @@ void GLImageSharedMemory::OnMemoryDump(
pmd->AddOwnershipEdge(dump->guid(), guid);
}
-} // namespace gfx
+} // namespace gl

Powered by Google App Engine
This is Rietveld 408576698