Source/platform/graphics/ImageBuffer.cpp - Issue 481433002: gpu: Remove WebGraphicsContext3D::makeContextCurrent() in Blink

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: Source/platform/graphics/ImageBuffer.cpp

Issue 481433002: gpu: Remove WebGraphicsContext3D::makeContextCurrent() in Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Design it as first land Created 6 years, 4 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

« Source/platform/graphics/Canvas2DLayerBridge.cpp ('K') | « Source/platform/graphics/Canvas2DLayerBridge.cpp ('k') | Source/platform/graphics/gpu/DrawingBuffer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/platform/graphics/ImageBuffer.cpp

diff --git a/Source/platform/graphics/ImageBuffer.cpp b/Source/platform/graphics/ImageBuffer.cpp

index 0defbb08d07d60222c6ee2c08ae57350c93dfe0e..9013e254983427c6a4e0cd935d346d811985e842 100644

--- a/Source/platform/graphics/ImageBuffer.cpp

+++ b/Source/platform/graphics/ImageBuffer.cpp

@@ -180,7 +180,7 @@ bool ImageBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, Platform3

if (!provider)

return false;

WebGraphicsContext3D* sharedContext = provider->context3d();

- if (!sharedContext || !sharedContext->makeContextCurrent())

+ if (!sharedContext)

return false;

OwnPtr<WebExternalTextureMailbox> mailbox = adoptPtr(new WebExternalTextureMailbox);

@@ -192,9 +192,6 @@ bool ImageBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, Platform3

mailbox->syncPoint = sharedContext->insertSyncPoint();

- if (!context->makeContextCurrent())

- return false;

context->waitSyncPoint(mailbox->syncPoint);

Platform3DObject sourceTexture = context->createAndConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox->name);