Bug 960848 - Part 2: Swap NS_BLOCK_HAS_FIRST_LETTER_CHILD and NS_BLOCK_FRAME_HAS_INSIDE_BULLET bit values. r=dbaron
authorCameron McCormack <cam@mcc.id.au>
Sat, 18 Jan 2014 18:08:03 +1100
changeset 164127 8600c8ad593f1876d399f74de0b2f78e9365a7ff
parent 164126 3635e6adde70c47a55a34c0c56c79636fd11a354
child 164128 1f72556326bedd015ed0c411ba1697b069b289be
push id26026
push userphilringnalda@gmail.com
push dateSat, 18 Jan 2014 23:17:27 +0000
treeherdermozilla-central@61fd0f987cf2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs960848
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 960848 - Part 2: Swap NS_BLOCK_HAS_FIRST_LETTER_CHILD and NS_BLOCK_FRAME_HAS_INSIDE_BULLET bit values. r=dbaron
layout/generic/nsFrameStateBits.h
--- a/layout/generic/nsFrameStateBits.h
+++ b/layout/generic/nsFrameStateBits.h
@@ -431,39 +431,38 @@ FRAME_STATE_BIT(Block, 28, NS_BLOCK_CLIP
 
 // NS_BLOCK_HAS_FIRST_LETTER_STYLE means that the block has first-letter style,
 // even if it has no actual first-letter frame among its descendants.
 FRAME_STATE_BIT(Block, 29, NS_BLOCK_HAS_FIRST_LETTER_STYLE)
 
 // NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET and NS_BLOCK_FRAME_HAS_INSIDE_BULLET
 // means the block has an associated bullet frame, they are mutually exclusive.
 FRAME_STATE_BIT(Block, 30, NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET)
-
-// NS_BLOCK_HAS_FIRST_LETTER_CHILD means that there is an inflow first-letter
-// frame among the block's descendants. If there is a floating first-letter
-// frame, or the block has first-letter style but has no first letter, this
-// bit is not set. This bit is set on the first continuation only.
-FRAME_STATE_BIT(Block, 31, NS_BLOCK_HAS_FIRST_LETTER_CHILD)
+FRAME_STATE_BIT(Block, 31, NS_BLOCK_FRAME_HAS_INSIDE_BULLET)
 
 // This block has had a child marked dirty, so before we reflow we need
 // to look through the lines to find any such children and mark
 // appropriate lines dirty.
 FRAME_STATE_BIT(Block, 61, NS_BLOCK_LOOK_FOR_DIRTY_FRAMES)
 
 // Are our cached intrinsic widths intrinsic widths for font size
 // inflation?  i.e., what was the current state of
 // GetPresContext()->mInflationDisabledForShrinkWrap at the time they
 // were computed?
 // nsBlockFrame is the only thing that caches intrinsic widths that
 // needs to track this because it's the only thing that caches intrinsic
 // widths that lives inside of things (form controls) that do intrinsic
 // sizing with font inflation enabled.
 FRAME_STATE_BIT(Block, 62, NS_BLOCK_FRAME_INTRINSICS_INFLATED)
 
-FRAME_STATE_BIT(Block, 63, NS_BLOCK_FRAME_HAS_INSIDE_BULLET)
+// NS_BLOCK_HAS_FIRST_LETTER_CHILD means that there is an inflow first-letter
+// frame among the block's descendants. If there is a floating first-letter
+// frame, or the block has first-letter style but has no first letter, this
+// bit is not set. This bit is set on the first continuation only.
+FRAME_STATE_BIT(Block, 63, NS_BLOCK_HAS_FIRST_LETTER_CHILD)
 
 
 // == Frame state bits that apply to bullet frames ============================
 
 FRAME_STATE_GROUP(Bullet, nsBulletFrame)
 
 FRAME_STATE_BIT(Block, 62, BULLET_FRAME_HAS_FONT_INFLATION)
 FRAME_STATE_BIT(Block, 63, BULLET_FRAME_IMAGE_LOADING)