зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1098272 part 4 - Remove unused parameter of nsRubyBaseContainerFrame::ReflowSpans. r=dbaron
--HG-- extra : rebase_source : ae32a99dbaf9faaad19f54ebba6e8d2e49a955a7 extra : source : 99bbfb3dce962504d1014e632c4b4b7f19a00276
This commit is contained in:
Родитель
91630ffe11
Коммит
4f414b3c98
|
@ -362,10 +362,7 @@ nsRubyBaseContainerFrame::Reflow(nsPresContext* aPresContext,
|
|||
NS_FRAME_IS_COMPLETE(aStatus) && !mSpanContainers.IsEmpty()) {
|
||||
// Reflow spans
|
||||
nscoord spanISize = ReflowSpans(aPresContext, aReflowState,
|
||||
spanReflowStates, aStatus);
|
||||
// ReflowSpans never reports break or incomplete, but we still need
|
||||
// to check if it exceed the line.
|
||||
MOZ_ASSERT(aStatus == NS_FRAME_COMPLETE);
|
||||
spanReflowStates);
|
||||
if (isize < spanISize) {
|
||||
nscoord delta = spanISize - isize;
|
||||
if (ShouldBreakBefore(aReflowState, delta)) {
|
||||
|
@ -650,8 +647,7 @@ nsRubyBaseContainerFrame::PullOnePair(nsLineLayout* aLineLayout,
|
|||
nscoord
|
||||
nsRubyBaseContainerFrame::ReflowSpans(nsPresContext* aPresContext,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsTArray<nsHTMLReflowState*>& aReflowStates,
|
||||
nsReflowStatus& aStatus)
|
||||
nsTArray<nsHTMLReflowState*>& aReflowStates)
|
||||
{
|
||||
WritingMode lineWM = aReflowState.mLineLayout->GetWritingMode();
|
||||
const uint32_t spanCount = mSpanContainers.Length();
|
||||
|
|
|
@ -92,8 +92,7 @@ protected:
|
|||
|
||||
nscoord ReflowSpans(nsPresContext* aPresContext,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsTArray<nsHTMLReflowState*>& aReflowStates,
|
||||
nsReflowStatus& aStatus);
|
||||
nsTArray<nsHTMLReflowState*>& aReflowStates);
|
||||
|
||||
struct PullFrameState;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче