383551 - Clean up IsInlineFrame(2), nsStyleDisplay::IsBlockLevel, and friends

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Attachment: fix

Followup to bug 356325.
-- Remove nsStyleDisplay::IsBlockLevel, make callers call IsBlockOutside instead.
-- Fix nsStyleDisplay::IsBlockOutside as per bug 356325
-- Rename IsInlineFrame() helper in nsCSSFrameConstructor to IsInlineOutside() helper
-- Replace IsInlineFrame2() helper in nsCSSFrameConstructor with IsBlockOutside() helper and fix callers (reversed sense)
-- Remove IsBlockFrame() in nsCSSFrameConstructor and have callers use !IsInlineOutside instead. This is the only change that could change behaviour. The code that's calling FindFirstBlock/FindLastBlock is associated with !allKidsInline, the computation of which uses IsInlineOutside, so I think this is right. We don't want to be treating stuff like inline-block as a block when determining where to put an IB split. I'll attach a testcase that this fixes.
-- Remove nsLineLayout::TreatFrameAsBlock, make nsBlockFrame just use !IsInlineOutside instead.

Comment 1

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Comment on attachment 267533 [details] [diff] [review]
fix

r+sr=dbaron

Comment 2

[Robert O'Callahan (:roc) (email my personal email if necessary)]

checked in.

Comment 3

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Attachment: testcase

Here's that testcase I promised. I'll check this in as a reftest.

Comment 4

[Bill Gianopoulos [:WG9s]]

This check-in caused the Linux qm-rhel02 tinderbox red.

Comment 5

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Fixed the bustage, and checked in a reftest.

Comment 6

[Jeff Walden [:Waldo]]

http://bonsai.mozilla.org/cvsview2.cgi?subdir=mozilla/layout/reftests/bugs&files=383551-1.html&command=DIRECTORY&branch=HEAD&root=/cvsroot