Commit Graph

28 Commits

Author SHA1 Message Date
Xidorn Quan
3e94568e76 Bug 1134432 part 2 - Fix basic inline min/pref isize calculation of ruby frames. r=dbaron 2015-02-22 00:39:33 +13:00
Xidorn Quan
99933f2774 Bug 1123917 part 2 - Make ruby-position only accept [over|under] instead of compound values. r=dholbert 2015-01-22 14:04:55 +11:00
Xidorn Quan
ee4bab57ee Bug 1055667 part 6 - Fix border/padding of ruby frame. r=dbaron 2015-01-15 20:02:11 +11:00
Xidorn Quan
98a904d484 Bug 1055667 part 5 - Make nsRubyFrame inherit nsInlineFrame. r=dbaron 2015-01-15 20:02:11 +11:00
Xidorn Quan
660e809d5e Bug 1055667 part 2 - Remove unnecessary param of SetBSizeFromFontMetrics. r=dbaron 2015-01-15 20:02:11 +11:00
Xidorn Quan
0549a155fe Bug 1055658 part 4 - Revert RubyReflowState. r=dbaron 2015-01-13 20:04:41 +11:00
Nigel Babu
2492f633d1 Backed out 4 changesets (bug 1055658) for M5 bustage on a CLOSED TREE
Backed out changeset 3cbd9323c896 (bug 1055658)
Backed out changeset 99e071295c42 (bug 1055658)
Backed out changeset 55119d19e4c5 (bug 1055658)
Backed out changeset e82f640cb53f (bug 1055658)
2015-01-12 10:43:11 +05:30
Xidorn Quan
cdb8162daf Bug 1055658 part 4 - Revert RubyReflowState. r=dbaron 2015-01-12 14:31:55 +11:00
Xidorn Quan
0f642d971e Bug 1069519 part 2 - Make line height calculation be aware of ruby annotations. r=dholbert 2015-01-08 16:02:41 +11:00
Xidorn Quan
3f6f4f97de Bug 1116688 - Always try to push children after reflowing an incomplete ruby segment. r=dbaron 2015-01-07 12:47:09 +11:00
Xidorn Quan
3117e03451 Bug 1116631 - Fix isize reservation of ruby base container. r=roc 2015-01-07 12:47:09 +11:00
Xidorn Quan
2dffaa6260 Bug 1116037 part 12 - Move mLineSize to RubyReflowState. r=dbaron 2014-12-30 11:20:10 +11:00
Xidorn Quan
6e53ba9ae1 Bug 1116037 part 11 - Add RubyReflowState for sharing states between ruby level boxes. r=dbaron 2014-12-30 11:16:30 +11:00
Xidorn Quan
5396f2a0da Bug 1116037 part 9 - Move ruby text container arrays to stack. r=dbaron 2014-12-30 09:56:34 +11:00
Xidorn Quan
bfef652852 Bug 1116037 part 1 - Move TextContainerIterator to RubyUtils. r=dbaron 2014-12-29 11:14:53 +11:00
Chris Peterson
e03dfa8804 Bug 1115264 - Fix -Wsometimes-uninitialized clang warning in nsRubyFrame.cpp. r=dholbert 2014-12-23 21:29:32 -08:00
Xidorn Quan
fbe96f708c Bug 1055665 part 4 - Position text containers according to ruby-position. r=dholbert 2014-12-17 19:42:32 +11:00
Ehsan Akhgari
360626e7bf Bug 1109705 - Fix more bad implicit constructors in layout; r=roc 2014-12-10 17:47:09 -05:00
Xidorn Quan
866c49eb53 Bug 1093998 - Make nsContainerFrame::CreateNextInFlow return the new frame instead of using an our param. r=dbaron 2014-12-01 22:03:57 -08:00
Xidorn Quan
71052dfdb0 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 15:52:50 +11:00
Xidorn Quan
79719630bd Bug 1052924 - Separate reflow code. r=dbaron 2014-11-26 15:52:50 +11:00
Xidorn Quan
9af29cff51 Bug 1052924 - Give rbc & rtc correct position. r=dbaron
Important changes:
  * Use line layout to reflow ruby base container
2014-11-26 15:52:49 +11:00
Xidorn Quan
4cfdc5a174 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 15:52:49 +11:00
Xidorn Quan
5d70e8a4b5 Bug 1052924 - Use unified enumerators to simplify code. r=dbaron 2014-11-26 15:52:48 +11:00
Xidorn Quan
26b5cb7aad Bug 1052924 - Rewrite pref isize and min isize computation. r=dbaron
Known regression:
This patch changes AppendTextContainer, and put aside text containers
which contain spanning annotations. This changes makes those text
containers not be reflowed by the current code. It will be fixed in
some later patch.
2014-11-26 15:52:48 +11:00
Susanna Bowen
2e41f7ff03 Bug 1030993 - Fix assertion failure in reftest css-ruby/ruby-whitespace-1.html. r=dbaron
Fixes the assertion failure with text:
"###!!! ASSERTION: Wrong line container
hint: '!aForFrame || (aLineContainer == FindLineContainer(aForFrame) ||
aLineContainer->GetType() == nsGkAtoms::rubyTextContainerFrame ||
(aLineContainer->GetType() == nsGkAtoms::letterFrame &&
aLineContainer->IsFloating()))', file
/home/sgbowen/builds/mozilla-central/layout/generic/nsTextFrame.cpp, line 1259"
which occasionally appears when opening pages with ruby or when running ruby
reftests.

Updates the manifest for ruby reftests to the current expectations (adjust
assertion counts, etc.)
2014-08-15 10:34:20 -07:00
Susanna Bowen
3c4a808a0e 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 10:34:20 -07:00
Susanna Bowen
2f81b02ca1 Bug 1021952 - Add ruby display values and ruby frames. r=dholbert,bz 2014-07-22 19:08:01 -07:00