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

Unified Diff: third_party/WebKit/Source/core/html/HTMLCanvasElement.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
Index: third_party/WebKit/Source/core/html/HTMLCanvasElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLCanvasElement.h b/third_party/WebKit/Source/core/html/HTMLCanvasElement.h
index f8b1b19abcd8ac856b20ee4c9e9f5132794baa76..e34301e8b4e55796c3be3c6f575f319193cc5004 100644
--- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.h
@@ -110,7 +110,8 @@ public:
// Called by HTMLCanvasElement's V8 bindings.
ScriptValue getContext(ScriptState*, const String&, const CanvasContextCreationAttributes&);
// Called by Document::getCSSCanvasContext as well as above getContext().
- CanvasRenderingContext* getCanvasRenderingContext(const String&, const CanvasContextCreationAttributes&);
+ // The WebGLRenderingContext requires a non-null ScriptState, but the Canvas2DRenderingContext does not.
haraken 2015/10/13 02:02:04 In general, it is not nice to pass a nullptr to Sc
+ CanvasRenderingContext* getCanvasRenderingContext(ScriptState*, const String&, const CanvasContextCreationAttributes&);
bool isPaintable() const;

Powered by Google App Engine
This is Rietveld 408576698