third_party/WebKit/Source/modules/webgl/WebGLRenderingContext.cpp - Issue 1387743002: Fixed expando-loss.html test.

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContext.cpp

Issue 1387743002: Fixed expando-loss.html test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cache ScriptState and use it to wrap m_defaultVertexArrayObject. Created 5 years, 2 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

« third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp ('K') | « third_party/WebKit/Source/modules/webgl/WebGLRenderingContext.h ('k') | third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h » ('j') | third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContext.cpp

diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContext.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContext.cpp

index 73fce65038a3787b314a4a284621e4bd1dde1f90..9a9aeef0b32383067bd8c48f425c0b9fa0e618a0 100644

--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContext.cpp

+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContext.cpp

@@ -64,7 +64,7 @@

namespace blink {

-PassOwnPtrWillBeRawPtr<CanvasRenderingContext> WebGLRenderingContext::Factory::create(HTMLCanvasElement* canvas, const CanvasContextCreationAttributes& attrs, Document&)

+PassOwnPtrWillBeRawPtr<CanvasRenderingContext> WebGLRenderingContext::Factory::create(HTMLCanvasElement* canvas, ScriptState* scriptState, const CanvasContextCreationAttributes& attrs, Document&)

{

WebGLContextAttributes attributes = toWebGLContextAttributes(attrs);

OwnPtr<WebGraphicsContext3D> context(createWebGraphicsContext3D(canvas, attributes, 1));

@@ -78,7 +78,7 @@ PassOwnPtrWillBeRawPtr<CanvasRenderingContext> WebGLRenderingContext::Factory::c

context->pushGroupMarkerEXT(contextLabel.ascii().data());

}

- OwnPtrWillBeRawPtr<WebGLRenderingContext> renderingContext = adoptPtrWillBeNoop(new WebGLRenderingContext(canvas, context.release(), attributes));

+ OwnPtrWillBeRawPtr<WebGLRenderingContext> renderingContext = adoptPtrWillBeNoop(new WebGLRenderingContext(canvas, scriptState, context.release(), attributes));

if (!renderingContext->drawingBuffer()) {

canvas->dispatchEvent(WebGLContextEvent::create(EventTypeNames::webglcontextcreationerror, false, true, "Could not create a WebGL context."));

@@ -96,8 +96,8 @@ void WebGLRenderingContext::Factory::onError(HTMLCanvasElement* canvas, const St

canvas->dispatchEvent(WebGLContextEvent::create(EventTypeNames::webglcontextcreationerror, false, true, error));

}

-WebGLRenderingContext::WebGLRenderingContext(HTMLCanvasElement* passedCanvas, PassOwnPtr<WebGraphicsContext3D> context, const WebGLContextAttributes& requestedAttributes)

- : WebGLRenderingContextBase(passedCanvas, context, requestedAttributes)

+WebGLRenderingContext::WebGLRenderingContext(HTMLCanvasElement* passedCanvas, ScriptState* scriptState, PassOwnPtr<WebGraphicsContext3D> context, const WebGLContextAttributes& requestedAttributes)

+ : WebGLRenderingContextBase(passedCanvas, scriptState, context, requestedAttributes)

{

}