Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/html/canvas/WebGLTexture.h b/src/third_party/WebKit/Source/core/html/canvas/WebGLTexture.h
index bb086c0..ce03fa5 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/canvas/WebGLTexture.h
+++ b/src/third_party/WebKit/Source/core/html/canvas/WebGLTexture.h
@@ -26,12 +26,12 @@
 #ifndef WebGLTexture_h
 #define WebGLTexture_h
 
-#include "bindings/v8/ScriptWrappable.h"
+#include "bindings/core/v8/ScriptWrappable.h"
 #include "core/html/canvas/WebGLSharedObject.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 
-namespace WebCore {
+namespace blink {
 
 class WebGLTexture FINAL : public WebGLSharedObject, public ScriptWrappable {
 public:
@@ -42,7 +42,7 @@ public:
     };
     virtual ~WebGLTexture();
 
-    static PassRefPtr<WebGLTexture> create(WebGLRenderingContextBase*);
+    static PassRefPtrWillBeRawPtr<WebGLTexture> create(WebGLRenderingContextBase*);
 
     void setTarget(GLenum target, GLint maxLevel);
     void setParameteri(GLenum pname, GLint param);
@@ -76,7 +76,7 @@ public:
     static GLint computeLevelCount(GLsizei width, GLsizei height);
 
 protected:
-    WebGLTexture(WebGLRenderingContextBase*);
+    explicit WebGLTexture(WebGLRenderingContextBase*);
 
     virtual void deleteObjectImpl(blink::WebGraphicsContext3D*, Platform3DObject) OVERRIDE;
 
@@ -133,6 +133,6 @@ private:
     bool m_isHalfFloatType;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // WebGLTexture_h