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

Unified Diff: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp

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
Index: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
index e85fa09048e3ad909aa8b839736e0120b403451f..89fb58fe9d6a34206159b85bcc41bddd35160804 100644
--- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
+++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
@@ -221,7 +221,6 @@ bool Canvas2DLayerBridge::prepareIOSurfaceMailboxFromImage(SkImage* image, WebEx
gl->Flush();
gl->GenSyncTokenCHROMIUM(fenceSync, info.m_mailbox.syncToken);
info.m_mailbox.validSyncToken = true;
- info.m_mailbox.gpuMemoryBufferId = imageInfo.m_gpuMemoryBufferId;
info.m_imageInfo = imageInfo;
*outMailbox = info.m_mailbox;
@@ -261,11 +260,7 @@ Canvas2DLayerBridge::ImageInfo Canvas2DLayerBridge::createIOSurfaceBackedTexture
gl->TexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
gl->BindTexImage2DCHROMIUM(target, imageId);
- GLint gpuMemoryBufferId = -1;
- gl->GetImageivCHROMIUM(imageId, GC3D_GPU_MEMORY_BUFFER_ID, &gpuMemoryBufferId);
- DCHECK_NE(-1, gpuMemoryBufferId);
-
- return Canvas2DLayerBridge::ImageInfo(imageId, textureId, gpuMemoryBufferId);
+ return Canvas2DLayerBridge::ImageInfo(imageId, textureId);
}
void Canvas2DLayerBridge::deleteCHROMIUMImage(ImageInfo info)
@@ -1002,14 +997,10 @@ void Canvas2DLayerBridge::willOverwriteCanvas()
}
#if USE_IOSURFACE_FOR_2D_CANVAS
-Canvas2DLayerBridge::ImageInfo::ImageInfo(GLuint imageId, GLuint textureId, GLint gpuMemoryBufferId)
- : m_imageId(imageId)
- , m_textureId(textureId)
- , m_gpuMemoryBufferId(gpuMemoryBufferId)
+Canvas2DLayerBridge::ImageInfo::ImageInfo(GLuint imageId, GLuint textureId) : m_imageId(imageId), m_textureId(textureId)
{
DCHECK(imageId);
DCHECK(textureId);
- DCHECK_NE(-1, gpuMemoryBufferId);
}
bool Canvas2DLayerBridge::ImageInfo::empty()

Powered by Google App Engine
This is Rietveld 408576698