Bug 1364815 part 2 - Follow-up to fix a typo. r=me
authorMats Palmgren <mats@mozilla.com>
Sun, 10 Sep 2017 02:10:03 +0200
changeset 429431 1f0f7fc025eeea09549179d46ead4121c6b21859
parent 429430 826f9585e662de250319e3774ecb461aac08f051
child 429432 dab1c414753a9d69e7d753f114a9d06cd2c08d8b
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1364815
milestone57.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 1364815 part 2 - Follow-up to fix a typo. r=me MozReview-Commit-ID: 1sdmYFuIyUS
layout/generic/nsIFrame.h
layout/generic/nsQueryFrame.h
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -708,16 +708,17 @@ protected:
    *
    * @param  aDestructRoot is the root of the subtree being destroyed
    */
   virtual void DestroyFrom(nsIFrame* aDestructRoot) = 0;
   friend class nsFrameList; // needed to pass aDestructRoot through to children
   friend class nsLineBox;   // needed to pass aDestructRoot through to children
   friend class nsContainerFrame; // needed to pass aDestructRoot through to children
   friend class nsFrame; // need to assign mParent
+  template<class Source> friend class do_QueryFrameHelper; // to read mClass
 public:
 
   /**
    * Get the content object associated with this frame. Does not add a reference.
    */
   nsIContent* GetContent() const { return mContent; }
 
   /**
--- a/layout/generic/nsQueryFrame.h
+++ b/layout/generic/nsQueryFrame.h
@@ -120,17 +120,17 @@ private:
     static Dst* QueryFrame(Src* aFrame) { return nullptr; }
   };
   
   // Specialization for any nsIFrame type to any nsIFrame type -- if the source
   // instance's mClass matches kFrameIID of the destination type then
   // downcasting is safe.
   template<class Src, class Dst>
   struct FastQueryFrame<Src, Dst,
-    typename mozilla::EnableIf<mozilla::IsBaseOf<nsIFrame, Src>::value>::type,
+    typename mozilla::EnableIf<mozilla::IsBaseOf<nsIFrame, Src>::value>::Type,
     typename mozilla::EnableIf<mozilla::IsBaseOf<nsIFrame, Dst>::value>::Type>
   {
     static Dst* QueryFrame(Src* aFrame) {
       return nsQueryFrame::FrameIID(aFrame->mClass) == Dst::kFrameIID ?
         reinterpret_cast<Dst*>(aFrame) : nullptr;
     }
   };