third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.h - Issue 2134793002: Remove the command buffer method glGetImageivCHROMIUM.

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: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.h

Issue 2134793002: Remove the command buffer method glGetImageivCHROMIUM. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge conflict. Created 4 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

« no previous file with comments | « services/ui/public/cpp/lib/command_buffer_client_impl.cc ('k') | third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.h

diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.h b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.h

index 108e35fadd06d7f39814b2ec6933d7f9c365ca5a..d3214d2421830ebe94270fc4b71f6aacdab63133 100644

--- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.h

+++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.h

@@ -154,7 +154,7 @@ private:

// All information associated with a CHROMIUM image.

struct ImageInfo {

ImageInfo() {}

- ImageInfo(GLuint imageId, GLuint textureId, GLint gpuMemoryBufferId);

+ ImageInfo(GLuint imageId, GLuint textureId);

// Whether this structure holds references to a CHROMIUM image.

bool empty();

@@ -164,9 +164,6 @@ private:

// The id of the texture bound to the CHROMIUM image.

GLuint m_textureId = 0;

- // The id of the GpuMemoryBuffer backing the texture and CHROMIUM image.

- GLint m_gpuMemoryBufferId = -1;

};

#endif // USE_IOSURFACE_FOR_2D_CANVAS