Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-26 19:55:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1446568: Make SetScriptGlobalObject not pure virtual. r=smaug

Browse Source 
MozReview-Commit-ID: 1kKPq7f50jC
This commit is contained in:
Emilio Cobos Álvarez 2018-03-15 18:37:51 +01:00
parent 6b3537c326
commit 3e33f2a705
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/nsDocument.cpp
View File

@ -4872,7 +4872,7 @@ nsIDocument::GetContainer() const
} }
void void
nsDocument::SetScriptGlobalObject(nsIScriptGlobalObject *aScriptGlobalObject) nsIDocument::SetScriptGlobalObject(nsIScriptGlobalObject *aScriptGlobalObject)
{ {
MOZ_ASSERT(aScriptGlobalObject || !mAnimationController || MOZ_ASSERT(aScriptGlobalObject || !mAnimationController ||
mAnimationController->IsPausedByType( mAnimationController->IsPausedByType(

2
dom/base/nsDocument.h
View File

@ -174,8 +174,6 @@ public:
mFailedChannel = aChannel; mFailedChannel = aChannel;
} }
virtual void SetScriptGlobalObject(nsIScriptGlobalObject* aGlobalObject) override;
virtual void EndUpdate(nsUpdateType aUpdateType) override; virtual void EndUpdate(nsUpdateType aUpdateType) override;
virtual void BeginLoad() override; virtual void BeginLoad() override;
virtual void EndLoad() override; virtual void EndLoad() override;

2
dom/base/nsIDocument.h
View File

@ -1791,7 +1791,7 @@ public:
return mStyleAttrStyleSheet; return mStyleAttrStyleSheet;
} }
virtual void SetScriptGlobalObject(nsIScriptGlobalObject* aGlobalObject) = 0; virtual void SetScriptGlobalObject(nsIScriptGlobalObject* aGlobalObject);
/** /**
* Get/set the object from which the context for the event/script handling can * Get/set the object from which the context for the event/script handling can