wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-05 15:28:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

ported upstream mozilla esr60 changes: bug1515052, bug1539219, bug1547757, bug1555523

Browse source
This commit is contained in:
Roy Tam 2019-06-22 09:48:24 +08:00
commit bc81a6d5f5
12 changed files with 49 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dom/canvas/WebGLContext.h
View file

@ -20,6 +20,7 @@
#include "mozilla/gfx/2D.h"
#include "mozilla/LinkedList.h"
#include "mozilla/UniquePtr.h"
#include "mozilla/WeakPtr.h"
#include "nsCycleCollectionNoteChild.h"
#include "nsICanvasRenderingContextInternal.h"
#include "nsLayoutUtils.h"
@ -299,6 +300,7 @@ class WebGLContext
, public WebGLContextUnchecked
, public WebGLRectangleObject
, public nsWrapperCache
, public SupportsWeakPtr<WebGLContext>
{
friend class ScopedDrawHelper;
friend class ScopedDrawWithTransformFeedback;
@ -342,6 +344,7 @@ public:
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(WebGLContext,
nsIDOMWebGLRenderingContext)
MOZ_DECLARE_WEAKREFERENCE_TYPENAME(WebGLContext)
virtual JSObject* WrapObject(JSContext* cx, JS::Handle<JSObject*> givenProto) override = 0;

9
dom/canvas/WebGLExtensionDebugShaders.cpp
View file

@ -29,14 +29,7 @@ WebGLExtensionDebugShaders::GetTranslatedShaderSource(const WebGLShader& shader,
{
retval.SetIsVoid(true);
if (mIsLost) {
mContext->ErrorInvalidOperation("%s: Extension is lost.",
"getTranslatedShaderSource");
return;
}
if (mContext->IsContextLost())
return;
if (mIsLost || !mContext) return;
if (!mContext->ValidateObject("getShaderTranslatedSource: shader", shader))
return;

14
dom/canvas/WebGLExtensionDisjointTimerQuery.cpp
View file

@ -40,7 +40,7 @@ void
WebGLExtensionDisjointTimerQuery::DeleteQueryEXT(WebGLQuery* query) const
{
const char funcName[] = "deleteQueryEXT";
if (mIsLost)
if (mIsLost || !mContext)
return;
mContext->DeleteQuery(query, funcName);
@ -50,7 +50,7 @@ bool
WebGLExtensionDisjointTimerQuery::IsQueryEXT(const WebGLQuery* query) const
{
const char funcName[] = "isQueryEXT";
if (mIsLost)
if (mIsLost || !mContext)
return false;
return mContext->IsQuery(query, funcName);
@ -60,7 +60,7 @@ void
WebGLExtensionDisjointTimerQuery::BeginQueryEXT(GLenum target, WebGLQuery& query) const
{
const char funcName[] = "beginQueryEXT";
if (mIsLost)
if (mIsLost || !mContext)
return;
mContext->BeginQuery(target, query, funcName);
@ -70,7 +70,7 @@ void
WebGLExtensionDisjointTimerQuery::EndQueryEXT(GLenum target) const
{
const char funcName[] = "endQueryEXT";
if (mIsLost)
if (mIsLost || !mContext)
return;
mContext->EndQuery(target, funcName);
@ -80,7 +80,7 @@ void
WebGLExtensionDisjointTimerQuery::QueryCounterEXT(WebGLQuery& query, GLenum target) const
{
const char funcName[] = "queryCounterEXT";
if (mIsLost)
if (mIsLost || !mContext)
return;
if (!mContext->ValidateObject(funcName, query))
@ -95,7 +95,7 @@ WebGLExtensionDisjointTimerQuery::GetQueryEXT(JSContext* cx, GLenum target, GLen
{
const char funcName[] = "getQueryEXT";
retval.setNull();
if (mIsLost)
if (mIsLost || !mContext)
return;
mContext->GetQuery(cx, target, pname, retval, funcName);
@ -108,7 +108,7 @@ WebGLExtensionDisjointTimerQuery::GetQueryObjectEXT(JSContext* cx,
{
const char funcName[] = "getQueryObjectEXT";
retval.setNull();
if (mIsLost)
if (mIsLost || !mContext)
return;
mContext->GetQueryParameter(cx, query, pname, retval, funcName);

4
dom/canvas/WebGLExtensionDrawBuffers.cpp
View file

@ -36,7 +36,9 @@ void
WebGLExtensionDrawBuffers::DrawBuffersWEBGL(const dom::Sequence<GLenum>& buffers)
{
if (mIsLost) {
mContext->ErrorInvalidOperation("drawBuffersWEBGL: Extension is lost.");
if (mContext) {
mContext->ErrorInvalidOperation("drawBuffersWEBGL: Extension is lost.");
}
return;
}

24
dom/canvas/WebGLExtensionInstancedArrays.cpp
View file

@ -28,9 +28,11 @@ WebGLExtensionInstancedArrays::DrawArraysInstancedANGLE(GLenum mode,
GLsizei primcount)
{
if (mIsLost) {
mContext->ErrorInvalidOperation("%s: Extension is lost.",
"drawArraysInstancedANGLE");
return;
if (mContext) {
mContext->ErrorInvalidOperation("%s: Extension is lost.",
"drawArraysInstancedANGLE");
return;
}
}
mContext->DrawArraysInstanced(mode, first, count, primcount);
@ -44,9 +46,11 @@ WebGLExtensionInstancedArrays::DrawElementsInstancedANGLE(GLenum mode,
GLsizei primcount)
{
if (mIsLost) {
mContext->ErrorInvalidOperation("%s: Extension is lost.",
"drawElementsInstancedANGLE");
return;
if (mContext) {
mContext->ErrorInvalidOperation("%s: Extension is lost.",
"drawElementsInstancedANGLE");
return;
}
}
mContext->DrawElementsInstanced(mode, count, type, offset, primcount);
@ -57,9 +61,11 @@ WebGLExtensionInstancedArrays::VertexAttribDivisorANGLE(GLuint index,
GLuint divisor)
{
if (mIsLost) {
mContext->ErrorInvalidOperation("%s: Extension is lost.",
"vertexAttribDivisorANGLE");
return;
if (mContext) {
mContext->ErrorInvalidOperation("%s: Extension is lost.",
"vertexAttribDivisorANGLE");
return;
}
}
mContext->VertexAttribDivisor(index, divisor);

2
dom/canvas/WebGLExtensionLoseContext.cpp
View file

@ -22,12 +22,14 @@ WebGLExtensionLoseContext::~WebGLExtensionLoseContext()
void
WebGLExtensionLoseContext::LoseContext()
{
if (!mContext) return;
mContext->LoseContext();
}
void
WebGLExtensionLoseContext::RestoreContext()
{
if (!mContext) return;
mContext->RestoreContext();
}

8
dom/canvas/WebGLExtensionVertexArray.cpp
View file

@ -25,7 +25,7 @@ WebGLExtensionVertexArray::~WebGLExtensionVertexArray()
already_AddRefed<WebGLVertexArray>
WebGLExtensionVertexArray::CreateVertexArrayOES()
{
if (mIsLost)
if (mIsLost || !mContext)
return nullptr;
return mContext->CreateVertexArray();
@ -34,7 +34,7 @@ WebGLExtensionVertexArray::CreateVertexArrayOES()
void
WebGLExtensionVertexArray::DeleteVertexArrayOES(WebGLVertexArray* array)
{
if (mIsLost)
if (mIsLost || !mContext)
return;
mContext->DeleteVertexArray(array);
@ -43,7 +43,7 @@ WebGLExtensionVertexArray::DeleteVertexArrayOES(WebGLVertexArray* array)
bool
WebGLExtensionVertexArray::IsVertexArrayOES(const WebGLVertexArray* array)
{
if (mIsLost)
if (mIsLost || !mContext)
return false;
return mContext->IsVertexArray(array);
@ -52,7 +52,7 @@ WebGLExtensionVertexArray::IsVertexArrayOES(const WebGLVertexArray* array)
void
WebGLExtensionVertexArray::BindVertexArrayOES(WebGLVertexArray* array)
{
if (mIsLost)
if (mIsLost || !mContext)
return;
mContext->BindVertexArray(array);

3
dom/canvas/WebGLObjectModel.h
View file

@ -6,6 +6,7 @@
#ifndef WEBGLOBJECTMODEL_H_
#define WEBGLOBJECTMODEL_H_
#include "mozilla/WeakPtr.h"
#include "nsCycleCollectionNoteChild.h"
#include "WebGLTypes.h"
@ -24,7 +25,7 @@ class WebGLContext;
class WebGLContextBoundObject
{
public:
WebGLContext* const mContext;
const WeakPtr<WebGLContext> mContext;
private:
const uint32_t mContextGeneration;

7
dom/indexedDB/ActorsChild.cpp
View file

@ -2385,9 +2385,14 @@ BackgroundVersionChangeTransactionChild::RecvComplete(const nsresult& aResult)
database->Close();
}
RefPtr<IDBOpenDBRequest> request = mOpenDBRequest;
MOZ_ASSERT(request);
mTransaction->FireCompleteOrAbortEvents(aResult);
mOpenDBRequest->SetTransaction(nullptr);
request->SetTransaction(nullptr);
request = nullptr;
mOpenDBRequest = nullptr;
NoteComplete();

2
dom/media/MediaResource.cpp
View file

@ -1525,7 +1525,7 @@ void BaseMediaResource::SetLoadInBackground(bool aLoadInBackground) {
NS_WARNING("Null owner in MediaResource::SetLoadInBackground()");
return;
}
dom::HTMLMediaElement* element = owner->GetMediaElement();
RefPtr<dom::HTMLMediaElement> element = owner->GetMediaElement();
if (!element) {
NS_WARNING("Null element in MediaResource::SetLoadInBackground()");
return;

9
parser/html/javasrc/Tokenizer.java
View file

@ -3850,12 +3850,9 @@ public class Tokenizer implements Locator {
tokenHandler.characters(
Tokenizer.LT_SOLIDUS, 0, 2);
emitStrBuf();
if (c == '\u0000') {
emitReplacementCharacter(buf, pos);
} else {
cstart = pos; // don't drop the
// character
}
cstart = pos; // don't drop the
// character
reconsume = true;
state = transition(state, returnState, reconsume, pos);
continue stateloop;
}

7
parser/html/nsHtml5Tokenizer.cpp
View file

@ -2091,11 +2091,8 @@ nsHtml5Tokenizer::stateLoop(int32_t state, char16_t c, int32_t pos, char16_t* bu
default: {
tokenHandler->characters(nsHtml5Tokenizer::LT_SOLIDUS, 0, 2);
emitStrBuf();
if (c == '\0') {
emitReplacementCharacter(buf, pos);
} else {
cstart = pos;
}
cstart = pos;
reconsume = true;
state = P::transition(mViewSource, returnState, reconsume, pos);
NS_HTML5_CONTINUE(stateloop);
}