webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 10 insertions, 12 deletions

diff --git a/Source/WebCore/html/canvas/WebGLContextObject.cpp b/Source/WebCore/html/canvas/WebGLContextObject.cpp
index 9b3ab0b9c..6a1c7ab29 100644
--- a/Source/WebCore/html/canvas/WebGLContextObject.cpp
+++ b/Source/WebCore/html/canvas/WebGLContextObject.cpp
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -24,25 +24,23 @@
  */
 
 #include "config.h"
+#include "WebGLContextObject.h"
 
 #if ENABLE(WEBGL)
 
-#include "WebGLContextObject.h"
-
-#include "WebGLRenderingContext.h"
+#include "WebGLRenderingContextBase.h"
 
 namespace WebCore {
 
-WebGLContextObject::WebGLContextObject(WebGLRenderingContext* context)
-    : WebGLObject(context)
-    , m_context(context)
+WebGLContextObject::WebGLContextObject(WebGLRenderingContextBase& context)
+    : m_context(&context)
 {
 }
 
 WebGLContextObject::~WebGLContextObject()
 {
     if (m_context)
-        m_context->removeContextObject(this);
+        m_context->removeContextObject(*this);
 }
 
 void WebGLContextObject::detachContext()
@@ -50,14 +48,14 @@ void WebGLContextObject::detachContext()
     detach();
     if (m_context) {
         deleteObject(m_context->graphicsContext3D());
-        m_context->removeContextObject(this);
-        m_context = 0;
+        m_context->removeContextObject(*this);
+        m_context = nullptr;
     }
 }
 
 GraphicsContext3D* WebGLContextObject::getAGraphicsContext3D() const
 {
-    return m_context ? m_context->graphicsContext3D() : 0;
+    return m_context ? m_context->graphicsContext3D() : nullptr;
 }
 
 }