From faf479d7789d02626d132f7f1706f9c26fdbea6f Mon Sep 17 00:00:00 2001 From: Cameron McCormack Date: Sat, 1 Jun 2019 08:03:32 +0000 Subject: [PATCH] Bug 1553731 - Part 1: Rename nsFrameIdList.h to FrameIdList.h. r=mats Differential Revision: https://phabricator.services.mozilla.com/D32603 --HG-- rename : layout/generic/nsFrameIdList.h => layout/generic/FrameIdList.h extra : moz-landing-system : lando --- dom/base/nsWindowMemoryReporter.cpp | 4 ++-- dom/base/nsWindowSizes.h | 8 ++++---- layout/base/nsPresArena.cpp | 2 +- layout/generic/{nsFrameIdList.h => FrameIdList.h} | 0 layout/generic/moz.build | 2 +- layout/generic/nsFrame.cpp | 8 ++++---- layout/generic/nsIFrame.h | 6 +++--- layout/generic/nsQueryFrame.h | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) rename layout/generic/{nsFrameIdList.h => FrameIdList.h} (100%) diff --git a/dom/base/nsWindowMemoryReporter.cpp b/dom/base/nsWindowMemoryReporter.cpp index ec49931bfc8d..dd9c60950b78 100644 --- a/dom/base/nsWindowMemoryReporter.cpp +++ b/dom/base/nsWindowMemoryReporter.cpp @@ -448,7 +448,7 @@ static void CollectWindowReports(nsGlobalWindowInner* aWindow, aWindowTotalSizes->mArenaSizes.NS_ARENA_SIZES_FIELD(classname) += size; \ } #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID @@ -657,7 +657,7 @@ nsWindowMemoryReporter::CollectReports(nsIHandleReportCallback* aHandleReport, #define FRAME_ID(classname, ...) \ frameTotal += windowTotalSizes.mArenaSizes.NS_ARENA_SIZES_FIELD(classname); #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID diff --git a/dom/base/nsWindowSizes.h b/dom/base/nsWindowSizes.h index 18280c9f149d..e45d712f2843 100644 --- a/dom/base/nsWindowSizes.h +++ b/dom/base/nsWindowSizes.h @@ -96,7 +96,7 @@ struct nsArenaSizes { : FOR_EACH_SIZE(ZERO_SIZE) #define FRAME_ID(classname, ...) NS_ARENA_SIZES_FIELD(classname)(0), #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID @@ -109,7 +109,7 @@ struct nsArenaSizes { #define FRAME_ID(classname, ...) \ aSizes->add(nsTabSizes::Other, NS_ARENA_SIZES_FIELD(classname)); #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID } @@ -121,7 +121,7 @@ struct nsArenaSizes { #define FRAME_ID(classname, ...) total += NS_ARENA_SIZES_FIELD(classname); #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID @@ -132,7 +132,7 @@ struct nsArenaSizes { #define FRAME_ID(classname, ...) size_t NS_ARENA_SIZES_FIELD(classname); #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID diff --git a/layout/base/nsPresArena.cpp b/layout/base/nsPresArena.cpp index 625556f0dab3..9b43e56d5c38 100644 --- a/layout/base/nsPresArena.cpp +++ b/layout/base/nsPresArena.cpp @@ -149,7 +149,7 @@ void nsPresArena::AddSizeOfExcludingThis( aSizes.mArenaSizes.NS_ARENA_SIZES_FIELD(classname) += totalSize; \ break; #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID case eArenaObjectID_nsLineBox: diff --git a/layout/generic/nsFrameIdList.h b/layout/generic/FrameIdList.h similarity index 100% rename from layout/generic/nsFrameIdList.h rename to layout/generic/FrameIdList.h diff --git a/layout/generic/moz.build b/layout/generic/moz.build index 3bd987564d86..25d802af4b4a 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -96,7 +96,6 @@ EXPORTS += [ 'nsContainerFrame.h', 'nsDirection.h', 'nsFrame.h', - 'nsFrameIdList.h', 'nsFrameList.h', 'nsFrameSelection.h', 'nsFrameState.h', @@ -138,6 +137,7 @@ EXPORTS.mozilla += [ 'ColumnUtils.h', 'CSSAlignUtils.h', 'CSSOrderAwareFrameIterator.h', + 'FrameIdList.h', 'FrameTypeList.h', 'ReflowInput.h', 'ReflowOutput.h', diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index ab6d4e6faf94..e1c1dc036854 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -130,13 +130,13 @@ typedef nsAbsoluteContainingBlock::AbsPosReflowFlags AbsPosReflowFlags; const mozilla::LayoutFrameType nsIFrame::sLayoutFrameTypes[ #define FRAME_ID(...) 1 + #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID 0] = { #define FRAME_ID(class_, type_, ...) mozilla::LayoutFrameType::type_, #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID }; @@ -144,7 +144,7 @@ const mozilla::LayoutFrameType nsIFrame::sLayoutFrameTypes[ const nsIFrame::FrameClassBits nsIFrame::sFrameClassBits[ #define FRAME_ID(...) 1 + #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID 0] = { @@ -153,7 +153,7 @@ const nsIFrame::FrameClassBits nsIFrame::sFrameClassBits[ #define DynamicLeaf eFrameClassBitsDynamicLeaf #define FRAME_ID(class_, type_, leaf_, ...) leaf_, #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef Leaf #undef NotLeaf #undef DynamicLeaf diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index 4728bee69135..4800e8960f33 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -4199,7 +4199,7 @@ class nsIFrame : public nsQueryFrame { /** * To be overridden by frame classes that have a varying IsLeaf() state and - * is indicating that with DynamicLeaf in nsFrameIdList.h. + * is indicating that with DynamicLeaf in FrameIdList.h. * @see IsLeaf() */ virtual bool IsLeafDynamic() const { return false; } @@ -4551,7 +4551,7 @@ class nsIFrame : public nsQueryFrame { static const mozilla::LayoutFrameType sLayoutFrameTypes[ #define FRAME_ID(...) 1 + #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID 0]; @@ -4565,7 +4565,7 @@ class nsIFrame : public nsQueryFrame { static const FrameClassBits sFrameClassBits[ #define FRAME_ID(...) 1 + #define ABSTRACT_FRAME_ID(...) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID 0]; diff --git a/layout/generic/nsQueryFrame.h b/layout/generic/nsQueryFrame.h index 8a3fdc4c8cdf..81186169a068 100644 --- a/layout/generic/nsQueryFrame.h +++ b/layout/generic/nsQueryFrame.h @@ -66,7 +66,7 @@ class nsQueryFrame { enum FrameIID { #define FRAME_ID(classname, ...) classname##_id, #define ABSTRACT_FRAME_ID(classname) classname##_id, -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID @@ -80,7 +80,7 @@ class nsQueryFrame { enum class ClassID : uint8_t { #define FRAME_ID(classname, ...) classname##_id, #define ABSTRACT_FRAME_ID(classname) -#include "nsFrameIdList.h" +#include "mozilla/FrameIdList.h" #undef FRAME_ID #undef ABSTRACT_FRAME_ID };