Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-20 17:20:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1553731 - Part 1: Rename nsFrameIdList.h to FrameIdList.h. r=mats

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D32603

--HG--
rename : layout/generic/nsFrameIdList.h => layout/generic/FrameIdList.h
extra : moz-landing-system : lando
This commit is contained in:
Cameron McCormack 2019-06-01 01:04:44 +00:00
parent 112bcc43db
commit c4adc9d346
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/base/nsWindowMemoryReporter.cpp
View File

@ -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

8
dom/base/nsWindowSizes.h
View File

@ -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

2
layout/base/nsPresArena.cpp
View File

@ -149,7 +149,7 @@ void nsPresArena<ArenaSize>::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:

0
layout/generic/nsFrameIdList.h → layout/generic/FrameIdList.h
View File

2
layout/generic/moz.build
View File

@ -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',

8
layout/generic/nsFrame.cpp
View File

@ -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

6
layout/generic/nsIFrame.h
View File

@ -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];

4
layout/generic/nsQueryFrame.h
View File

@ -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
};