Bug 1446568: Make SetScriptGlobalObject not pure virtual. r=smaug
authorEmilio Cobos Álvarez <emilio@crisal.io>
Thu, 15 Mar 2018 18:37:51 +0100
changeset 408683 9f3e5bc6ac993b3d4965c188798744d5e9f80de5
parent 408682 0740c8e6d169bf2025ea150e3b7c5d7a1efd50db
child 408684 5d7210ef8a29d0b8eda759c654e6017eabd5c3f7
push id101003
push userecoal95@gmail.com
push dateSat, 17 Mar 2018 15:23:01 +0000
treeherdermozilla-inbound@e4470b1b5108 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1446568
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1446568: Make SetScriptGlobalObject not pure virtual. r=smaug MozReview-Commit-ID: 1kKPq7f50jC
dom/base/nsDocument.cpp
dom/base/nsDocument.h
dom/base/nsIDocument.h
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -4867,17 +4867,17 @@ nsIDocument::SetContainer(nsDocShell* aC
 
 nsISupports*
 nsIDocument::GetContainer() const
 {
   return static_cast<nsIDocShell*>(mDocumentContainer);
 }
 
 void
-nsDocument::SetScriptGlobalObject(nsIScriptGlobalObject *aScriptGlobalObject)
+nsIDocument::SetScriptGlobalObject(nsIScriptGlobalObject *aScriptGlobalObject)
 {
   MOZ_ASSERT(aScriptGlobalObject || !mAnimationController ||
              mAnimationController->IsPausedByType(
                nsSMILTimeContainer::PAUSE_PAGEHIDE |
                nsSMILTimeContainer::PAUSE_BEGIN),
              "Clearing window pointer while animations are unpaused");
 
   if (mScriptGlobalObject && !aScriptGlobalObject) {
--- a/dom/base/nsDocument.h
+++ b/dom/base/nsDocument.h
@@ -169,18 +169,16 @@ public:
 
   virtual nsIChannel* GetFailedChannel() const override {
     return mFailedChannel;
   }
   virtual void SetFailedChannel(nsIChannel* aChannel) override {
     mFailedChannel = aChannel;
   }
 
-  virtual void SetScriptGlobalObject(nsIScriptGlobalObject* aGlobalObject) override;
-
   virtual void EndUpdate(nsUpdateType aUpdateType) override;
   virtual void BeginLoad() override;
   virtual void EndLoad() override;
 
   // nsIRadioGroupContainer
   NS_IMETHOD WalkRadioGroup(const nsAString& aName,
                             nsIRadioVisitor* aVisitor,
                             bool aFlushContent) override;
--- a/dom/base/nsIDocument.h
+++ b/dom/base/nsIDocument.h
@@ -1786,17 +1786,17 @@ public:
   /**
    * Get this document's inline style sheet.  May return null if there
    * isn't one
    */
   nsHTMLCSSStyleSheet* GetInlineStyleSheet() const {
     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
    * be got. Normally GetScriptHandlingObject() returns the same object as
    * GetScriptGlobalObject(), but if the document is loaded as data,
    * non-null may be returned, even if GetScriptGlobalObject() returns null.
    * aHasHadScriptHandlingObject is set true if document has had the object
    * for event/script handling. Do not process any events/script if the method