Commit Graph

31 Commits

Author SHA1 Message Date
Xidorn Quan
59d1864c8a Bug 1141931 part 7 - Move [Auto]RubyTextContainerArray to RubyUtils and merge RubyTextContainerIterator into AutoRubyTextContainerArray. r=dholbert
--HG--
extra : source : 89ae2f9a195fe10f4db19d0a51fd3ec7bafb0ecc
2015-04-08 11:22:34 +12:00
Xidorn Quan
966ef97045 Bug 1141931 part 6 - Move Ruby{Segment,Column}Enumerator to RubyUtils. r=dholbert
--HG--
extra : source : 2327584c7a0740617388bc544d2bb8433d034fe7
2015-04-08 11:22:34 +12:00
Xidorn Quan
ddd0a788fa Bug 1141931 part 5 - Eliminate unnecessary includes in header files of ruby frames. r=dholbert
--HG--
extra : source : 860c66b5f319ed0744decf84c8c2145efd85ce83
2015-04-08 11:22:34 +12:00
Wes Kocher
74f58c915e Backed out 10 changesets (bug 1141931) for mochitest-5 failures CLOSED TREE
Backed out changeset c90940067de6 (bug 1141931)
Backed out changeset 96b48288abab (bug 1141931)
Backed out changeset 87281c7ded34 (bug 1141931)
Backed out changeset 6a914ba0b8ec (bug 1141931)
Backed out changeset 9cfea55b5e95 (bug 1141931)
Backed out changeset f432612b6475 (bug 1141931)
Backed out changeset 48cf9568a4b1 (bug 1141931)
Backed out changeset f1ab848b3fa6 (bug 1141931)
Backed out changeset 8a3c71a3b525 (bug 1141931)
Backed out changeset 119d3c0fd0f6 (bug 1141931)
2015-04-07 14:23:57 -07:00
Xidorn Quan
53a7f5a9f8 Bug 1141931 part 7 - Move [Auto]RubyTextContainerArray to RubyUtils and merge RubyTextContainerIterator into AutoRubyTextContainerArray. r=dholbert
--HG--
extra : source : 89ae2f9a195fe10f4db19d0a51fd3ec7bafb0ecc
2015-04-08 08:40:31 +12:00
Xidorn Quan
1bbf61d898 Bug 1141931 part 6 - Move Ruby{Segment,Column}Enumerator to RubyUtils. r=dholbert
--HG--
extra : source : 2327584c7a0740617388bc544d2bb8433d034fe7
2015-04-08 08:40:31 +12:00
Xidorn Quan
27d78f6b41 Bug 1141931 part 5 - Eliminate unnecessary includes in header files of ruby frames. r=dholbert
--HG--
extra : source : 860c66b5f319ed0744decf84c8c2145efd85ce83
2015-04-08 08:40:31 +12:00
Ehsan Akhgari
883849ee32 Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj
This patch was automatically generated using the following script:

function convert() {
echo "Converting $1 to $2..."
find . \
       ! -wholename "*/.git*" \
       ! -wholename "obj-ff-dbg*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_OVERRIDE override
convert MOZ_FINAL final
2015-03-21 12:28:04 -04:00
Xidorn Quan
7969797ad3 Bug 1055658 part 4 - Revert RubyReflowState. r=dbaron
--HG--
extra : source : 27e60ddbd077439dadd09641ab54fc7eef09c69f
2015-01-13 20:04:41 +11:00
Nigel Babu
053a7d3408 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
6ba35e648b Bug 1055658 part 4 - Revert RubyReflowState. r=dbaron
--HG--
extra : source : 27e60ddbd077439dadd09641ab54fc7eef09c69f
2015-01-12 14:31:55 +11:00
Xidorn Quan
3013e06e68 Bug 1116037 part 11 - Add RubyReflowState for sharing states between ruby level boxes. r=dbaron
--HG--
extra : source : c4f342ece9c1548053348dbc317d9857cbe790b6
2014-12-30 11:16:30 +11:00
Xidorn Quan
09350f0596 Bug 1116037 part 10 - Remove mColumnCount from nsRubyBaseContainerFrame. r=dbaron
--HG--
extra : source : 36096895ec5437c5f9cf6c97d6085bfeae8654c7
2014-12-30 10:05:54 +11:00
Xidorn Quan
eb1ae2b722 Bug 1116037 part 9 - Move ruby text container arrays to stack. r=dbaron
--HG--
extra : source : 6c5d7212c3f8c355b4667aa46024dfef0710ca8e
2014-12-30 09:56:34 +11:00
Xidorn Quan
62bf8b83b1 Bug 1116037 part 8 - Merge two ruby text container arrays. r=dbaron
--HG--
extra : source : 2b3f8e1951d924c14c94c06a44012837b51a04ad
2014-12-30 09:44:12 +11:00
Xidorn Quan
a33cdf1a4e Bug 1116037 part 6 - Use a single struct to represent ruby column. r=dbaron
--HG--
extra : source : 7b927cec3f77e194b37de15e3a5b93aa70925d3c
2014-12-29 15:22:19 +11:00
Xidorn Quan
c7868a4f13 Bug 1116037 part 5 - Use unified struct for ruby reflow states. r=dbaron
--HG--
extra : source : 1c4bb2775ab5e26f34fb260daf12afdf86debe30
2014-12-29 15:03:38 +11:00
Xidorn Quan
259342b408 Bug 1116037 part 4 - Remove useless parameters in ruby reflow methods. r=dbaron
--HG--
extra : source : d712ee74e0f33f39b103e88753587559d0a0e9ed
2014-12-29 14:46:24 +11:00
Xidorn Quan
b48d600a85 Bug 1116037 part 3 - Use ruby "column" instead of "pair" to match the spec term. r=dbaron
--HG--
extra : source : a7e31ed3d8d6933631729f014efb546844c84586
2014-12-29 14:30:00 +11:00
Xidorn Quan
17c1355146 Bug 1098272 part 6 - Check whether line break is allowed in ruby. r=dbaron
--HG--
extra : rebase_source : e016ab26fa8c22568d2310c17f34c4e1013373a2
extra : source : 7899fcd7c6f9059fdbf7417274f9181ed71d1e50
2014-12-22 16:52:30 +11:00
Xidorn Quan
4f414b3c98 Bug 1098272 part 4 - Remove unused parameter of nsRubyBaseContainerFrame::ReflowSpans. r=dbaron
--HG--
extra : rebase_source : ae32a99dbaf9faaad19f54ebba6e8d2e49a955a7
extra : source : 99bbfb3dce962504d1014e632c4b4b7f19a00276
2014-12-22 16:32:14 +11:00
Xidorn Quan
e464df4013 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
5f4cd8dd0b Bug 1052924 - Separate reflow code. r=dbaron 2014-11-26 15:52:50 +11:00
Xidorn Quan
43f5510c25 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
d25178b0db 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
c25136319a 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 15:52:49 +11:00
Xidorn Quan
9b0f833e9c 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
Ehsan Akhgari
60360fc645 Bug 1060985 - Fix more bad implicit constructors in layout; r=roc 2014-08-31 23:36:37 -04:00
Susanna Bowen
c622b18e05 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
779f8cef59 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
a3e95afeef Bug 1021952 - Add ruby display values and ruby frames. r=dholbert,bz 2014-07-22 19:08:01 -07:00