Fix virtual dtor warning, no bug, blanket r=bz
authorDavid Zbarsky <dzbarsky@gmail.com>
Wed, 26 Sep 2012 14:30:34 -0400
changeset 108165 403ebae0552f5323e5578746bfd23a3d327e58fa
parent 108164 b9721197c2211052051b7d38f0a0c9840330b629
child 108166 fc709862314527c065e2a976a55fd77b7d2963ff
push id23539
push userryanvm@gmail.com
push dateWed, 26 Sep 2012 22:55:55 +0000
treeherdermozilla-central@ec079fd92224 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
milestone18.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
Fix virtual dtor warning, no bug, blanket r=bz
layout/generic/nsFrame.cpp
xpcom/base/nsMemoryReporterManager.cpp
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -971,24 +971,26 @@ nsIFrame::GetPaddingRect() const
 
 bool
 nsIFrame::IsTransformed() const
 {
   return ((mState & NS_FRAME_MAY_BE_TRANSFORMED) &&
           (GetStyleDisplay()->HasTransform() ||
            IsSVGTransformed() ||
            (mContent &&
+            mContent->GetPrimaryFrame() == this &&
             nsLayoutUtils::HasAnimationsForCompositor(mContent,
                                                       eCSSProperty_transform))));
 }
 
 bool
 nsIFrame::HasOpacity() const
 {
   return GetStyleDisplay()->mOpacity < 1.0f || (mContent &&
+           mContent->GetPrimaryFrame() == this &&
            nsLayoutUtils::HasAnimationsForCompositor(mContent,
                                                      eCSSProperty_opacity));
 }
 
 bool
 nsIFrame::IsSVGTransformed(gfxMatrix *aOwnTransforms,
                            gfxMatrix *aFromParentTransforms) const
 {
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -974,17 +974,17 @@ DumpReport(nsIFileOutputStream *aOStream
     description.ReplaceSubstring("\n", "\\n");     // <newline> --> \n
     DUMP(aOStream, ", \"description\": \"");
     DUMP(aOStream, description.get());
     DUMP(aOStream, "\"}");
 
     return NS_OK;
 }
 
-class DumpMultiReporterCallback : public nsIMemoryMultiReporterCallback
+class DumpMultiReporterCallback MOZ_FINAL : public nsIMemoryMultiReporterCallback
 {
 public:
     NS_DECL_ISUPPORTS
 
     NS_IMETHOD Callback(const nsACString &aProcess, const nsACString &aPath,
                         int32_t aKind, int32_t aUnits, int64_t aAmount,
                         const nsACString &aDescription,
                         nsISupports *aData)