Commit Graph

13 Commits

Author SHA1 Message Date
Ed Morley
22d9b9afc4 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-06-06 09:20:35 +01:00
Scott Johnson
6c704020bd Bug 749186, Followup Patch 1: Cache font inflation settings in pres shell to prevent crash. [r=dbaron]
--HG--
extra : rebase_source : dc8b8f66bcd49c54ecefdf94793100b7901e6f3b
2012-06-05 22:47:33 -05:00
L. David Baron
27336e662d Fix two pieces of cached information that were preventing font size inflation from applying correctly during intrinsic width calculation when intrinsic width calculation had already been done without font size inflation. (Bug 748434) r=roc
The first of these pieces of information is the intrinsic widths cached
on a block.

The second of them is the font inflation cached on a text frame (which
might be set to 1.0 at this point if a text frame has previously had
intrinsic width calculation done on it, but hasn't been reflowed).
2012-06-05 19:13:41 -07:00
Ed Morley
c5acb642c1 Merge mozilla-central to mozilla-inbound 2012-05-21 13:19:38 +01:00
Gervase Markham
ca171eec44 Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
L. David Baron
4fbe6f4e29 Save and expose on nsFontInflationData the width of the nearest common ancestor of the inflated descendants. (Bug 747720, patch 1) r=roc
This width will be used in patch 3.
2012-05-20 22:18:27 -07:00
L. David Baron
f4ce7f74f9 Add missing GetFirstInFlow() call that was causing a crash in ComputeDescendantWidth when printing with font inflation enabled (or a debug build). (Bug 751797) r=roc
--HG--
extra : transplant_source : %ED%23%02%AFR%24tw%FE%96%D7%D3p%D8%87%F7gV%28L
2012-05-07 07:17:00 +02:00
L. David Baron
b61149484a Make effect of form controls on font size inflation text threshold not depend on user changes to their value. (Bug 747857) r=roc
--HG--
extra : transplant_source : %82%DCX%81%B2%AAM%A3%A1%A1-%87%10%B3%B6%10kw%F4%FB
2012-05-05 15:24:45 +02:00
Ed Morley
3c9ca1882b Backout f8125b89352d (bug 747857) for frequent test failures 2012-05-04 15:24:42 +01:00
L. David Baron
6619db8bda Add missing GetFirstInFlow() call that was causing a crash in ComputeDescendantWidth when printing with font inflation enabled (or a debug build). (Bug 751797) r=roc
--HG--
extra : transplant_source : %B5%FE%E5%DFaH%06%0F%3B%26%C0%E2%8B%3E4%F37%BFi-
2012-05-03 22:55:33 -04:00
L. David Baron
39891d906d Make effect of form controls on font size inflation text threshold not depend on user changes to their value. (Bug 747857) r=roc
--HG--
extra : transplant_source : %1F%7B%3Fk%A6%F1%2C%EAZ%920%FB%FD%FB%3D%8E%9C%C9y%19
2012-05-03 20:04:30 -04:00
L. David Baron
be1535321a Build font data structure by walking the necessary text. (Bug 706193, patch 3) r=roc
Compute the amount of text in the scope of an nsFontInflationData
object.  This walks the text that's inside of the block formatting
context at which this object is rooted, excluding the text that's inside
any nested BFC.  Using the amount of text, the font sizes of the text,
and the line threshold preference, we compute whether to enable font
size inflation within that block formatting context.
2012-04-16 15:32:12 -07:00
L. David Baron
8c67e2ae8b Add a font inflation data structure per block formatting context. (Bug 706193, patch 2) r=roc
This structure is per block formatting context because we have to make a
single inflation decision for things like consecutive runs of paragraphs
of text.  Inflating some paragraphs and not others (within the same
sequence of adjacent paragraphs) based on the amount of text in each one
would be disastrous.  Otherwise it's ideal for the units to be as small
as possible as long as they merge such sequences; therefore this uses a
definition corresponding to CSS's idea of elements that establish new
block formatting contexts.
2012-04-16 15:32:12 -07:00