1269045 unknown 2016-04-29 16:19:49 -0700 [css-flex] Stop wrapping abspos children of flex container in anonymous flex items 2017-03-26 10:16:54 -0700 1 1 3 Components Core Layout Trunk Unspecified Unspecified defect RESOLVED FIXED https://drafts.csswg.org/css-flexbox-1/#abspos-items -- normal mozilla52 1313421 1320484 1330990 1345873 1350580 874713 874718 1269046 1341030 1 dholbert dholbert bmo git MatsPalmgren_bugz mattijs percyley philringnalda threecleartones wtds.trabalho --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- affected --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- 2016-11-01 01:40:33 --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- fixed --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- 2016-11-01 01:40:33 1 11371218 dholbert 2016-04-29 16:19:49 -0700 This is the first piece of bug 874718 (updating our code for flex container abspos children, to match the current spec). In this bug here, I intend to: - Remove our "wrap abspos placeholders in anonymous flex items" code & assumptions (from an older spec versions). - Exempt these placeholders (which are now direct chilren of a nsFlexContainerFrame) from being treated as FlexItems / participating in flex layout. - Exempt these placeholders from "order" sorting, so we can preserve the status quo there (which is correct but only accidentally so -- see bug 1264147 comment 3). This bug does *not* cover the alignment of abspos children using "align-self" / "justify-content". I'll file a separate bug on that, which will depend on this bug. (I intend to land these bugs at the same time, but I think it makes sense to logically separate them, in part because the alignment stuff will probably be shared with abspos grid children.) 11386674 8749420 dholbert 2016-05-05 14:47:04 -0700 Created attachment 8749420 Bug 1269045 part 1: Adjust flex item "order"-sorting code to treat placeholder frames as <= anything they're compared against, including each other. This patch makes the following specific changes: (1) Adds an early-return to both versions of the IsOrderLEQ function, to treat placeholder children as LEQ everything (including each other). This will tend to sort them to the beginning of the child list, which is unimportant but fine. More importantly, though: this means our "order"-sorting code won't reorder placeholders *with respect to each other* (since our sort algorithm is stable). So their painting order won't be affected by the "order" property, which is required by the spec. (2) Drops some nsPlaceholderFrame::GetRealFrameFor() calls -- they're unnecessary, since any placeholder frames will have prompted us to return earlier. One caveat to (2): this patch does leave a few "nsPlaceholderFrame::GetRealFrameFor()" calls in place, *for the moment*. These remaining calls are for handling placeholders that are wrapped, i.e. inside of anonymous flex items. These calls are still needed to avoid assertion-failures (i.e. to get a consistent ordering) at this point, but they'll be removed in a later patch in this same bug, when we stop wrapping placeholders in anonymous flex items. Review commit: https://reviewboard.mozilla.org/r/50927/diff/#index_header See other reviews: https://reviewboard.mozilla.org/r/50927/ 11386675 8749421 dholbert 2016-05-05 14:47:04 -0700 Created attachment 8749421 Bug 1269045 part 2: Separate out abspos placeholders when creating FlexItems, and give them a trivial reflow at container's content-box origin. Review commit: https://reviewboard.mozilla.org/r/50929/diff/#index_header See other reviews: https://reviewboard.mozilla.org/r/50929/ 11386676 8749422 dholbert 2016-05-05 14:47:04 -0700 Created attachment 8749422 Bug 1269045 part 3: Stop wrapping placeholder frames in anonymous flex items. This patch also: * Removes some now-unnecessary code from nsFlexContainerFrame, which was for jumping from wrapped-placeholders to their out-of-flow frames (for DOM comparisons). This code is now unnecessary because placeholders won't be wrapped anymore. * Marks some reftests with abspos content as "fails" for the time being. These tests will be fixed (and probably rewritten a bit) in bug 1269046, which is where we'll implement the correct static position for abspos children of a flex container. Review commit: https://reviewboard.mozilla.org/r/50931/diff/#index_header See other reviews: https://reviewboard.mozilla.org/r/50931/ 11386677 8749423 dholbert 2016-05-05 14:47:04 -0700 Created attachment 8749423 Bug 1269045 part 4: Drop now-obsolete parameter from anonymous flex/grid-item wrapping functions. Review commit: https://reviewboard.mozilla.org/r/50933/diff/#index_header See other reviews: https://reviewboard.mozilla.org/r/50933/ 11386685 dholbert 2016-05-05 14:49:19 -0700 (Note: I'm logically separating this from bug 1269046, but I intend to land them together -- i.e. the patches here won't land until we've got the static position correctly implemented over on bug 1269046.) 11386918 8749420 MatsPalmgren_bugz 2016-05-05 16:07:07 -0700 Comment on attachment 8749420 Bug 1269045 part 1: Adjust flex item "order"-sorting code to treat placeholder frames as <= anything they're compared against, including each other. https://reviewboard.mozilla.org/r/50927/#review47633 11386919 8749421 MatsPalmgren_bugz 2016-05-05 16:07:21 -0700 Comment on attachment 8749421 Bug 1269045 part 2: Separate out abspos placeholders when creating FlexItems, and give them a trivial reflow at container's content-box origin. https://reviewboard.mozilla.org/r/50929/#review47629 ::: layout/generic/nsFlexContainerFrame.cpp:3975 (Diff revision 1) > const FlexboxAxisTracker& aAxisTracker) > { > aStatus = NS_FRAME_COMPLETE; > > LinkedList<FlexLine> lines; > + AutoTArray<nsIFrame*, 1> placeholderKids; Can you explain what you gain by this, rather than just using nsTArray<nsIFrame*> ? 11386920 8749422 MatsPalmgren_bugz 2016-05-05 16:07:32 -0700 Comment on attachment 8749422 Bug 1269045 part 3: Stop wrapping placeholder frames in anonymous flex items. https://reviewboard.mozilla.org/r/50931/#review47635 11386921 8749423 MatsPalmgren_bugz 2016-05-05 16:07:39 -0700 Comment on attachment 8749423 Bug 1269045 part 4: Drop now-obsolete parameter from anonymous flex/grid-item wrapping functions. https://reviewboard.mozilla.org/r/50933/#review47637 11386946 dholbert 2016-05-05 16:15:48 -0700 (In reply to Mats Palmgren (:mats) from comment #7) > > + AutoTArray<nsIFrame*, 1> placeholderKids; > > Can you explain what you gain by this, rather than just using > nsTArray<nsIFrame*> ? Hmm, I guess not much. It lets us avoid heap allocation when there's exactly 1 abspos thing, but I suppose that's not much of a help. I expect abspos stuff here to be an uncommon case, so probably best that I use nsTArray (with no reserved stack space) as you're implicitly suggesting, I think. 11386953 8749420 dholbert 2016-05-05 16:19:50 -0700 Comment on attachment 8749420 Bug 1269045 part 1: Adjust flex item "order"-sorting code to treat placeholder frames as <= anything they're compared against, including each other. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50927/diff/1-2/ 11386954 8749421 dholbert 2016-05-05 16:19:50 -0700 Comment on attachment 8749421 Bug 1269045 part 2: Separate out abspos placeholders when creating FlexItems, and give them a trivial reflow at container's content-box origin. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50929/diff/1-2/ 11386955 8749422 dholbert 2016-05-05 16:19:50 -0700 Comment on attachment 8749422 Bug 1269045 part 3: Stop wrapping placeholder frames in anonymous flex items. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50931/diff/1-2/ 11386956 8749423 dholbert 2016-05-05 16:19:50 -0700 Comment on attachment 8749423 Bug 1269045 part 4: Drop now-obsolete parameter from anonymous flex/grid-item wrapping functions. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50933/diff/1-2/ 11386978 8749421 MatsPalmgren_bugz 2016-05-05 16:30:43 -0700 Comment on attachment 8749421 Bug 1269045 part 2: Separate out abspos placeholders when creating FlexItems, and give them a trivial reflow at container's content-box origin. https://reviewboard.mozilla.org/r/50929/#review47641 Looks fine, thanks. I'd expect the common case is zero placeholders (by far). 11780549 dholbert 2016-10-12 12:33:42 -0700 (In reply to Daniel Holbert [:dholbert] from comment #2) > Created attachment 8749421 > MozReview Request: Bug 1269045 part 2: Separate out abspos placeholders when > creating FlexItems, and give them a trivial reflow pass at 0,0. r?mats So, it turns out to be more convenient to bug 1269046 if we reflow these placeholders at the *flex container's content-box origin*. Then, in bug 1269046, we can just compute the static position as an *offset* (based on the child's size & the container's size & the align properties), and add that offset to the placeholder's position to determine the static position. So: I'd like to update part 2 here to reflow these children at 0,0. I'll post an interdiff patch, for review convenience, and then I'll update the MozReview stack here. (MozReview may or may not be able to show useful interdiffs; it sometimes shows unrelated changes after a patch stack has been rebased.) 11780564 8800390 dholbert 2016-10-12 12:37:00 -0700 Created attachment 8800390 "part 2b" (interdiff to reflow placeholders at content-box origin) 11780646 8749420 dholbert 2016-10-12 12:49:32 -0700 Comment on attachment 8749420 Bug 1269045 part 1: Adjust flex item "order"-sorting code to treat placeholder frames as <= anything they're compared against, including each other. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50927/diff/2-3/ 11780647 8749421 dholbert 2016-10-12 12:49:32 -0700 Comment on attachment 8749421 Bug 1269045 part 2: Separate out abspos placeholders when creating FlexItems, and give them a trivial reflow at container's content-box origin. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50929/diff/2-3/ 11780648 8749422 dholbert 2016-10-12 12:49:32 -0700 Comment on attachment 8749422 Bug 1269045 part 3: Stop wrapping placeholder frames in anonymous flex items. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50931/diff/2-3/ 11780649 8749423 dholbert 2016-10-12 12:49:32 -0700 Comment on attachment 8749423 Bug 1269045 part 4: Drop now-obsolete parameter from anonymous flex/grid-item wrapping functions. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50933/diff/2-3/ 11780654 dholbert 2016-10-12 12:50:46 -0700 Just pushed the unbitrotted versions of the original patches. Now I'll push one more update with "part 2b" folded into "part 2" (which should produce a useful interdiff, if you want to use mozreview UI instead of splinter to see the "part 2b" changes). 11780671 8749421 dholbert 2016-10-12 12:53:27 -0700 Comment on attachment 8749421 Bug 1269045 part 2: Separate out abspos placeholders when creating FlexItems, and give them a trivial reflow at container's content-box origin. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50929/diff/3-4/ 11780672 8749422 dholbert 2016-10-12 12:53:27 -0700 Comment on attachment 8749422 Bug 1269045 part 3: Stop wrapping placeholder frames in anonymous flex items. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50931/diff/3-4/ 11780673 8749423 dholbert 2016-10-12 12:53:27 -0700 Comment on attachment 8749423 Bug 1269045 part 4: Drop now-obsolete parameter from anonymous flex/grid-item wrapping functions. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50933/diff/3-4/ 11780678 dholbert 2016-10-12 12:55:02 -0700 Here's the MozReview interdiff that corresponds to comment 16, folding in "part 2b": https://reviewboard.mozilla.org/r/50929/diff/3-4/ 11780856 8800390 MatsPalmgren_bugz 2016-10-12 13:52:12 -0700 Comment on attachment 8800390 "part 2b" (interdiff to reflow placeholders at content-box origin) nit: I slightly prefer CSS Align (without the dash) to refer to the spec by name (two places) 11780869 8749420 dholbert 2016-10-12 13:56:18 -0700 Comment on attachment 8749420 Bug 1269045 part 1: Adjust flex item "order"-sorting code to treat placeholder frames as <= anything they're compared against, including each other. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50927/diff/3-4/ 11780870 8749421 dholbert 2016-10-12 13:56:18 -0700 Comment on attachment 8749421 Bug 1269045 part 2: Separate out abspos placeholders when creating FlexItems, and give them a trivial reflow at container's content-box origin. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50929/diff/4-5/ 11780871 8749422 dholbert 2016-10-12 13:56:18 -0700 Comment on attachment 8749422 Bug 1269045 part 3: Stop wrapping placeholder frames in anonymous flex items. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50931/diff/4-5/ 11780872 8749423 dholbert 2016-10-12 13:56:18 -0700 Comment on attachment 8749423 Bug 1269045 part 4: Drop now-obsolete parameter from anonymous flex/grid-item wrapping functions. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50933/diff/4-5/ 11780873 dholbert 2016-10-12 13:56:39 -0700 Fixed: https://reviewboard.mozilla.org/r/50929/diff/4-5/ Thanks for the review! 11802271 8749420 dholbert 2016-10-20 13:28:03 -0700 Comment on attachment 8749420 Bug 1269045 part 1: Adjust flex item "order"-sorting code to treat placeholder frames as <= anything they're compared against, including each other. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50927/diff/4-5/ 11802272 8749421 dholbert 2016-10-20 13:28:03 -0700 Comment on attachment 8749421 Bug 1269045 part 2: Separate out abspos placeholders when creating FlexItems, and give them a trivial reflow at container's content-box origin. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50929/diff/5-6/ 11802273 8749422 dholbert 2016-10-20 13:28:03 -0700 Comment on attachment 8749422 Bug 1269045 part 3: Stop wrapping placeholder frames in anonymous flex items. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50931/diff/5-6/ 11802274 8749423 dholbert 2016-10-20 13:28:03 -0700 Comment on attachment 8749423 Bug 1269045 part 4: Drop now-obsolete parameter from anonymous flex/grid-item wrapping functions. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50933/diff/5-6/ 11802284 dholbert 2016-10-20 13:30:52 -0700 (In reply to Mats Palmgren (:mats) from comment #27) > nit: I slightly prefer CSS Align (without the dash) to refer to the spec by > name (two places) (Just noticed that I didn't reply to this, but I did address it, in https://reviewboard.mozilla.org/r/50929/diff/4-5/ ) My latest mozreview push here (comment 33) was just to rebase this patch-stack on top of current mozilla-inbound -- in particular, rebasing on top of bug 1309119, which made minor tweaks to the same nsCSSFrameConstructor anonymous-flex-item-wrapping code that this bug is touching. 11819179 8749420 dholbert 2016-10-27 14:10:29 -0700 Comment on attachment 8749420 Bug 1269045 part 1: Adjust flex item "order"-sorting code to treat placeholder frames as <= anything they're compared against, including each other. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50927/diff/5-6/ 11819180 8749421 dholbert 2016-10-27 14:10:29 -0700 Comment on attachment 8749421 Bug 1269045 part 2: Separate out abspos placeholders when creating FlexItems, and give them a trivial reflow at container's content-box origin. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50929/diff/6-7/ 11819181 8749422 dholbert 2016-10-27 14:10:29 -0700 Comment on attachment 8749422 Bug 1269045 part 3: Stop wrapping placeholder frames in anonymous flex items. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50931/diff/6-7/ 11819182 8749423 dholbert 2016-10-27 14:10:29 -0700 Comment on attachment 8749423 Bug 1269045 part 4: Drop now-obsolete parameter from anonymous flex/grid-item wrapping functions. Review request updated; see interdiff: https://reviewboard.mozilla.org/r/50933/diff/6-7/ 11819193 8749422 dholbert 2016-10-27 14:14:39 -0700 Comment on attachment 8749422 Bug 1269045 part 3: Stop wrapping placeholder frames in anonymous flex items. https://reviewboard.mozilla.org/r/50931/#review88190 ::: layout/reftests/w3c-css/submitted/flexbox/reftest.list:53 (Diff revision 7) > -fails == flexbox-baseline-single-item-001a.html flexbox-baseline-single-item-001-ref.html # bug 1269045 > -fails == flexbox-baseline-single-item-001b.html flexbox-baseline-single-item-001-ref.html # bug 1269045 > +== flexbox-baseline-single-item-001a.html flexbox-baseline-single-item-001-ref.html > +== flexbox-baseline-single-item-001b.html flexbox-baseline-single-item-001-ref.html > My latest mozreview-push is just to rebase this patch-stack on top of bug 1313421 (and newer mozilla-inbound changes as well; unfortunately mozreview shows some of those in the interdiff). The relevant change is this ^^ reftest.list fails-annotation removal, for the tests from bug 1313421, which fail (due to getting a baseline from a trivial anonymous-flex-item-around-a-placeholder) until this patch here stops us from wrapping placeholders in anonymous flex items. 11819778 pulsebot 2016-10-27 18:59:38 -0700 Pushed by dholbert@mozilla.com: https://hg.mozilla.org/integration/mozilla-inbound/rev/86a391e3e163 part 1: Adjust flex item "order"-sorting code to treat placeholder frames as <= anything they're compared against, including each other. r=mats https://hg.mozilla.org/integration/mozilla-inbound/rev/7aa8199183fc part 2: Separate out abspos placeholders when creating FlexItems, and give them a trivial reflow at container's content-box origin. r=mats https://hg.mozilla.org/integration/mozilla-inbound/rev/2162d5c9fb54 part 3: Stop wrapping placeholder frames in anonymous flex items. r=mats https://hg.mozilla.org/integration/mozilla-inbound/rev/f57f9ac1435e part 4: Drop now-obsolete parameter from anonymous flex/grid-item wrapping functions. r=mats 11820100 philringnalda 2016-10-27 22:01:07 -0700 Backed out in https://hg.mozilla.org/integration/mozilla-inbound/rev/7c24f445542062d41f97cba2dd8a45bd3a468b98 in hopes of unbusting Windows builds. 11825465 pulsebot 2016-10-31 09:00:16 -0700 Pushed by dholbert@mozilla.com: https://hg.mozilla.org/integration/mozilla-inbound/rev/86fbc1fb2818 part 1: Adjust flex item "order"-sorting code to treat placeholder frames as <= anything they're compared against, including each other. r=mats https://hg.mozilla.org/integration/mozilla-inbound/rev/d1135160f859 part 2: Separate out abspos placeholders when creating FlexItems, and give them a trivial reflow at container's content-box origin. r=mats https://hg.mozilla.org/integration/mozilla-inbound/rev/707b2ab5879d part 3: Stop wrapping placeholder frames in anonymous flex items. r=mats https://hg.mozilla.org/integration/mozilla-inbound/rev/78495666fd8c part 4: Drop now-obsolete parameter from anonymous flex/grid-item wrapping functions. r=mats 11827013 philringnalda 2016-10-31 18:40:33 -0700 https://hg.mozilla.org/mozilla-central/rev/86fbc1fb2818 https://hg.mozilla.org/mozilla-central/rev/d1135160f859 https://hg.mozilla.org/mozilla-central/rev/707b2ab5879d https://hg.mozilla.org/mozilla-central/rev/78495666fd8c 11849493 epinal99-bugzilla2 2016-11-09 20:04:58 -0800 *** Bug 1316317 has been marked as a duplicate of this bug. *** 11868294 dholbert 2016-11-17 09:38:09 -0800 *** Bug 1317345 has been marked as a duplicate of this bug. *** 8749420 2016-05-05 14:47:04 -0700 2016-10-12 12:49:32 -0700 Bug 1269045 part 1: Adjust flex item "order"-sorting code to treat placeholder frames as <= anything they're compared against, including each other. reviewboard-50927-url.txt text/x-review-board-request 58 dholbert aHR0cHM6Ly9yZXZpZXdib2FyZC5tb3ppbGxhLm9yZy9yLzUwOTI3L2RpZmYvI2luZGV4X2hlYWRl cg== 8749421 2016-05-05 14:47:04 -0700 2016-10-12 12:53:27 -0700 Bug 1269045 part 2: Separate out abspos placeholders when creating FlexItems, and give them a trivial reflow at container's content-box origin. reviewboard-50929-url.txt text/x-review-board-request 58 dholbert aHR0cHM6Ly9yZXZpZXdib2FyZC5tb3ppbGxhLm9yZy9yLzUwOTI5L2RpZmYvI2luZGV4X2hlYWRl cg== 8749422 2016-05-05 14:47:04 -0700 2016-10-12 12:49:32 -0700 Bug 1269045 part 3: Stop wrapping placeholder frames in anonymous flex items. reviewboard-50931-url.txt text/x-review-board-request 58 dholbert aHR0cHM6Ly9yZXZpZXdib2FyZC5tb3ppbGxhLm9yZy9yLzUwOTMxL2RpZmYvI2luZGV4X2hlYWRl cg== 8749423 2016-05-05 14:47:04 -0700 2016-10-12 12:49:32 -0700 Bug 1269045 part 4: Drop now-obsolete parameter from anonymous flex/grid-item wrapping functions. reviewboard-50933-url.txt text/x-review-board-request 58 dholbert aHR0cHM6Ly9yZXZpZXdib2FyZC5tb3ppbGxhLm9yZy9yLzUwOTMzL2RpZmYvI2luZGV4X2hlYWRl cg== 8800390 2016-10-12 12:37:00 -0700 2016-10-12 13:52:12 -0700 "part 2b" (interdiff to reflow placeholders at content-box origin) 1269045-actuallyPutPlaceholdersAtContentBoxOrigin.patch text/plain 7039 dholbert IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIERhbmllbCBIb2xiZXJ0IDxkaG9sYmVydEBjcy5z dGFuZm9yZC5lZHU+CiMgUGFyZW50ICAwOTI0NThjYWNjNDYyMTU4NjBhYjZlMWIzMTljM2FhNzE2 YThmY2I4ClRPRE86IEZPTEQgVEhJUyBQQVRDSCBJTlRPIDEyNjkwNDUtZmxleENvbnRhaW5lci1z ZXBhcmF0ZXMtcGxhY2Vob2xkZXJzLnBhdGNoCgpNb3pSZXZpZXctQ29tbWl0LUlEOiA1bFhVc3Vz THJ5QwoKZGlmZiAtLWdpdCBhL2xheW91dC9nZW5lcmljL25zRmxleENvbnRhaW5lckZyYW1lLmNw cCBiL2xheW91dC9nZW5lcmljL25zRmxleENvbnRhaW5lckZyYW1lLmNwcAotLS0gYS9sYXlvdXQv Z2VuZXJpYy9uc0ZsZXhDb250YWluZXJGcmFtZS5jcHAKKysrIGIvbGF5b3V0L2dlbmVyaWMvbnNG bGV4Q29udGFpbmVyRnJhbWUuY3BwCkBAIC00MjA1LDE3ICs0MjA1LDE4IEBAIG5zRmxleENvbnRh aW5lckZyYW1lOjpEb0ZsZXhMYXlvdXQobnNQcmUKICAgICAgICAgICBmbGV4Q29udGFpbmVyQXNj ZW50ID09IG5zY29vcmRfTUlOKSB7CiAgICAgICAgIGZsZXhDb250YWluZXJBc2NlbnQgPSBpdGVt Tm9ybWFsQlBvcyArIGl0ZW0tPlJlc29sdmVkQXNjZW50KCk7CiAgICAgICB9CiAgICAgfQogICB9 CiAKICAgaWYgKCFwbGFjZWhvbGRlcktpZHMuSXNFbXB0eSgpKSB7CiAgICAgUmVmbG93UGxhY2Vo b2xkZXJzKGFQcmVzQ29udGV4dCwgYVJlZmxvd0lucHV0LAotICAgICAgICAgICAgICAgICAgICAg ICBwbGFjZWhvbGRlcktpZHMsIGNvbnRhaW5lclNpemUpOworICAgICAgICAgICAgICAgICAgICAg ICBwbGFjZWhvbGRlcktpZHMsIGNvbnRhaW5lckNvbnRlbnRCb3hPcmlnaW4sCisgICAgICAgICAg ICAgICAgICAgICAgIGNvbnRhaW5lclNpemUpOwogICB9CiAKICAgLy8gQ29tcHV0ZSBmbGV4IGNv bnRhaW5lcidzIGRlc2lyZWQgc2l6ZSAoaW4gaXRzIG93biB3cml0aW5nLW1vZGUpLAogICAvLyBz dGFydGluZyB3LyBjb250ZW50LWJveCBzaXplICYgZ3Jvd2luZyBmcm9tIHRoZXJlOgogICBMb2dp Y2FsU2l6ZSBkZXNpcmVkU2l6ZUluRmxleFdNID0KICAgICBhQXhpc1RyYWNrZXIuTG9naWNhbFNp emVGcm9tRmxleFJlbGF0aXZlU2l6ZXMoYUNvbnRlbnRCb3hNYWluU2l6ZSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGVudEJveENyb3NzU2l6 ZSk7CiAgIC8vIEFkZCBib3JkZXIvcGFkZGluZyAody8gc2tpcFNpZGVzIGFscmVhZHkgYXBwbGll ZCk6CkBAIC00NDEzLDQxICs0NDE0LDQwIEBAIG5zRmxleENvbnRhaW5lckZyYW1lOjpSZWZsb3dG bGV4SXRlbShuc1AKICAgICBhSXRlbS5TZXRBc2NlbnQoY2hpbGREZXNpcmVkU2l6ZS5CbG9ja1N0 YXJ0QXNjZW50KCkpOwogICB9CiB9CiAKIHZvaWQKIG5zRmxleENvbnRhaW5lckZyYW1lOjpSZWZs b3dQbGFjZWhvbGRlcnMobnNQcmVzQ29udGV4dCogYVByZXNDb250ZXh0LAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBSZWZsb3dJbnB1dCYgYVJlZmxvd0lu cHV0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuc1RBcnJheTxu c0lGcmFtZSo+JiBhUGxhY2Vob2xkZXJzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBMb2dpY2FsUG9pbnQmIGFDb250ZW50Qm94T3JpZ2luLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBuc1NpemUmIGFDb250YWlu ZXJTaXplKQogewogICBXcml0aW5nTW9kZSBvdXRlcldNID0gYVJlZmxvd0lucHV0LkdldFdyaXRp bmdNb2RlKCk7CiAKICAgLy8gQXMgbm90ZWQgaW4gdGhpcyBtZXRob2QncyBkb2N1bWVudGF0aW9u LCB3ZSdsbCByZWZsb3cgZXZlcnkgZW50cnkgaW4KLSAgLy8gfGFQbGFjZWhvbGRlcnN8IGF0IDAs MC4KLSAgTG9naWNhbFBvaW50IGR1bW15UG9zKG91dGVyV00sIDAsIDApOwotCisgIC8vIHxhUGxh Y2Vob2xkZXJzfCBhdCB0aGUgY29udGFpbmVyJ3MgY29udGVudC1ib3ggb3JpZ2luLgogICBmb3Ig KG5zSUZyYW1lKiBwbGFjZWhvbGRlciA6IGFQbGFjZWhvbGRlcnMpIHsKICAgICBNT1pfQVNTRVJU KHBsYWNlaG9sZGVyLT5HZXRUeXBlKCkgPT0gbnNHa0F0b21zOjpwbGFjZWhvbGRlckZyYW1lLAog ICAgICAgICAgICAgICAgInBsYWNlaG9sZGVycyBhcnJheSBzaG91bGQgb25seSBjb250YWluIHBs YWNlaG9sZGVyIGZyYW1lcyIpOwogICAgIFdyaXRpbmdNb2RlIHdtID0gcGxhY2Vob2xkZXItPkdl dFdyaXRpbmdNb2RlKCk7CiAgICAgTG9naWNhbFNpemUgYXZhaWxTaXplID0gYVJlZmxvd0lucHV0 LkNvbXB1dGVkU2l6ZSh3bSk7CiAgICAgUmVmbG93SW5wdXQgY2hpbGRSZWZsb3dJbnB1dChhUHJl c0NvbnRleHQsIGFSZWZsb3dJbnB1dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHBsYWNlaG9sZGVyLCBhdmFpbFNpemUpOwogICAgIFJlZmxvd091dHB1dCBjaGlsZERlc2lyZWRT aXplKGNoaWxkUmVmbG93SW5wdXQpOwogICAgIG5zUmVmbG93U3RhdHVzIGNoaWxkUmVmbG93U3Rh dHVzOwogICAgIFJlZmxvd0NoaWxkKHBsYWNlaG9sZGVyLCBhUHJlc0NvbnRleHQsCiAgICAgICAg ICAgICAgICAgY2hpbGREZXNpcmVkU2l6ZSwgY2hpbGRSZWZsb3dJbnB1dCwKLSAgICAgICAgICAg ICAgICBvdXRlcldNLCBkdW1teVBvcywgYUNvbnRhaW5lclNpemUsIDAsCisgICAgICAgICAgICAg ICAgb3V0ZXJXTSwgYUNvbnRlbnRCb3hPcmlnaW4sIGFDb250YWluZXJTaXplLCAwLAogICAgICAg ICAgICAgICAgIGNoaWxkUmVmbG93U3RhdHVzKTsKIAogICAgIEZpbmlzaFJlZmxvd0NoaWxkKHBs YWNlaG9sZGVyLCBhUHJlc0NvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgY2hpbGREZXNp cmVkU2l6ZSwgJmNoaWxkUmVmbG93SW5wdXQsCi0gICAgICAgICAgICAgICAgICAgICAgb3V0ZXJX TSwgZHVtbXlQb3MsIGFDb250YWluZXJTaXplLCAwKTsKKyAgICAgICAgICAgICAgICAgICAgICBv dXRlcldNLCBhQ29udGVudEJveE9yaWdpbiwgYUNvbnRhaW5lclNpemUsIDApOwogCiAgIH0KIH0K IAogLyogdmlydHVhbCAqLyBuc2Nvb3JkCiBuc0ZsZXhDb250YWluZXJGcmFtZTo6R2V0TWluSVNp emUobnNSZW5kZXJpbmdDb250ZXh0KiBhUmVuZGVyaW5nQ29udGV4dCkKIHsKICAgbnNjb29yZCBt aW5JU2l6ZSA9IDA7CmRpZmYgLS1naXQgYS9sYXlvdXQvZ2VuZXJpYy9uc0ZsZXhDb250YWluZXJG cmFtZS5oIGIvbGF5b3V0L2dlbmVyaWMvbnNGbGV4Q29udGFpbmVyRnJhbWUuaAotLS0gYS9sYXlv dXQvZ2VuZXJpYy9uc0ZsZXhDb250YWluZXJGcmFtZS5oCisrKyBiL2xheW91dC9nZW5lcmljL25z RmxleENvbnRhaW5lckZyYW1lLmgKQEAgLTIzMiw0MiArMjMyLDQyIEBAIHByb3RlY3RlZDoKICAg dm9pZCBSZWZsb3dGbGV4SXRlbShuc1ByZXNDb250ZXh0KiBhUHJlc0NvbnRleHQsCiAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgRmxleGJveEF4aXNUcmFja2VyJiBhQXhpc1RyYWNrZXIsCiAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgUmVmbG93SW5wdXQmIGFSZWZsb3dJbnB1dCwKICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBGbGV4SXRlbSYgYUl0ZW0sCiAgICAgICAgICAgICAg ICAgICAgICAgbW96aWxsYTo6TG9naWNhbFBvaW50JiBhRnJhbWVQb3MsCiAgICAgICAgICAgICAg ICAgICAgICAgY29uc3QgbnNTaXplJiBhQ29udGFpbmVyU2l6ZSk7CiAKICAgLyoqCi0gICAqIEhl bHBlci1mdW5jdGlvbiB0byBwZXJmb3JtIGEgImR1bW15IHJlZmxvdyIgKGF0IHBvc2l0aW9uIDAs MCkgb24gYWxsIG91cgotICAgKiBuc1BsYWNlaG9sZGVyRnJhbWUgY2hpbGQgZnJhbWVzLgorICAg KiBIZWxwZXItZnVuY3Rpb24gdG8gcGVyZm9ybSBhICJkdW1teSByZWZsb3ciIG9uIGFsbCBvdXIg bnNQbGFjZWhvbGRlckZyYW1lCisgICAqIGNoaWxkcmVuLCBhdCB0aGUgY29udGFpbmVyJ3MgY29u dGVudC1ib3ggb3JpZ2luLgogICAgKgotICAgKiBXZSBkbyB0aGlzIHNpbXBseSB0byBmdWxmaWxs IHRoZSBleHBlY3RhdGlvbiB0aGF0IHdlIHJlZmxvdyBhbGwgb2Ygb3VyCi0gICAqIGNoaWxkcmVu LiBUaGUgMCwwIHBvc2l0aW9uIGlzIG1lYW5pbmdsZXNzLCBhbmQgdGhhdCdzIE9LIGJlY2F1c2Ug aXQKLSAgICogc2hvdWxkbid0IGluZmx1ZW5jZSByZW5kZXJpbmcuIE5vcm1hbGx5LCBpdCB3b3Vs ZCByZXByZXNlbnQgdGhlIHN0YXRpYwotICAgKiBwb3NpdGlvbiBmb3IgdGhlIHBsYWNlaG9sZGVy J3MgT09GIGZyYW1lIC0tIGJ1dCBmb3IgY2hpbGRyZW4gb2YgYSBmbGV4Ci0gICAqIGNvbnRhaW5l ciwgd2UnbGwgY29tcHV0ZSB0aGF0IHN0YXRpYyBwb3NpdGlvbiBhIGJpdCBsYXRlcgotICAgKiAo aW4gbnNBYnNvbHV0ZUNvbnRhaW5pbmdCbG9jazo6UmVmbG93QWJzb2x1dGVGcmFtZSksIHdpdGhv dXQgdXNpbmcKLSAgICogdGhlIHBsYWNlaG9sZGVyIGZyYW1lIGF0IGFsbC4gIFdlIGhhdmUgdG8g ZG8gdGhpcyBiZWNhdXNlIHRoZSBzdGF0aWMKLSAgICogcG9zaXRpb24gaXMgaW5mbHVlbmNlZCBi eSB0aGUgT09GIGZyYW1lJ3Mgc2l6ZSAodmlhIGFsaWdubWVudCB3aXRoIHRoZQotICAgKiBDU1Mt QWxpZ24gcHJvcGVydGllcyksIGFuZCB3ZSBtYXkgbm90IGtub3cgdGhlIE9PRiBmcmFtZSdzIHNp emUgdW50aWwgaXRzCi0gICAqIGFic3BvcyBjb250YWluaW5nIGJsb2NrIChwb3RlbnRpYWxseSBv bmUgb2Ygb3VyIGFuY2VzdG9ycykgaGFzIHJlYWNoZWQgdGhlCi0gICAqIGVuZCBvZiBpdHMgcmVm bG93LgorICAgKiBUaGlzIGRvZXNuJ3QgYWN0dWFsbHkgcmVwcmVzZW50IHRoZSBzdGF0aWMgcG9z aXRpb24gb2YgdGhlIHBsYWNlaG9sZGVycycKKyAgICogb3V0LW9mLWZsb3cgKE9PRikgZnJhbWVz IC0tIHdlIGNhbid0IGNvbXB1dGUgdGhhdCB1bnRpbCB3ZSd2ZSByZWZsb3dlZCB0aGUKKyAgICog T09GLCBiZWNhdXNlIChkZXBlbmRpbmcgb24gdGhlIENTUy1BbGlnbiBwcm9wZXJ0aWVzKSB0aGUg c3RhdGljIHBvc2l0aW9uCisgICAqIG1heSBiZSBpbmZsdWVuY2VkIGJ5IHRoZSBPT0YncyBzaXpl LiAgU28gZm9yIG5vdywgd2UganVzdCBjby1vcHQgdGhlCisgICAqIHBsYWNlaG9sZGVyIHRvIHN0 b3JlIHRoZSBmbGV4IGNvbnRhaW5lcidzIGxvZ2ljYWwgY29udGVudC1ib3ggb3JpZ2luLCBhbmQK KyAgICogd2UgZGVmZXIgdG8gbnNBYnNvbHV0ZUNvbnRhaW5pbmdCbG9jayB0byBkZXRlcm1pbmUg dGhlIE9PRidzIGFjdHVhbCBzdGF0aWMKKyAgICogcG9zaXRpb24gKHVzaW5nIHRoaXMgb3JpZ2lu LCB0aGUgT09GJ3Mgc2l6ZSwgYW5kIHRoZSBDU1MtQWxpZ24KKyAgICogcHJvcGVydGllcykuCiAg ICAqCi0gICAqIFhYWGRob2xiZXJ0IFRoZSBsYXRlciBzdHVmZiBtZW50aW9uZWQgYWJvdmUgaXMg Y29taW5nIGluIGJ1ZyAxMjY5MDQ2LgorICAgKiBYWFhkaG9sYmVydCBUaGUgbnNBYnNvbHV0ZUNv bnRhaW5pbmdCbG9jayBzdHVmZiBpcyBjb21pbmcgaW4gYnVnIDEyNjkwNDYuCiAgICAqCi0gICAq IEBwYXJhbSBhUHJlc0NvbnRleHQgICAgVGhlIHByZXNlbnRhdGlvbiBjb250ZXh0IGJlaW5nIHVz ZWQgaW4gcmVmbG93LgotICAgKiBAcGFyYW0gYVJlZmxvd0lucHV0ICAgIFRoZSBmbGV4IGNvbnRh aW5lcidzIHJlZmxvdyBpbnB1dC4KLSAgICogQHBhcmFtIGFQbGFjZWhvbGRlcnMgICBBbiBhcnJh eSBvZiBhbGwgdGhlIGZsZXggY29udGFpbmVyJ3MKLSAgICogICAgICAgICAgICAgICAgICAgICAg ICBuc1BsYWNlaG9sZGVyRnJhbWUgY2hpbGRyZW4uCi0gICAqIEBwYXJhbSBhQ29udGFpbmVyU2l6 ZSAgVGhlIGZsZXggY29udGFpbmVyJ3Mgc2l6ZSAocmVxdWlyZWQgYnkgc29tZSBtZXRob2RzCi0g ICAqICAgICAgICAgICAgICAgICAgICAgICAgdGhhdCB3ZSBjYWxsLCB0byBpbnRlcnByZXQgcG9z aXRpb25zIGNvcnJlY3RseSkuCisgICAqIEBwYXJhbSBhUHJlc0NvbnRleHQgICAgICAgVGhlIHBy ZXNlbnRhdGlvbiBjb250ZXh0IGJlaW5nIHVzZWQgaW4gcmVmbG93LgorICAgKiBAcGFyYW0gYVJl Zmxvd0lucHV0ICAgICAgIFRoZSBmbGV4IGNvbnRhaW5lcidzIHJlZmxvdyBpbnB1dC4KKyAgICog QHBhcmFtIGFQbGFjZWhvbGRlcnMgICAgICBBbiBhcnJheSBvZiBhbGwgdGhlIGZsZXggY29udGFp bmVyJ3MKKyAgICogICAgICAgICAgICAgICAgICAgICAgICAgICBuc1BsYWNlaG9sZGVyRnJhbWUg Y2hpbGRyZW4uCisgICAqIEBwYXJhbSBhQ29udGVudEJveE9yaWdpbiAgVGhlIGZsZXggY29udGFp bmVyJ3MgbG9naWNhbCBjb250ZW50LWJveAorICAgKiAgICAgICAgICAgICAgICAgICAgICAgICAg IG9yaWdpbiAoaW4gaXRzIG93biBjb29yZGluYXRlIHNwYWNlKS4KKyAgICogQHBhcmFtIGFDb250 YWluZXJTaXplICAgICBUaGUgZmxleCBjb250YWluZXIncyBzaXplIChyZXF1aXJlZCBieSBzb21l CisgICAqICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVmbG93IG1ldGhvZHMgdG8gaW50ZXJw cmV0IHBvc2l0aW9ucyBjb3JyZWN0bHkpLgogICAgKi8KICAgdm9pZCBSZWZsb3dQbGFjZWhvbGRl cnMobnNQcmVzQ29udGV4dCogYVByZXNDb250ZXh0LAogICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBSZWZsb3dJbnB1dCYgYVJlZmxvd0lucHV0LAogICAgICAgICAgICAgICAgICAgICAg ICAgICBuc1RBcnJheTxuc0lGcmFtZSo+JiBhUGxhY2Vob2xkZXJzLAorICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBtb3ppbGxhOjpMb2dpY2FsUG9pbnQmIGFDb250ZW50Qm94T3JpZ2lu LAogICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBuc1NpemUmIGFDb250YWluZXJTaXpl KTsKIAogICBib29sIG1DaGlsZHJlbkhhdmVCZWVuUmVvcmRlcmVkOyAvLyBIYXZlIHdlIGV2ZXIg aGFkIHRvIHJlb3JkZXIgb3VyIGtpZHMKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgLy8gdG8gc2F0aXNmeSB0aGVpciAnb3JkZXInIHZhbHVlcz8KIH07CiAKICNlbmRpZiAvKiBu c0ZsZXhDb250YWluZXJGcmFtZV9oX19fICovCg==