Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / canvas / WebGLProgram.h

diff --git a/src/third_party/WebKit/Source/core/html/canvas/WebGLProgram.h b/src/third_party/WebKit/Source/core/html/canvas/WebGLProgram.h
index f68b330..9c3a4df 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/canvas/WebGLProgram.h
+++ b/src/third_party/WebKit/Source/core/html/canvas/WebGLProgram.h
@@ -26,19 +26,19 @@
 #ifndef WebGLProgram_h
 #define WebGLProgram_h
 
-#include "bindings/v8/ScriptWrappable.h"
+#include "bindings/core/v8/ScriptWrappable.h"
 #include "core/html/canvas/WebGLSharedObject.h"
 #include "core/html/canvas/WebGLShader.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 
-namespace WebCore {
+namespace blink {
 
 class WebGLProgram FINAL : public WebGLSharedObject, public ScriptWrappable {
 public:
     virtual ~WebGLProgram();
 
-    static PassRefPtr<WebGLProgram> create(WebGLRenderingContextBase*);
+    static PassRefPtrWillBeRawPtr<WebGLProgram> create(WebGLRenderingContextBase*);
 
     unsigned numActiveAttribLocations();
     GLint getActiveAttribLocation(GLuint index);
@@ -59,8 +59,10 @@ public:
     bool attachShader(WebGLShader*);
     bool detachShader(WebGLShader*);
 
+    virtual void trace(Visitor*) OVERRIDE;
+
 protected:
-    WebGLProgram(WebGLRenderingContextBase*);
+    explicit WebGLProgram(WebGLRenderingContextBase*);
 
     virtual void deleteObjectImpl(blink::WebGraphicsContext3D*, Platform3DObject) OVERRIDE;
 
@@ -78,12 +80,12 @@ private:
     // program or not.
     unsigned m_linkCount;
 
-    RefPtr<WebGLShader> m_vertexShader;
-    RefPtr<WebGLShader> m_fragmentShader;
+    RefPtrWillBeMember<WebGLShader> m_vertexShader;
+    RefPtrWillBeMember<WebGLShader> m_fragmentShader;
 
     bool m_infoValid;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // WebGLProgram_h