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

Unified Diff: sky/engine/core/html/canvas/WebGLRenderingContext.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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: sky/engine/core/html/canvas/WebGLRenderingContext.h
diff --git a/sky/engine/core/html/canvas/WebGLRenderingContext.h b/sky/engine/core/html/canvas/WebGLRenderingContext.h
index 89d6a8a612f2536f8d984c90eda08d087f3c98d1..da94ba86033f7c068c5bee419d7c649b3c3b0eb5 100644
--- a/sky/engine/core/html/canvas/WebGLRenderingContext.h
+++ b/sky/engine/core/html/canvas/WebGLRenderingContext.h
@@ -26,13 +26,12 @@
#ifndef SKY_ENGINE_CORE_HTML_CANVAS_WEBGLRENDERINGCONTEXT_H_
#define SKY_ENGINE_CORE_HTML_CANVAS_WEBGLRENDERINGCONTEXT_H_
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
+#include "sky/engine/tonic/dart_wrappable.h"
#include "sky/engine/core/html/canvas/WebGLRenderingContextBase.h"
namespace blink {
-class WebGLRenderingContext final : public WebGLRenderingContextBase, public ScriptWrappable {
- DEFINE_WRAPPERTYPEINFO();
+class WebGLRenderingContext final : public WebGLRenderingContextBase {
public:
static PassOwnPtr<WebGLRenderingContext> create(HTMLCanvasElement*, WebGLContextAttributes*);
virtual ~WebGLRenderingContext();
« no previous file with comments | « sky/engine/core/html/canvas/WebGLRenderbuffer.h ('k') | sky/engine/core/html/canvas/WebGLRenderingContext.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698