gpu/gles2_conform_support/egl/display.h - Issue 331723003: gpu: Remove Create/DeleteImage IPC by adding an X11_PIXMAP_BUFFER GpuMemoryBuffer type.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/gles2_conform_support/egl/display.h

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: crown of aragorn 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: gpu/gles2_conform_support/egl/display.h

diff --git a/gpu/gles2_conform_support/egl/display.h b/gpu/gles2_conform_support/egl/display.h

index a16d56838b3ccdcdb93d4d3475d17bdc4f0fe26f..5ca1ba0b2bd4293f9cb2e7835c8653c5095eb1ef 100644

--- a/gpu/gles2_conform_support/egl/display.h

+++ b/gpu/gles2_conform_support/egl/display.h

@@ -12,7 +12,6 @@

#include "gpu/command_buffer/client/gpu_control.h"

#include "gpu/command_buffer/service/command_buffer_service.h"

#include "gpu/command_buffer/service/gles2_cmd_decoder.h"

-#include "gpu/command_buffer/service/gpu_control_service.h"

#include "gpu/command_buffer/service/gpu_scheduler.h"

#include "ui/gfx/native_widget_types.h"

#include "ui/gl/gl_context.h"

@@ -105,7 +104,6 @@ class Display : private gpu::GpuControl {

scoped_ptr<gpu::CommandBufferService> command_buffer_;

scoped_ptr<gpu::GpuScheduler> gpu_scheduler_;

scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;

- scoped_ptr<gpu::GpuControlService> gpu_control_service_;

scoped_refptr<gfx::GLContext> gl_context_;

scoped_refptr<gfx::GLSurface> gl_surface_;

scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_cmd_helper_;

« gpu/command_buffer/tests/gl_manager.cc ('K') | « gpu/command_buffer_service.gypi ('k') | gpu/gles2_conform_support/egl/display.cc » ('j') | ui/gfx/gpu_memory_buffer.h » ('J')