Bug 1277129 Part 2b - Rename nsBlockReflowState.h/cpp to BlockReflowInput.h/cpp and fix #includes.
The #includes are fixed by the following script:
function rename() {
find .\
-type f\
! -path "./obj*"\
! -path "./.git"\
! -path "./.hg"\
\( -name "*.cpp" -or\
-name "*.h" \)\
-exec sed -i -e "s/$1/$2/g" "{}" \;
}
rename "nsBlockReflowState\.h" "mozilla\/BlockReflowInput\.h"
MozReview-Commit-ID: Bwz1AbhHsIs
rename from layout/generic/nsBlockReflowState.cpp
rename to layout/generic/BlockReflowInput.cpp
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/BlockReflowInput.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
// vim:cindent:ts=2:et:sw=2:
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* state used in reflow of block frames */
-#include "nsBlockReflowState.h"
+#include "mozilla/BlockReflowInput.h"
#include "LayoutLogging.h"
#include "nsBlockFrame.h"
#include "nsLineLayout.h"
#include "nsPresContext.h"
#include "nsIFrameInlines.h"
#include "mozilla/AutoRestore.h"
#include "mozilla/DebugOnly.h"
rename from layout/generic/nsBlockReflowState.h
rename to layout/generic/BlockReflowInput.h
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -96,38 +96,39 @@ EXPORTS += [
'RubyUtils.h',
'ScrollbarActivity.h',
'ScrollSnap.h',
'Visibility.h',
'VisibilityIPC.h',
]
EXPORTS.mozilla += [
+ 'BlockReflowInput.h',
'ReflowInput.h',
'WritingModes.h',
]
EXPORTS.mozilla.dom += [
'Selection.h',
]
EXPORTS.mozilla.layout += [
'FrameChildList.h',
]
UNIFIED_SOURCES += [
'AsyncScrollBase.cpp',
+ 'BlockReflowInput.cpp',
'DetailsFrame.cpp',
'FrameChildList.cpp',
'MathMLTextRunFactory.cpp',
'nsAbsoluteContainingBlock.cpp',
'nsBackdropFrame.cpp',
'nsBlockFrame.cpp',
'nsBlockReflowContext.cpp',
- 'nsBlockReflowState.cpp',
'nsBRFrame.cpp',
'nsBulletFrame.cpp',
'nsCanvasFrame.cpp',
'nsColumnSetFrame.cpp',
'nsContainerFrame.cpp',
'nsFirstLetterFrame.cpp',
'nsFlexContainerFrame.cpp',
'nsFloatManager.cpp',
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -13,17 +13,17 @@
#include "mozilla/DebugOnly.h"
#include "mozilla/Maybe.h"
#include "mozilla/UniquePtr.h"
#include "nsCOMPtr.h"
#include "nsAbsoluteContainingBlock.h"
#include "nsBlockReflowContext.h"
-#include "nsBlockReflowState.h"
+#include "mozilla/BlockReflowInput.h"
#include "nsBulletFrame.h"
#include "nsFontMetrics.h"
#include "nsLineBox.h"
#include "nsLineLayout.h"
#include "nsPlaceholderFrame.h"
#include "nsStyleConsts.h"
#include "nsFrameManager.h"
#include "nsPresContext.h"
--- a/layout/generic/nsBlockReflowContext.cpp
+++ b/layout/generic/nsBlockReflowContext.cpp
@@ -2,17 +2,17 @@
// vim:cindent:ts=2:et:sw=2:
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* class that a parent frame uses to reflow a block frame */
#include "nsBlockReflowContext.h"
-#include "nsBlockReflowState.h"
+#include "mozilla/BlockReflowInput.h"
#include "nsFloatManager.h"
#include "nsColumnSetFrame.h"
#include "nsContainerFrame.h"
#include "nsBlockFrame.h"
#include "nsLineBox.h"
#include "nsLayoutUtils.h"
using namespace mozilla;
--- a/layout/generic/nsLineLayout.h
+++ b/layout/generic/nsLineLayout.h
@@ -15,17 +15,17 @@
/* state and methods used while laying out a single line of a block frame */
#ifndef nsLineLayout_h___
#define nsLineLayout_h___
#include "gfxTypes.h"
#include "JustificationUtils.h"
#include "mozilla/WritingModes.h"
-#include "nsBlockReflowState.h"
+#include "mozilla/BlockReflowInput.h"
#include "nsLineBox.h"
#include "plarena.h"
class nsFloatManager;
struct nsStyleText;
class nsLineLayout {
using nsBlockReflowState = mozilla::nsBlockReflowState;