зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 3 changesets (bug 1583203) build bustages on a CLOSED TREE
Backed out changeset ca89485fedf8 (bug 1583203) Backed out changeset 8bc17415ff25 (bug 1583203) Backed out changeset 3e3eebe862e5 (bug 1583203)
This commit is contained in:
Родитель
b4f89cf524
Коммит
7d9c945b30
|
@ -597,15 +597,13 @@ class nsINode : public mozilla::dom::EventTarget {
|
||||||
*
|
*
|
||||||
* For all other cases OwnerDoc and GetOwnerDocument behave identically.
|
* For all other cases OwnerDoc and GetOwnerDocument behave identically.
|
||||||
*/
|
*/
|
||||||
Document* OwnerDoc() const MOZ_NONNULL_RETURN {
|
Document* OwnerDoc() const { return mNodeInfo->GetDocument(); }
|
||||||
return mNodeInfo->GetDocument();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the "owner document" of this node as an nsINode*. Implemented
|
* Return the "owner document" of this node as an nsINode*. Implemented
|
||||||
* in Document.h.
|
* in Document.h.
|
||||||
*/
|
*/
|
||||||
inline nsINode* OwnerDocAsNode() const MOZ_NONNULL_RETURN;
|
inline nsINode* OwnerDocAsNode() const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns true if the content has an ancestor that is a document.
|
* Returns true if the content has an ancestor that is a document.
|
||||||
|
|
|
@ -2175,7 +2175,7 @@ void HTMLMediaElement::Load() {
|
||||||
HasAttr(kNameSpaceID_None, nsGkAtoms::autoplay),
|
HasAttr(kNameSpaceID_None, nsGkAtoms::autoplay),
|
||||||
AutoplayPolicy::IsAllowedToPlay(*this), OwnerDoc(),
|
AutoplayPolicy::IsAllowedToPlay(*this), OwnerDoc(),
|
||||||
DocumentOrigin(OwnerDoc()).get(),
|
DocumentOrigin(OwnerDoc()).get(),
|
||||||
OwnerDoc()->HasBeenUserGestureActivated(), mMuted,
|
OwnerDoc() ? OwnerDoc()->HasBeenUserGestureActivated() : 0, mMuted,
|
||||||
mVolume));
|
mVolume));
|
||||||
|
|
||||||
if (mIsRunningLoadMethod) {
|
if (mIsRunningLoadMethod) {
|
||||||
|
|
|
@ -3163,7 +3163,7 @@ void nsPluginInstanceOwner::SetFrame(nsPluginFrame* aFrame) {
|
||||||
|
|
||||||
// If we already have a frame that is changing or going away...
|
// If we already have a frame that is changing or going away...
|
||||||
if (mPluginFrame) {
|
if (mPluginFrame) {
|
||||||
if (content && content->OwnerDoc()->GetWindow()) {
|
if (content && content->OwnerDoc() && content->OwnerDoc()->GetWindow()) {
|
||||||
nsCOMPtr<EventTarget> windowRoot =
|
nsCOMPtr<EventTarget> windowRoot =
|
||||||
content->OwnerDoc()->GetWindow()->GetTopWindowRoot();
|
content->OwnerDoc()->GetWindow()->GetTopWindowRoot();
|
||||||
if (windowRoot) {
|
if (windowRoot) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче