531148 - Append to an ib-split inline with an inline parent doesn't work right anymore

Status: RESOLVED FIXED

(Core :: Layout, defect)

Description

[Boris Zbarsky [:bzbarsky]]

Attachment: Testcase

I broke this in bug 501847.  We used to always reframe when putting blocks inside the inline; we need to keep doing it unless we can really make AppendFrames handle it right.

Comment 1

[Boris Zbarsky [:bzbarsky]]

Attachment: Fix

This makes sure to create ib siblings for ancestors of the frame we're appending to as well, as needed, and to reframe in cases when this wouldn't work right (i.e. when we're not effectively appending to the parent).

Applies on top of bug 526596.

Comment 2

[Boris Zbarsky [:bzbarsky]]

Attachment: The actual fix

Comment 3

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

Comment on attachment 414678 [details] [diff] [review]
The actual fix

+        nsIFrame* curNextSibling = nextSibling;
+        nsIFrame* parent = aFrame;
+        PRBool isSafeToAppend = PR_TRUE;
+        do {
+          if (curNextSibling || parent->GetNextContinuation() ||
+              GetSpecialSibling(parent)) {
+            isSafeToAppend = PR_FALSE;
+            break;
+          }
+          curNextSibling = parent->GetNextSibling();
+          parent = parent->GetParent();
+        } while (IsInlineFrame(parent));
+
+        if (isSafeToAppend) {
+          return PR_FALSE;

Would probably benefit by being pulled out into a helper function.

Comment 4

[Boris Zbarsky [:bzbarsky]]

> Would probably benefit by being pulled out into a helper function.

Good call.  Done.

Comment 5

[Boris Zbarsky [:bzbarsky]]

Pushed http://hg.mozilla.org/mozilla-central/rev/faeceb4be9cb

Comment 6

[Boris Zbarsky [:bzbarsky]]

> Good call.  Done.

Except I did it wrong...  Fixed in http://hg.mozilla.org/mozilla-central/rev/242da4494b79