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

Unified Diff: sky/engine/core/html/canvas/WebGLUniformLocation.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
« no previous file with comments | « sky/engine/core/html/canvas/WebGLTexture.h ('k') | sky/engine/core/html/canvas/WebGLVertexArrayObjectOES.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/html/canvas/WebGLUniformLocation.h
diff --git a/sky/engine/core/html/canvas/WebGLUniformLocation.h b/sky/engine/core/html/canvas/WebGLUniformLocation.h
index 91628f3869466a6fbf9c37ae4401986817c5cf02..c99e61dc752161b1f25ac812cbc55ea115767548 100644
--- a/sky/engine/core/html/canvas/WebGLUniformLocation.h
+++ b/sky/engine/core/html/canvas/WebGLUniformLocation.h
@@ -27,14 +27,14 @@
#ifndef SKY_ENGINE_CORE_HTML_CANVAS_WEBGLUNIFORMLOCATION_H_
#define SKY_ENGINE_CORE_HTML_CANVAS_WEBGLUNIFORMLOCATION_H_
-#include "sky/engine/bindings/core/v8/ScriptWrappable.h"
+#include "sky/engine/tonic/dart_wrappable.h"
#include "sky/engine/core/html/canvas/WebGLProgram.h"
#include "sky/engine/wtf/PassRefPtr.h"
#include "sky/engine/wtf/RefCounted.h"
namespace blink {
-class WebGLUniformLocation final : public RefCounted<WebGLUniformLocation>, public ScriptWrappable {
+class WebGLUniformLocation final : public RefCounted<WebGLUniformLocation>, public DartWrappable {
DEFINE_WRAPPERTYPEINFO();
public:
static PassRefPtr<WebGLUniformLocation> create(WebGLProgram*, GLint location);
« no previous file with comments | « sky/engine/core/html/canvas/WebGLTexture.h ('k') | sky/engine/core/html/canvas/WebGLVertexArrayObjectOES.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698