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

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/modules/webgl/WebGL2RenderingContext.h

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/OESVertexArrayObject.idl ('k') | third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.cpp » ('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.h

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

index 7922359897bd480482c7a8e816f4fa954495fddd..a32e7fd428144e0c96343502d92df367e31868e1 100644

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

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

@@ -21,7 +21,7 @@ public:

Factory() {}

~Factory() override {}

- PassOwnPtrWillBeRawPtr<CanvasRenderingContext> create(HTMLCanvasElement*, const CanvasContextCreationAttributes&, Document&) override;

+ PassOwnPtrWillBeRawPtr<CanvasRenderingContext> create(HTMLCanvasElement*, ScriptState*, const CanvasContextCreationAttributes&, Document&) override;

CanvasRenderingContext::ContextType contextType() const override { return CanvasRenderingContext::ContextWebgl2; }

void onError(HTMLCanvasElement*, const String& error) override;

};

@@ -36,7 +36,7 @@ public:

DECLARE_VIRTUAL_TRACE();

protected:

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

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

PersistentWillBeMember<CHROMIUMSubscribeUniform> m_chromiumSubscribeUniform;

PersistentWillBeMember<EXTTextureFilterAnisotropic> m_extTextureFilterAnisotropic;