Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 01:35:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7368bd2654
gecko-dev/layout/generic/nsRubyTextContainerFrame.cpp

85 lines
2.6 KiB
C++
Raw Normal View History

Bug 1021952 - Add ruby display values and ruby frames. r=dholbert,bz
2014-07-23 02:08:01 +00:00
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
/* rendering object for CSS "display: ruby-text-container" */
#include "nsRubyTextContainerFrame.h"
#include "nsPresContext.h"
#include "nsStyleContext.h"
Bug 1030993 - Basic reflow implementation for ruby frame classes. r=dbaron To account for spacing between bases or text boxes during reflow, the line layout which manages the bases updates its inline direction coordinate based on the preferred inline size for the corresponding text boxes. Next, the base is reflowed at the correct inline coordinate. Each paired text box is then also reflowed at the proper inline position determined by (1) the current position of its corresponding base and (2) its own preferred width. In computing intrinsic widths, accounting for spacing is less complicated. The minimum intrinsic width is the width of the widest ruby column, and the preferred intrinsic width is the sum of all the ruby column widths. Each ruby column width is the maximum width of its base box and text boxes. These individual widths are determined using GetPrefISize on the base and text boxes. Ruby base container frames store a list of pointers to the ruby text container frames in the segment they denote. This list of pointers is created in the ruby frame reflow method before calling the reflow method for the ruby base container. The list exists and is used only during reflow of the main ruby frame and is cleared before returning from reflow.
2014-08-15 17:34:20 +00:00
#include "WritingModes.h"
#include "mozilla/UniquePtr.h"
Bug 1021952 - Add ruby display values and ruby frames. r=dholbert,bz
2014-07-23 02:08:01 +00:00
Bug 1052924 - Rewrite reflow code. r=dbaron Important changes: * Avoid using GetPrefISize on the ruby texts in nsRubyBaseContainerFrame::Reflow, since the size it produces might not match the size produced by Reflow. The old code calls that on all the ruby texts to determine how big they are, then reflows all the ruby bases, and then reflows all the ruby texts. The new code instead processes one pair at a time, and for each pair reflows the ruby texts and then the ruby base. * Change the base class of nsRubyTextContainerFrame from nsBlockFrame to nsContainerFrame, and stop constructing an nsBlockReflowState for its reflow. * Move the code for reflowing ruby texts from nsRubyTextContainerFrame and to nsRubyBaseContainerFrame. * Fix the regression that ruby text containers contain span are not reflowed properly. It is the regression introduced in patch 0. Known regression: * This patch drops centering ruby base and annotation in pairs. This should be fixed in bug 1055676 (ruby-align).
2014-11-26 04:52:49 +00:00
using namespace mozilla;
Bug 1021952 - Add ruby display values and ruby frames. r=dholbert,bz
2014-07-23 02:08:01 +00:00
//----------------------------------------------------------------------
// Frame class boilerplate
// =======================
NS_QUERYFRAME_HEAD(nsRubyTextContainerFrame)
NS_QUERYFRAME_ENTRY(nsRubyTextContainerFrame)
Bug 1052924 - Rewrite reflow code. r=dbaron Important changes: * Avoid using GetPrefISize on the ruby texts in nsRubyBaseContainerFrame::Reflow, since the size it produces might not match the size produced by Reflow. The old code calls that on all the ruby texts to determine how big they are, then reflows all the ruby bases, and then reflows all the ruby texts. The new code instead processes one pair at a time, and for each pair reflows the ruby texts and then the ruby base. * Change the base class of nsRubyTextContainerFrame from nsBlockFrame to nsContainerFrame, and stop constructing an nsBlockReflowState for its reflow. * Move the code for reflowing ruby texts from nsRubyTextContainerFrame and to nsRubyBaseContainerFrame. * Fix the regression that ruby text containers contain span are not reflowed properly. It is the regression introduced in patch 0. Known regression: * This patch drops centering ruby base and annotation in pairs. This should be fixed in bug 1055676 (ruby-align).
2014-11-26 04:52:49 +00:00
NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame)
Bug 1021952 - Add ruby display values and ruby frames. r=dholbert,bz
2014-07-23 02:08:01 +00:00
NS_IMPL_FRAMEARENA_HELPERS(nsRubyTextContainerFrame)
nsContainerFrame*
NS_NewRubyTextContainerFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext)
{
return new (aPresShell) nsRubyTextContainerFrame(aContext);
}
//----------------------------------------------------------------------
// nsRubyTextContainerFrame Method Implementations
// ===============================================
nsIAtom*
nsRubyTextContainerFrame::GetType() const
{
return nsGkAtoms::rubyTextContainerFrame;
}
#ifdef DEBUG_FRAME_DUMP
nsresult
nsRubyTextContainerFrame::GetFrameName(nsAString& aResult) const
{
return MakeFrameName(NS_LITERAL_STRING("RubyTextContainer"), aResult);
}
#endif
Bug 1030993 - Basic reflow implementation for ruby frame classes. r=dbaron To account for spacing between bases or text boxes during reflow, the line layout which manages the bases updates its inline direction coordinate based on the preferred inline size for the corresponding text boxes. Next, the base is reflowed at the correct inline coordinate. Each paired text box is then also reflowed at the proper inline position determined by (1) the current position of its corresponding base and (2) its own preferred width. In computing intrinsic widths, accounting for spacing is less complicated. The minimum intrinsic width is the width of the widest ruby column, and the preferred intrinsic width is the sum of all the ruby column widths. Each ruby column width is the maximum width of its base box and text boxes. These individual widths are determined using GetPrefISize on the base and text boxes. Ruby base container frames store a list of pointers to the ruby text container frames in the segment they denote. This list of pointers is created in the ruby frame reflow method before calling the reflow method for the ruby base container. The list exists and is used only during reflow of the main ruby frame and is cleared before returning from reflow.
2014-08-15 17:34:20 +00:00
Bug 1052924 - Resolve some warnings. r=dbaron Important changes: * Change base class of nsRuby{Base,Text}Frame to nsInlineFrame * Make ComputeSize of nsRubyFrame and nsRubyBaseContainerFrame behavior like inline frames
2014-11-26 04:52:49 +00:00
/* virtual */ bool
nsRubyTextContainerFrame::IsFrameOfType(uint32_t aFlags) const
{
if (aFlags & eSupportsCSSTransforms) {
return false;
}
return nsRubyTextContainerFrameSuper::IsFrameOfType(aFlags);
}
Bug 1030993 - Basic reflow implementation for ruby frame classes. r=dbaron To account for spacing between bases or text boxes during reflow, the line layout which manages the bases updates its inline direction coordinate based on the preferred inline size for the corresponding text boxes. Next, the base is reflowed at the correct inline coordinate. Each paired text box is then also reflowed at the proper inline position determined by (1) the current position of its corresponding base and (2) its own preferred width. In computing intrinsic widths, accounting for spacing is less complicated. The minimum intrinsic width is the width of the widest ruby column, and the preferred intrinsic width is the sum of all the ruby column widths. Each ruby column width is the maximum width of its base box and text boxes. These individual widths are determined using GetPrefISize on the base and text boxes. Ruby base container frames store a list of pointers to the ruby text container frames in the segment they denote. This list of pointers is created in the ruby frame reflow method before calling the reflow method for the ruby base container. The list exists and is used only during reflow of the main ruby frame and is cleared before returning from reflow.
2014-08-15 17:34:20 +00:00
/* virtual */ void
nsRubyTextContainerFrame::Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
DO_GLOBAL_REFLOW_COUNT("nsRubyTextContainerFrame");
DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
Bug 1052924 - Implement basic line breaking for ruby. r=dbaron Known problem: It would cause infinite loop if there is any line break happens inside ruby base or annotation, or the width of container is not enough for the widest pair/span. This might be fixed in bug 1098272.
2014-11-26 04:52:50 +00:00
// All rt children have already been reflowed. All we need to do is
Bug 1055665 part 3 - Position ruby annotations and set the line size of them correctly. r=dholbert --HG-- extra : source : c4dff2a39c852a249a5ff6e929780d898ba956ac
2014-12-09 06:47:26 +00:00
// to report complete and return the desired size provided by the
// ruby base container.
Bug 1030993 - Basic reflow implementation for ruby frame classes. r=dbaron To account for spacing between bases or text boxes during reflow, the line layout which manages the bases updates its inline direction coordinate based on the preferred inline size for the corresponding text boxes. Next, the base is reflowed at the correct inline coordinate. Each paired text box is then also reflowed at the proper inline position determined by (1) the current position of its corresponding base and (2) its own preferred width. In computing intrinsic widths, accounting for spacing is less complicated. The minimum intrinsic width is the width of the widest ruby column, and the preferred intrinsic width is the sum of all the ruby column widths. Each ruby column width is the maximum width of its base box and text boxes. These individual widths are determined using GetPrefISize on the base and text boxes. Ruby base container frames store a list of pointers to the ruby text container frames in the segment they denote. This list of pointers is created in the ruby frame reflow method before calling the reflow method for the ruby base container. The list exists and is used only during reflow of the main ruby frame and is cleared before returning from reflow.
2014-08-15 17:34:20 +00:00
Bug 1052924 - Implement basic line breaking for ruby. r=dbaron Known problem: It would cause infinite loop if there is any line break happens inside ruby base or annotation, or the width of container is not enough for the widest pair/span. This might be fixed in bug 1098272.
2014-11-26 04:52:50 +00:00
// Although a ruby text container may have continuations, returning
// NS_FRAME_COMPLETE here is still safe, since its parent, ruby frame,
// ignores the status, and continuations of the ruby base container
// will take care of our continuations.
Bug 1030993 - Basic reflow implementation for ruby frame classes. r=dbaron To account for spacing between bases or text boxes during reflow, the line layout which manages the bases updates its inline direction coordinate based on the preferred inline size for the corresponding text boxes. Next, the base is reflowed at the correct inline coordinate. Each paired text box is then also reflowed at the proper inline position determined by (1) the current position of its corresponding base and (2) its own preferred width. In computing intrinsic widths, accounting for spacing is less complicated. The minimum intrinsic width is the width of the widest ruby column, and the preferred intrinsic width is the sum of all the ruby column widths. Each ruby column width is the maximum width of its base box and text boxes. These individual widths are determined using GetPrefISize on the base and text boxes. Ruby base container frames store a list of pointers to the ruby text container frames in the segment they denote. This list of pointers is created in the ruby frame reflow method before calling the reflow method for the ruby base container. The list exists and is used only during reflow of the main ruby frame and is cleared before returning from reflow.
2014-08-15 17:34:20 +00:00
aStatus = NS_FRAME_COMPLETE;
Bug 1052924 - Rewrite reflow code. r=dbaron Important changes: * Avoid using GetPrefISize on the ruby texts in nsRubyBaseContainerFrame::Reflow, since the size it produces might not match the size produced by Reflow. The old code calls that on all the ruby texts to determine how big they are, then reflows all the ruby bases, and then reflows all the ruby texts. The new code instead processes one pair at a time, and for each pair reflows the ruby texts and then the ruby base. * Change the base class of nsRubyTextContainerFrame from nsBlockFrame to nsContainerFrame, and stop constructing an nsBlockReflowState for its reflow. * Move the code for reflowing ruby texts from nsRubyTextContainerFrame and to nsRubyBaseContainerFrame. * Fix the regression that ruby text containers contain span are not reflowed properly. It is the regression introduced in patch 0. Known regression: * This patch drops centering ruby base and annotation in pairs. This should be fixed in bug 1055676 (ruby-align).
2014-11-26 04:52:49 +00:00
WritingMode lineWM = aReflowState.mLineLayout->GetWritingMode();
Bug 1055665 part 3 - Position ruby annotations and set the line size of them correctly. r=dholbert --HG-- extra : source : c4dff2a39c852a249a5ff6e929780d898ba956ac
2014-12-09 06:47:26 +00:00
aDesiredSize.SetSize(lineWM, mLineSize);
Bug 1030993 - Basic reflow implementation for ruby frame classes. r=dbaron To account for spacing between bases or text boxes during reflow, the line layout which manages the bases updates its inline direction coordinate based on the preferred inline size for the corresponding text boxes. Next, the base is reflowed at the correct inline coordinate. Each paired text box is then also reflowed at the proper inline position determined by (1) the current position of its corresponding base and (2) its own preferred width. In computing intrinsic widths, accounting for spacing is less complicated. The minimum intrinsic width is the width of the widest ruby column, and the preferred intrinsic width is the sum of all the ruby column widths. Each ruby column width is the maximum width of its base box and text boxes. These individual widths are determined using GetPrefISize on the base and text boxes. Ruby base container frames store a list of pointers to the ruby text container frames in the segment they denote. This list of pointers is created in the ruby frame reflow method before calling the reflow method for the ruby base container. The list exists and is used only during reflow of the main ruby frame and is cleared before returning from reflow.
2014-08-15 17:34:20 +00:00
}
Reference in New Issue Copy Permalink