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

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.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/canvas2d/CanvasRenderingContext2DAPITest.cpp ('K') | « third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.h ('k') | third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h » ('j') | third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 11d64fbee2a8e5918480447547a35caaf1d66a80..9c2d5ffa9a31ecc888020256ff255414038c83cc 100644

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

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

@@ -27,7 +27,7 @@

namespace blink {

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

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

{

if (!RuntimeEnabledFeatures::unsafeES3APIsEnabled()) {

canvas->dispatchEvent(WebGLContextEvent::create(EventTypeNames::webglcontextcreationerror, false, true, "Creation of WebGL2 contexts disabled."));

@@ -46,7 +46,7 @@ PassOwnPtrWillBeRawPtr<CanvasRenderingContext> WebGL2RenderingContext::Factory::

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

}

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

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

if (!renderingContext->drawingBuffer()) {

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

@@ -64,8 +64,8 @@ void WebGL2RenderingContext::Factory::onError(HTMLCanvasElement* canvas, const S

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

}

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

- : WebGL2RenderingContextBase(passedCanvas, context, requestedAttributes)

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

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

{

}