Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/html/canvas/WebGLSharedObject.cpp b/src/third_party/WebKit/Source/core/html/canvas/WebGLSharedObject.cpp
index 94f1db8..8bc1974 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/canvas/WebGLSharedObject.cpp
+++ b/src/third_party/WebKit/Source/core/html/canvas/WebGLSharedObject.cpp
@@ -30,7 +30,7 @@
 #include "core/html/canvas/WebGLContextGroup.h"
 #include "core/html/canvas/WebGLRenderingContextBase.h"
 
-namespace WebCore {
+namespace blink {
 
 WebGLSharedObject::WebGLSharedObject(WebGLRenderingContextBase* context)
     : WebGLObject(context),
@@ -50,7 +50,7 @@ void WebGLSharedObject::detachContextGroup()
     if (m_contextGroup) {
         deleteObject(0);
         m_contextGroup->removeObject(this);
-        m_contextGroup = 0;
+        m_contextGroup = nullptr;
     }
 }