Use WeakPtr for extension parent pointer.
This commit is contained in:
parent
97afb9108e
commit
352616c872
|
@ -20,6 +20,7 @@
|
||||||
#include "mozilla/gfx/2D.h"
|
#include "mozilla/gfx/2D.h"
|
||||||
#include "mozilla/LinkedList.h"
|
#include "mozilla/LinkedList.h"
|
||||||
#include "mozilla/UniquePtr.h"
|
#include "mozilla/UniquePtr.h"
|
||||||
|
#include "mozilla/WeakPtr.h"
|
||||||
#include "nsCycleCollectionNoteChild.h"
|
#include "nsCycleCollectionNoteChild.h"
|
||||||
#include "nsICanvasRenderingContextInternal.h"
|
#include "nsICanvasRenderingContextInternal.h"
|
||||||
#include "nsLayoutUtils.h"
|
#include "nsLayoutUtils.h"
|
||||||
|
@ -299,6 +300,7 @@ class WebGLContext
|
||||||
, public WebGLContextUnchecked
|
, public WebGLContextUnchecked
|
||||||
, public WebGLRectangleObject
|
, public WebGLRectangleObject
|
||||||
, public nsWrapperCache
|
, public nsWrapperCache
|
||||||
|
, public SupportsWeakPtr<WebGLContext>
|
||||||
{
|
{
|
||||||
friend class ScopedDrawHelper;
|
friend class ScopedDrawHelper;
|
||||||
friend class ScopedDrawWithTransformFeedback;
|
friend class ScopedDrawWithTransformFeedback;
|
||||||
|
@ -342,6 +344,7 @@ public:
|
||||||
|
|
||||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(WebGLContext,
|
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(WebGLContext,
|
||||||
nsIDOMWebGLRenderingContext)
|
nsIDOMWebGLRenderingContext)
|
||||||
|
MOZ_DECLARE_WEAKREFERENCE_TYPENAME(WebGLContext)
|
||||||
|
|
||||||
virtual JSObject* WrapObject(JSContext* cx, JS::Handle<JSObject*> givenProto) override = 0;
|
virtual JSObject* WrapObject(JSContext* cx, JS::Handle<JSObject*> givenProto) override = 0;
|
||||||
|
|
||||||
|
|
|
@ -29,15 +29,10 @@ WebGLExtensionDebugShaders::GetTranslatedShaderSource(const WebGLShader& shader,
|
||||||
{
|
{
|
||||||
retval.SetIsVoid(true);
|
retval.SetIsVoid(true);
|
||||||
|
|
||||||
if (mIsLost) {
|
if (mIsLost || !mContext) {
|
||||||
mContext->ErrorInvalidOperation("%s: Extension is lost.",
|
|
||||||
"getTranslatedShaderSource");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mContext->IsContextLost())
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!mContext->ValidateObject("getShaderTranslatedSource: shader", shader))
|
if (!mContext->ValidateObject("getShaderTranslatedSource: shader", shader))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -40,8 +40,10 @@ void
|
||||||
WebGLExtensionDisjointTimerQuery::DeleteQueryEXT(WebGLQuery* query) const
|
WebGLExtensionDisjointTimerQuery::DeleteQueryEXT(WebGLQuery* query) const
|
||||||
{
|
{
|
||||||
const char funcName[] = "deleteQueryEXT";
|
const char funcName[] = "deleteQueryEXT";
|
||||||
if (mIsLost)
|
|
||||||
return;
|
if (mIsLost || !mContext) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
mContext->DeleteQuery(query, funcName);
|
mContext->DeleteQuery(query, funcName);
|
||||||
}
|
}
|
||||||
|
@ -50,8 +52,10 @@ bool
|
||||||
WebGLExtensionDisjointTimerQuery::IsQueryEXT(const WebGLQuery* query) const
|
WebGLExtensionDisjointTimerQuery::IsQueryEXT(const WebGLQuery* query) const
|
||||||
{
|
{
|
||||||
const char funcName[] = "isQueryEXT";
|
const char funcName[] = "isQueryEXT";
|
||||||
if (mIsLost)
|
|
||||||
return false;
|
if (mIsLost || !mContext) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return mContext->IsQuery(query, funcName);
|
return mContext->IsQuery(query, funcName);
|
||||||
}
|
}
|
||||||
|
@ -60,8 +64,10 @@ void
|
||||||
WebGLExtensionDisjointTimerQuery::BeginQueryEXT(GLenum target, WebGLQuery& query) const
|
WebGLExtensionDisjointTimerQuery::BeginQueryEXT(GLenum target, WebGLQuery& query) const
|
||||||
{
|
{
|
||||||
const char funcName[] = "beginQueryEXT";
|
const char funcName[] = "beginQueryEXT";
|
||||||
if (mIsLost)
|
|
||||||
return;
|
if (mIsLost || !mContext) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
mContext->BeginQuery(target, query, funcName);
|
mContext->BeginQuery(target, query, funcName);
|
||||||
}
|
}
|
||||||
|
@ -70,8 +76,10 @@ void
|
||||||
WebGLExtensionDisjointTimerQuery::EndQueryEXT(GLenum target) const
|
WebGLExtensionDisjointTimerQuery::EndQueryEXT(GLenum target) const
|
||||||
{
|
{
|
||||||
const char funcName[] = "endQueryEXT";
|
const char funcName[] = "endQueryEXT";
|
||||||
if (mIsLost)
|
|
||||||
return;
|
if (mIsLost || !mContext) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
mContext->EndQuery(target, funcName);
|
mContext->EndQuery(target, funcName);
|
||||||
}
|
}
|
||||||
|
@ -80,8 +88,10 @@ void
|
||||||
WebGLExtensionDisjointTimerQuery::QueryCounterEXT(WebGLQuery& query, GLenum target) const
|
WebGLExtensionDisjointTimerQuery::QueryCounterEXT(WebGLQuery& query, GLenum target) const
|
||||||
{
|
{
|
||||||
const char funcName[] = "queryCounterEXT";
|
const char funcName[] = "queryCounterEXT";
|
||||||
if (mIsLost)
|
|
||||||
return;
|
if (mIsLost || !mContext) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!mContext->ValidateObject(funcName, query))
|
if (!mContext->ValidateObject(funcName, query))
|
||||||
return;
|
return;
|
||||||
|
@ -95,8 +105,10 @@ WebGLExtensionDisjointTimerQuery::GetQueryEXT(JSContext* cx, GLenum target, GLen
|
||||||
{
|
{
|
||||||
const char funcName[] = "getQueryEXT";
|
const char funcName[] = "getQueryEXT";
|
||||||
retval.setNull();
|
retval.setNull();
|
||||||
if (mIsLost)
|
|
||||||
return;
|
if (mIsLost || !mContext) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
mContext->GetQuery(cx, target, pname, retval, funcName);
|
mContext->GetQuery(cx, target, pname, retval, funcName);
|
||||||
}
|
}
|
||||||
|
@ -108,8 +120,10 @@ WebGLExtensionDisjointTimerQuery::GetQueryObjectEXT(JSContext* cx,
|
||||||
{
|
{
|
||||||
const char funcName[] = "getQueryObjectEXT";
|
const char funcName[] = "getQueryObjectEXT";
|
||||||
retval.setNull();
|
retval.setNull();
|
||||||
if (mIsLost)
|
|
||||||
return;
|
if (mIsLost || !mContext) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
mContext->GetQueryParameter(cx, query, pname, retval, funcName);
|
mContext->GetQueryParameter(cx, query, pname, retval, funcName);
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,9 @@ void
|
||||||
WebGLExtensionDrawBuffers::DrawBuffersWEBGL(const dom::Sequence<GLenum>& buffers)
|
WebGLExtensionDrawBuffers::DrawBuffersWEBGL(const dom::Sequence<GLenum>& buffers)
|
||||||
{
|
{
|
||||||
if (mIsLost) {
|
if (mIsLost) {
|
||||||
mContext->ErrorInvalidOperation("drawBuffersWEBGL: Extension is lost.");
|
if (mContext) {
|
||||||
|
mContext->ErrorInvalidOperation("drawBuffersWEBGL: Extension is lost.");
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,10 @@ WebGLExtensionInstancedArrays::DrawArraysInstancedANGLE(GLenum mode,
|
||||||
GLsizei primcount)
|
GLsizei primcount)
|
||||||
{
|
{
|
||||||
if (mIsLost) {
|
if (mIsLost) {
|
||||||
mContext->ErrorInvalidOperation("%s: Extension is lost.",
|
if (mContext) {
|
||||||
"drawArraysInstancedANGLE");
|
mContext->ErrorInvalidOperation("%s: Extension is lost.",
|
||||||
|
"drawArraysInstancedANGLE");
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,8 +46,10 @@ WebGLExtensionInstancedArrays::DrawElementsInstancedANGLE(GLenum mode,
|
||||||
GLsizei primcount)
|
GLsizei primcount)
|
||||||
{
|
{
|
||||||
if (mIsLost) {
|
if (mIsLost) {
|
||||||
mContext->ErrorInvalidOperation("%s: Extension is lost.",
|
if (mContext) {
|
||||||
"drawElementsInstancedANGLE");
|
mContext->ErrorInvalidOperation("%s: Extension is lost.",
|
||||||
|
"drawElementsInstancedANGLE");
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -57,8 +61,10 @@ WebGLExtensionInstancedArrays::VertexAttribDivisorANGLE(GLuint index,
|
||||||
GLuint divisor)
|
GLuint divisor)
|
||||||
{
|
{
|
||||||
if (mIsLost) {
|
if (mIsLost) {
|
||||||
mContext->ErrorInvalidOperation("%s: Extension is lost.",
|
if (mContext) {
|
||||||
"vertexAttribDivisorANGLE");
|
mContext->ErrorInvalidOperation("%s: Extension is lost.",
|
||||||
|
"vertexAttribDivisorANGLE");
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,12 +22,14 @@ WebGLExtensionLoseContext::~WebGLExtensionLoseContext()
|
||||||
void
|
void
|
||||||
WebGLExtensionLoseContext::LoseContext()
|
WebGLExtensionLoseContext::LoseContext()
|
||||||
{
|
{
|
||||||
|
if (!mContext) return;
|
||||||
mContext->LoseContext();
|
mContext->LoseContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
WebGLExtensionLoseContext::RestoreContext()
|
WebGLExtensionLoseContext::RestoreContext()
|
||||||
{
|
{
|
||||||
|
if (!mContext) return;
|
||||||
mContext->RestoreContext();
|
mContext->RestoreContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ WebGLExtensionVertexArray::~WebGLExtensionVertexArray()
|
||||||
already_AddRefed<WebGLVertexArray>
|
already_AddRefed<WebGLVertexArray>
|
||||||
WebGLExtensionVertexArray::CreateVertexArrayOES()
|
WebGLExtensionVertexArray::CreateVertexArrayOES()
|
||||||
{
|
{
|
||||||
if (mIsLost)
|
if (mIsLost || !mContext)
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
return mContext->CreateVertexArray();
|
return mContext->CreateVertexArray();
|
||||||
|
@ -34,7 +34,7 @@ WebGLExtensionVertexArray::CreateVertexArrayOES()
|
||||||
void
|
void
|
||||||
WebGLExtensionVertexArray::DeleteVertexArrayOES(WebGLVertexArray* array)
|
WebGLExtensionVertexArray::DeleteVertexArrayOES(WebGLVertexArray* array)
|
||||||
{
|
{
|
||||||
if (mIsLost)
|
if (mIsLost || !mContext)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
mContext->DeleteVertexArray(array);
|
mContext->DeleteVertexArray(array);
|
||||||
|
@ -43,7 +43,7 @@ WebGLExtensionVertexArray::DeleteVertexArrayOES(WebGLVertexArray* array)
|
||||||
bool
|
bool
|
||||||
WebGLExtensionVertexArray::IsVertexArrayOES(const WebGLVertexArray* array)
|
WebGLExtensionVertexArray::IsVertexArrayOES(const WebGLVertexArray* array)
|
||||||
{
|
{
|
||||||
if (mIsLost)
|
if (mIsLost || !mContext)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return mContext->IsVertexArray(array);
|
return mContext->IsVertexArray(array);
|
||||||
|
@ -52,7 +52,7 @@ WebGLExtensionVertexArray::IsVertexArrayOES(const WebGLVertexArray* array)
|
||||||
void
|
void
|
||||||
WebGLExtensionVertexArray::BindVertexArrayOES(WebGLVertexArray* array)
|
WebGLExtensionVertexArray::BindVertexArrayOES(WebGLVertexArray* array)
|
||||||
{
|
{
|
||||||
if (mIsLost)
|
if (mIsLost || !mContext)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
mContext->BindVertexArray(array);
|
mContext->BindVertexArray(array);
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
#ifndef WEBGLOBJECTMODEL_H_
|
#ifndef WEBGLOBJECTMODEL_H_
|
||||||
#define WEBGLOBJECTMODEL_H_
|
#define WEBGLOBJECTMODEL_H_
|
||||||
|
|
||||||
|
#include "mozilla/WeakPtr.h"
|
||||||
#include "nsCycleCollectionNoteChild.h"
|
#include "nsCycleCollectionNoteChild.h"
|
||||||
|
|
||||||
#include "WebGLTypes.h"
|
#include "WebGLTypes.h"
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
|
@ -24,7 +24,7 @@ class WebGLContext;
|
||||||
class WebGLContextBoundObject
|
class WebGLContextBoundObject
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
WebGLContext* const mContext;
|
const WeakPtr<WebGLContext> mContext;
|
||||||
private:
|
private:
|
||||||
const uint32_t mContextGeneration;
|
const uint32_t mContextGeneration;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user