diff options
Diffstat (limited to 'Source/WebCore/html/canvas/WebGLSharedObject.cpp')
-rw-r--r-- | Source/WebCore/html/canvas/WebGLSharedObject.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/Source/WebCore/html/canvas/WebGLSharedObject.cpp b/Source/WebCore/html/canvas/WebGLSharedObject.cpp index 9f76cae77..1b2236fbd 100644 --- a/Source/WebCore/html/canvas/WebGLSharedObject.cpp +++ b/Source/WebCore/html/canvas/WebGLSharedObject.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Apple Inc. All rights reserved. + * Copyright (C) 2011-2017 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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,41 +24,39 @@ */ #include "config.h" +#include "WebGLSharedObject.h" #if ENABLE(WEBGL) -#include "WebGLSharedObject.h" - #include "WebGLContextGroup.h" -#include "WebGLRenderingContext.h" +#include "WebGLRenderingContextBase.h" namespace WebCore { -WebGLSharedObject::WebGLSharedObject(WebGLRenderingContext* context) - : WebGLObject(context), - m_contextGroup(context->contextGroup()) +WebGLSharedObject::WebGLSharedObject(WebGLRenderingContextBase& context) + : m_contextGroup(context.contextGroup()) { } WebGLSharedObject::~WebGLSharedObject() { if (m_contextGroup) - m_contextGroup->removeObject(this); + m_contextGroup->removeObject(*this); } void WebGLSharedObject::detachContextGroup() { detach(); if (m_contextGroup) { - deleteObject(0); - m_contextGroup->removeObject(this); - m_contextGroup = 0; + deleteObject(nullptr); + m_contextGroup->removeObject(*this); + m_contextGroup = nullptr; } } GraphicsContext3D* WebGLSharedObject::getAGraphicsContext3D() const { - return m_contextGroup ? m_contextGroup->getAGraphicsContext3D() : 0; + return m_contextGroup ? &m_contextGroup->getAGraphicsContext3D() : nullptr; } } |