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

Unified Diff: content/common/gpu/gpu_memory_buffer_factory_x11.cc

Issue 331723003: gpu: Remove Create/DeleteImage IPC by adding an X11_PIXMAP_BUFFER GpuMemoryBuffer type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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: content/common/gpu/gpu_memory_buffer_factory_x11.cc
diff --git a/content/common/gpu/gpu_memory_buffer_factory_x11.cc b/content/common/gpu/gpu_memory_buffer_factory_x11.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e98f084dc3a9752366c8d173fa69ef0917950949
--- /dev/null
+++ b/content/common/gpu/gpu_memory_buffer_factory_x11.cc
@@ -0,0 +1,83 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/common/gpu/gpu_memory_buffer_factory.h"
+
+#include "base/logging.h"
+#include "content/common/gpu/gpu_memory_buffer_factory_x11_pixmap.h"
+#include "ui/gl/gl_image.h"
+#include "ui/gl/gl_image_shared_memory.h"
+
+namespace content {
+namespace {
+
+class GpuMemoryBufferFactoryImpl : public GpuMemoryBufferFactory {
+ public:
+ // Overridden from GpuMemoryBufferFactory:
+ virtual gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
+ const gfx::GpuMemoryBufferHandle& handle,
+ const gfx::Size& size,
+ unsigned internalformat,
+ unsigned usage) OVERRIDE {
+ switch (handle.type) {
+ case gfx::X11_PIXMAP_BUFFER:
+ x11_pixmap_factory_.CreateGpuMemoryBuffer(handle.global_id,
+ handle.pixmap);
+ return handle;
+ default:
+ NOTREACHED();
+ return gfx::GpuMemoryBufferHandle();
+ }
+ }
+ virtual void DestroyGpuMemoryBuffer(
+ const gfx::GpuMemoryBufferHandle& handle) OVERRIDE {
+ switch (handle.type) {
+ case gfx::X11_PIXMAP_BUFFER:
+ x11_pixmap_factory_.DestroyGpuMemoryBuffer(handle.global_id);
+ break;
+ default:
+ NOTREACHED();
+ break;
+ }
+ }
+ virtual scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
+ const gfx::GpuMemoryBufferHandle& handle,
+ const gfx::Size& size,
+ unsigned internalformat,
+ int client_id) OVERRIDE {
+ switch (handle.type) {
+ case gfx::SHARED_MEMORY_BUFFER: {
+ scoped_refptr<gfx::GLImageSharedMemory> image(
+ new gfx::GLImageSharedMemory(size, internalformat));
+ if (!image->Initialize(handle))
+ return NULL;
+
+ return image;
+ }
+ case gfx::X11_PIXMAP_BUFFER:
+ // Verify that client is the owner of the buffer we're about to acquire.
+ if (handle.global_id.secondary_id != client_id)
+ return scoped_refptr<gfx::GLImage>();
+
+ return x11_pixmap_factory_.AcquireImageForGpuMemoryBuffer(
+ handle.global_id, size, internalformat);
+ default:
+ NOTREACHED();
+ return scoped_refptr<gfx::GLImage>();
+ }
+ }
+
+ private:
+ GpuMemoryBufferFactoryX11Pixmap x11_pixmap_factory_;
+};
+
+} // namespace
+
+// static
+scoped_ptr<GpuMemoryBufferFactory> GpuMemoryBufferFactory::Create() {
+ return make_scoped_ptr<GpuMemoryBufferFactory>(
+ new GpuMemoryBufferFactoryImpl);
+}
+
+} // namespace content
« no previous file with comments | « content/common/gpu/gpu_memory_buffer_factory_win.cc ('k') | content/common/gpu/gpu_memory_buffer_factory_x11_pixmap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698