mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
0af135f24d
- Bug 1249212 part 3 - Fix active duration calculation when iteration duration is infinity; r=boris (acc98b1948) - Bug 1249212 part 4 - Add tests for activeDuration; r=boris (354da323ef) - Bug 1249212 part 5 - Remove max() clamping from endTime calculation; r=boris (613cd6f5b7) - Bug 1249212 part 6 - Add tests for endTime calculation; r=boris (583a09f942) - Bug 1249212 part 7 - Calculate the endTime in GetComputedTimingAt; r=boris (ac73c4a853) - No bug - Fix whitespace and four test descriptions in keyframe-effect tests; r=whitespace-only DONTBUILD (844a12ba4d) - Bug 1249212 part 1 - Simplify various keyframe-effect tests; r=boris (58c7f5ef19) - Bug 1241929 - remove PurgeActiveWorker() from install job when skip waiting is set. r=bkelly (248aadb430) - Bug 1238954 P1 Purge potentially controlled document entries when evicting service worker registrations. r=ehsan (094bb54de1) - Bug 1238954 P2 Fix csp service worker tests to register and unregister separate scopes. r=ehsan (71f0237c11) - Bug 1227015 P2 Move mScriptSpec from registration job into script job base. r=ehsan (754753f0f6) - Bug 1227015 P3 Require a script spec on install jobs. r=ehsan (ebdbf860b9) - Bug 1227015 P4 Make register job always require an explicit script spec. r=ehsan (b97ec80a56) - Bug 1227015 P5 Remove ServiceWorkerRegistrationInfo mScriptSpec. r=ehsan (4410fd9fd0) - Bug 1227015 P6 Abort updates if the script spec has changed. r=ehsan (01962f2915) - Bug 1232444 Only store service worker registrations after install is successful. r=baku (f773638ec6) - Bug 1231974 P1 Remove unneeded ServiceWorkerScriptJobBase abstract class. r=baku (c514e53d82) - Bug 1231974 P2 Store scope on ServiceWorkerJobBase. r=baku (d723846d45) - Bug 1231974 P3 Store the principal on the ServiceWorkerJobBase. r=baku (550fa7f1d4) - Bug 1231974 P4 Lazy load registration and verify it does not change in service worker jobs. r=baku (db44008f8f) - Bug 1231974 P6 Abort update-triggered install jobs if the service worker script has changed. r=baku (3e7572968f) - Bug 1237992 - service worker activate should be executed after install onstatechange events are fired. r=bkelly (58de5a2e57) - No bug - Correct the order of two newly added web-platform tests in manifest. DONTBUILD (e14b162237) - Bug 1189581 - Make service-workers/service-worker/fetch-cors-xhr.https.html pass; r=bkelly (e1dbe77c87) - Bug 1243942 - Bypass service workers for WebSocket handshake channels; r=bkelly (845fd17110) - Bug 1217089 - Remove fetch-request-html-imports.https.html; r=bkelly (528ea318b6) - Bug 1188545 - Update expected results for some service worker tests. a=testonly (ba29add4a5) - Bug 1213119 Lengthen timeout in test checking for failure to load iframes and windows. r=ehsan (d25f8f9b01) - Bug 1189671 - Fix getregistrations test. r=jgraham (2407499bc5) - Bug 1217367 - Add a wpt test that verified coalesced .update() calls resolve properly. r=bkelly (7e3f4a92e1) - Bug 1200677 - Import navigation-redirect.https.html for non-e10s. r=jdm (6e6d98a255) - Bug 1251498: Implement IDBKeyRange.includes(). r=baku (89c839adaf) - Bug 1248338 - Implement iterationStart; r=birtles (5dcb1341c3) - Bug 1244635 - Part1 Add enddelay implementation in dom/animation/AnimationEffectTiming.cpp r=bz,hiro (e0a9f3a798) - Bug 1244635 - Part2 Add enddelay tests in dom/animation/test/chrome r=hiro (98d2f5ada5) - Bug 1244635 - Part3 Add enddelay tests in testing/web-platform/tests/web-animations r=hiro (bb10a41382) - Bug 1244635 - Part4 Add enddelay tests in layout/style/test r=hiro (ceda978f3e) - Bug 1237173 - Part1: Move TimingParam struct to a new file. r=birtles (ad46be831b) - Bug 1251804 - Use the ImageContainer's size and not the intrinsic size when computing the transform in nsDisplayImage::ConfigureLayer. r=tn (23bd3774ff) - Bug 1247554 - Budget creation of AGRs by frame area; r=mattwoodrow (c68183c77e) - Require mix-blend mode support in all compositors and layer managers. (bug 1209278 part 1, r=mstange) (e00752064f) - Remove lazy scrollinfo hoisting introduced in bug 1193557. (bug 1209278 part 2, r=mstange) (394c117b8d) - Bug 1152049 - Apply all scroll clips when computing plugin clips in content. r=tn (9c44108dda) - Bug 1238564 - Anticipate async scrolling when computing the scroll clipped bounds of a display list. r=roc (4c28888eb6) - Bug 1238564 - Allow constructing nsDisplayWrapList with a given scroll clip. r=roc (dd6d6d1a02) - Fold nsDisplayBlendContainer constructors. (bug 1209278 part 3, r=mstange) (e28cb8d062) - Bug 1253052. Only schedule paint when apz aware event listener is added if event regions/apz are enabled. r=kats (4a2dcd2e31) - Bug 1252929: Next.1. Make layers.max-active preference not need a restart. r=mstange (412d52ff81) - Bug 1247554 - Mark nsPresContext::GetVisibleArea as const; r=mattwoodrow (8ad99e89a2) - Bug 1104916 - Implement CSS media query display-mode. r=cam (6bf38de62c) - Bug 1247098 - Mark nsIPresShell::GetResolution and nsPresContext::IsRootContentDocument as const. r=tnikkel (2514fe01c2) - Bug 1253078 - Switch MOZ_STYLO environmental variable to MOZ_DISABLE_STYLO. r=dholbert (8c6dfe008e) - Bug 1232181 - Notify plugins about scroll state. r=roc (1eccaad547) - Bug 1198663. Tolerate null Image in Android NPAPI plugins. r=snorp (bfceeacbe8) - Bug 1232181 - Add an image layer for plugin frames that represent windowed plugins on platforms that support scroll capture. r=roc (c064e01b19) - Bug 1171182 - Browser Zoom Query for NPAPI; r=bsmedberg r=jaas (95c60d2190) - Bug 1243639 - Remove Honeycomb flash-related code. r=snorp (437bdfa5e8) - Bug 1177367 - Don't fall through to non-e10s plugin widget creation when e10s creation fails. r=aklotz (7fb106e260) - Bug 1250634 - Part 0: Fix MacroAssembler support for store16(). r=jandem (99fdf6fd42) - Bug 1250634 - Part 1: Refactor FreeSpan management to be less indirect and confusing. r=terrence, r=jandem (50f57a129c) - Bug 1253094, part 5 - Stop using DebugOnly for class/struct members in layout/. r=mats (bcb94cc110) - Bug 1238564 - Set the innermost possible scroll clip on opacity items during creation. r=mattwoodrow (da5072cb75) - Bug 1192910 - Ensure we flush paints on the main thread during an APZ flush. r=mstange (ff4631bcd8) - Bug 1254263 - Add a flag to allow disabling paint-skipping. r=mstange (90375f4f31) - Bug 1248913 - nsDisplayListBuilder doesn't need to know what blend modes it contains, just whether it contains any. r=mattwoodrow (92c987df65) - Bug 1248913 - Add a constructor argument to nsDisplayMixBlendMode that lets you specify the blend mode. r=mattwoodrow (66234cc69c) - Bug 1238564 - When building a fixed/sticky display item, don't restore the clip until we're ready to build that item so that inner items aren't unnecessarily clipped. r=roc (752f531f08) - Bug 1238564 - Include mIsAsyncScrollable information in DisplayItemScrollClip::ToString. r=roc (b6ac4899eb) - Bug 1238564 - Don't do another pass over the display list to figure out ancestor scroll clips. r=mattwoodrow (12ad134528) - Bug 1238564 - Get rid of cross stacking context parent scroll clip. r=mattwoodrow (536faa6ba6) - Bug 1248913 - Rename nsDisplayMixBlendMode to nsDisplayBlendMode. r=mattwoodrow (34a0704841) - Bug 1248913 - Let nsDisplayBackgroundImage specify the background blend mode. r=mattwoodrow (cc671af9e3) - Bug 619500: Part 1. Default sizing for specified size of SVG images which have no constraints; r=dholbert r=seth (b0f7ec56a8) - Bug 619500: Part 2. When drawing an SVG image as a CSS border-image, use preverveAspectRatio="none"; r=dholbert (1dad64f38c) - Bug 619500: Part 3. svg-as-borderimage test cases; r=dholbert (896d339cf9) - Bug 619500: Part 4. Remove one unused data member in SVGDrawingParameters; r=dholbert (f16e9a5927) - Bug 1230415 - Use DrawTarget instead of gfxContext in PaintBorderWithStyleBorder(). r=roc. (f00cccb284) - Bug 1248913 - Build nsDisplayBlendMode items for background-blend-mode. r=mattwoodrow (105515a553) - Bug 1248913 - Remove mCanBeActive and second nsDisplayBlendContainer constructor. r=mattwoodrow (d984db61f5) - Bug 1248913 - Make nsDisplayBlendContainer active or inactive based on its contents. r=mattwoodrow (f44fa4f479) - Bug 1248913 - Reftest. (58a1507343) - Bug 1251833 - Part 1: Move allocation into FreeSpan and move firstFreeSpan to the top of Arenas. r=terrence (3f4d239785) - Bug 1251833 - Part 2: Clean up the various iterators a bit. r=terrence (300aa5673d) - Bug 1251527 - Don't override visible regions for background-attachment:fixed. r=mstange (ee2d53334d) - Backout e00a02282951 (bug 1232229) as we no longer need the diagnostics. (22f0063541) - Bug 1250718 - Don't flatten opacity to an intermediate surface when used in the middle of preserve-3d. r=thinker (9df994b834) - Bug 1196114 - Part 1: Add SetPerformanceWarning. r=birtles (165f9cbcfc) - Bug 1196114 - Part 2: Add AnimationPropertyStatus interface and KeyframeEffectReadOnly.runningStatus(). r=birtles,smaug (4e3d2d55e0) - Bug 1196114 - Part 3: Set AnimationPerformanceWarning messages. r=birtles (cd3497e128) - Bug 1196114 - Part 4: Localize messages for animation performance warnings. r=birtles (1b1676b7b6) - Bug 1196114 - Part 5: Store performce warning information as enum type. r=birtles (d2ec6643d3) - Bug 1221378: Properly root object passed to the allocation metadata callback. r=fitzgen (37831b769c) - Bug 1225005 - Clamp negative values in containing block size. r=roc (8e525d5265) - Bug 1192245 - Fix tests that fail with incremental zeal r=terrence (6ca6f63135) - Bug 1249367 - Make background finalization a GC phase (and clean up Zones properly); r=jonco (43d9a1fafe) - Bug 1119537 - Make decommit a proper GC phase; r=jonco (638492711e) - Bug 1232229 - Add assertions to prevent nursery allocation when setting up OMT parse tasks r=terrence (e12cd405c2) - Backed out changeset 2a613f5a5866 (bug 1119537) for hazard failures (623123a764) - Bug 1249896 - Part 6: Add gc namespace for Arena::thingsSpan. r=terrence (ba1e1d41b0) - Bug 1251833 - Part 3: Merge ArenaHeader into Arena. r=terrence (e8bd53b44e) - Bug 1232181 - Plugin module plumbing for retrieving scroll captures and updating plugin instance content scroll state. r=roc (2309d423cc) - Bug 1232181 - Add a few win resource helpers. r=aklotz (1421a9695a) - Bug 1232181 - Add support for capturing plugin windows on Windows. r=aklotz (4ccbfeb19e)
601 lines
19 KiB
C++
601 lines
19 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
/* class that manages rules for positioning floats */
|
|
|
|
#include "nsFloatManager.h"
|
|
#include "nsIPresShell.h"
|
|
#include "nsMemory.h"
|
|
#include "nsHTMLReflowState.h"
|
|
#include "nsBlockDebugFlags.h"
|
|
#include "nsError.h"
|
|
#include <algorithm>
|
|
|
|
using namespace mozilla;
|
|
|
|
int32_t nsFloatManager::sCachedFloatManagerCount = 0;
|
|
void* nsFloatManager::sCachedFloatManagers[NS_FLOAT_MANAGER_CACHE_SIZE];
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// PresShell Arena allocate callback (for nsIntervalSet use below)
|
|
static void*
|
|
PSArenaAllocCB(size_t aSize, void* aClosure)
|
|
{
|
|
return static_cast<nsIPresShell*>(aClosure)->AllocateMisc(aSize);
|
|
}
|
|
|
|
// PresShell Arena free callback (for nsIntervalSet use below)
|
|
static void
|
|
PSArenaFreeCB(size_t aSize, void* aPtr, void* aClosure)
|
|
{
|
|
static_cast<nsIPresShell*>(aClosure)->FreeMisc(aSize, aPtr);
|
|
}
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
// nsFloatManager
|
|
|
|
nsFloatManager::nsFloatManager(nsIPresShell* aPresShell,
|
|
mozilla::WritingMode aWM)
|
|
:
|
|
#ifdef DEBUG
|
|
mWritingMode(aWM),
|
|
#endif
|
|
mLineLeft(0), mBlockStart(0),
|
|
mFloatDamage(PSArenaAllocCB, PSArenaFreeCB, aPresShell),
|
|
mPushedLeftFloatPastBreak(false),
|
|
mPushedRightFloatPastBreak(false),
|
|
mSplitLeftFloatAcrossBreak(false),
|
|
mSplitRightFloatAcrossBreak(false)
|
|
{
|
|
MOZ_COUNT_CTOR(nsFloatManager);
|
|
}
|
|
|
|
nsFloatManager::~nsFloatManager()
|
|
{
|
|
MOZ_COUNT_DTOR(nsFloatManager);
|
|
}
|
|
|
|
// static
|
|
void* nsFloatManager::operator new(size_t aSize) CPP_THROW_NEW
|
|
{
|
|
if (sCachedFloatManagerCount > 0) {
|
|
// We have cached unused instances of this class, return a cached
|
|
// instance in stead of always creating a new one.
|
|
return sCachedFloatManagers[--sCachedFloatManagerCount];
|
|
}
|
|
|
|
// The cache is empty, this means we haveto create a new instance using
|
|
// the global |operator new|.
|
|
return moz_xmalloc(aSize);
|
|
}
|
|
|
|
void
|
|
nsFloatManager::operator delete(void* aPtr, size_t aSize)
|
|
{
|
|
if (!aPtr)
|
|
return;
|
|
// This float manager is no longer used, if there's still room in
|
|
// the cache we'll cache this float manager, unless the layout
|
|
// module was already shut down.
|
|
|
|
if (sCachedFloatManagerCount < NS_FLOAT_MANAGER_CACHE_SIZE &&
|
|
sCachedFloatManagerCount >= 0) {
|
|
// There's still space in the cache for more instances, put this
|
|
// instance in the cache in stead of deleting it.
|
|
|
|
sCachedFloatManagers[sCachedFloatManagerCount++] = aPtr;
|
|
return;
|
|
}
|
|
|
|
// The cache is full, or the layout module has been shut down,
|
|
// delete this float manager.
|
|
free(aPtr);
|
|
}
|
|
|
|
|
|
/* static */
|
|
void nsFloatManager::Shutdown()
|
|
{
|
|
// The layout module is being shut down, clean up the cache and
|
|
// disable further caching.
|
|
|
|
int32_t i;
|
|
|
|
for (i = 0; i < sCachedFloatManagerCount; i++) {
|
|
void* floatManager = sCachedFloatManagers[i];
|
|
if (floatManager)
|
|
free(floatManager);
|
|
}
|
|
|
|
// Disable further caching.
|
|
sCachedFloatManagerCount = -1;
|
|
}
|
|
|
|
#define CHECK_BLOCK_DIR(aWM) \
|
|
NS_ASSERTION(aWM.GetBlockDir() == mWritingMode.GetBlockDir(), \
|
|
"incompatible writing modes")
|
|
|
|
nsFlowAreaRect
|
|
nsFloatManager::GetFlowArea(WritingMode aWM, nscoord aBOffset,
|
|
BandInfoType aInfoType, nscoord aBSize,
|
|
LogicalRect aContentArea, SavedState* aState,
|
|
const nsSize& aContainerSize) const
|
|
{
|
|
CHECK_BLOCK_DIR(aWM);
|
|
NS_ASSERTION(aBSize >= 0, "unexpected max block size");
|
|
NS_ASSERTION(aContentArea.ISize(aWM) >= 0,
|
|
"unexpected content area inline size");
|
|
|
|
nscoord blockStart = aBOffset + mBlockStart;
|
|
if (blockStart < nscoord_MIN) {
|
|
NS_WARNING("bad value");
|
|
blockStart = nscoord_MIN;
|
|
}
|
|
|
|
// Determine the last float that we should consider.
|
|
uint32_t floatCount;
|
|
if (aState) {
|
|
// Use the provided state.
|
|
floatCount = aState->mFloatInfoCount;
|
|
MOZ_ASSERT(floatCount <= mFloats.Length(), "bad state");
|
|
} else {
|
|
// Use our current state.
|
|
floatCount = mFloats.Length();
|
|
}
|
|
|
|
// If there are no floats at all, or we're below the last one, return
|
|
// quickly.
|
|
if (floatCount == 0 ||
|
|
(mFloats[floatCount-1].mLeftBEnd <= blockStart &&
|
|
mFloats[floatCount-1].mRightBEnd <= blockStart)) {
|
|
return nsFlowAreaRect(aWM, aContentArea.IStart(aWM), aBOffset,
|
|
aContentArea.ISize(aWM), aBSize, false);
|
|
}
|
|
|
|
nscoord blockEnd;
|
|
if (aBSize == nscoord_MAX) {
|
|
// This warning (and the two below) are possible to hit on pages
|
|
// with really large objects.
|
|
NS_WARN_IF_FALSE(aInfoType == BAND_FROM_POINT,
|
|
"bad height");
|
|
blockEnd = nscoord_MAX;
|
|
} else {
|
|
blockEnd = blockStart + aBSize;
|
|
if (blockEnd < blockStart || blockEnd > nscoord_MAX) {
|
|
NS_WARNING("bad value");
|
|
blockEnd = nscoord_MAX;
|
|
}
|
|
}
|
|
nscoord lineLeft = mLineLeft + aContentArea.LineLeft(aWM, aContainerSize);
|
|
nscoord lineRight = mLineLeft + aContentArea.LineRight(aWM, aContainerSize);
|
|
if (lineRight < lineLeft) {
|
|
NS_WARNING("bad value");
|
|
lineRight = lineLeft;
|
|
}
|
|
|
|
// Walk backwards through the floats until we either hit the front of
|
|
// the list or we're above |blockStart|.
|
|
bool haveFloats = false;
|
|
for (uint32_t i = floatCount; i > 0; --i) {
|
|
const FloatInfo &fi = mFloats[i-1];
|
|
if (fi.mLeftBEnd <= blockStart && fi.mRightBEnd <= blockStart) {
|
|
// There aren't any more floats that could intersect this band.
|
|
break;
|
|
}
|
|
if (fi.IsEmpty()) {
|
|
// For compatibility, ignore floats with empty rects, even though it
|
|
// disagrees with the spec. (We might want to fix this in the
|
|
// future, though.)
|
|
continue;
|
|
}
|
|
|
|
nscoord floatBStart = fi.BStart();
|
|
nscoord floatBEnd = fi.BEnd();
|
|
if (blockStart < floatBStart && aInfoType == BAND_FROM_POINT) {
|
|
// This float is below our band. Shrink our band's height if needed.
|
|
if (floatBStart < blockEnd) {
|
|
blockEnd = floatBStart;
|
|
}
|
|
}
|
|
// If blockStart == blockEnd (which happens only with WIDTH_WITHIN_HEIGHT),
|
|
// we include floats that begin at our 0-height vertical area. We
|
|
// need to to this to satisfy the invariant that a
|
|
// WIDTH_WITHIN_HEIGHT call is at least as narrow on both sides as a
|
|
// BAND_WITHIN_POINT call beginning at its blockStart.
|
|
else if (blockStart < floatBEnd &&
|
|
(floatBStart < blockEnd ||
|
|
(floatBStart == blockEnd && blockStart == blockEnd))) {
|
|
// This float is in our band.
|
|
|
|
// Shrink our band's height if needed.
|
|
if (floatBEnd < blockEnd && aInfoType == BAND_FROM_POINT) {
|
|
blockEnd = floatBEnd;
|
|
}
|
|
|
|
// Shrink our band's width if needed.
|
|
uint8_t floatStyle = fi.mFrame->StyleDisplay()->PhysicalFloats(aWM);
|
|
if (floatStyle == NS_STYLE_FLOAT_LEFT) {
|
|
// A left float
|
|
nscoord lineRightEdge = fi.LineRight();
|
|
if (lineRightEdge > lineLeft) {
|
|
lineLeft = lineRightEdge;
|
|
// Only set haveFloats to true if the float is inside our
|
|
// containing block. This matches the spec for what some
|
|
// callers want and disagrees for other callers, so we should
|
|
// probably provide better information at some point.
|
|
haveFloats = true;
|
|
}
|
|
} else {
|
|
// A right float
|
|
nscoord lineLeftEdge = fi.LineLeft();
|
|
if (lineLeftEdge < lineRight) {
|
|
lineRight = lineLeftEdge;
|
|
// See above.
|
|
haveFloats = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
nscoord blockSize = (blockEnd == nscoord_MAX) ?
|
|
nscoord_MAX : (blockEnd - blockStart);
|
|
// convert back from LineLeft/Right to IStart
|
|
nscoord inlineStart = aWM.IsBidiLTR()
|
|
? lineLeft - mLineLeft
|
|
: mLineLeft - lineRight +
|
|
LogicalSize(aWM, aContainerSize).ISize(aWM);
|
|
|
|
return nsFlowAreaRect(aWM, inlineStart, blockStart - mBlockStart,
|
|
lineRight - lineLeft, blockSize, haveFloats);
|
|
}
|
|
|
|
nsresult
|
|
nsFloatManager::AddFloat(nsIFrame* aFloatFrame, const LogicalRect& aMarginRect,
|
|
WritingMode aWM, const nsSize& aContainerSize)
|
|
{
|
|
CHECK_BLOCK_DIR(aWM);
|
|
NS_ASSERTION(aMarginRect.ISize(aWM) >= 0, "negative inline size!");
|
|
NS_ASSERTION(aMarginRect.BSize(aWM) >= 0, "negative block size!");
|
|
|
|
FloatInfo info(aFloatFrame,
|
|
aMarginRect.LineLeft(aWM, aContainerSize) + mLineLeft,
|
|
aMarginRect.BStart(aWM) + mBlockStart,
|
|
aMarginRect.ISize(aWM),
|
|
aMarginRect.BSize(aWM));
|
|
|
|
// Set mLeftBEnd and mRightBEnd.
|
|
if (HasAnyFloats()) {
|
|
FloatInfo &tail = mFloats[mFloats.Length() - 1];
|
|
info.mLeftBEnd = tail.mLeftBEnd;
|
|
info.mRightBEnd = tail.mRightBEnd;
|
|
} else {
|
|
info.mLeftBEnd = nscoord_MIN;
|
|
info.mRightBEnd = nscoord_MIN;
|
|
}
|
|
uint8_t floatStyle = aFloatFrame->StyleDisplay()->PhysicalFloats(aWM);
|
|
NS_ASSERTION(floatStyle == NS_STYLE_FLOAT_LEFT ||
|
|
floatStyle == NS_STYLE_FLOAT_RIGHT, "unexpected float");
|
|
nscoord& sideBEnd = floatStyle == NS_STYLE_FLOAT_LEFT ? info.mLeftBEnd
|
|
: info.mRightBEnd;
|
|
nscoord thisBEnd = info.BEnd();
|
|
if (thisBEnd > sideBEnd)
|
|
sideBEnd = thisBEnd;
|
|
|
|
if (!mFloats.AppendElement(info))
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
// static
|
|
LogicalRect
|
|
nsFloatManager::CalculateRegionFor(WritingMode aWM,
|
|
nsIFrame* aFloat,
|
|
const LogicalMargin& aMargin,
|
|
const nsSize& aContainerSize)
|
|
{
|
|
// We consider relatively positioned frames at their original position.
|
|
LogicalRect region(aWM, nsRect(aFloat->GetNormalPosition(),
|
|
aFloat->GetSize()),
|
|
aContainerSize);
|
|
|
|
// Float region includes its margin
|
|
region.Inflate(aWM, aMargin);
|
|
|
|
// Don't store rectangles with negative margin-box width or height in
|
|
// the float manager; it can't deal with them.
|
|
if (region.ISize(aWM) < 0) {
|
|
// Preserve the right margin-edge for left floats and the left
|
|
// margin-edge for right floats
|
|
const nsStyleDisplay* display = aFloat->StyleDisplay();
|
|
uint8_t floatStyle = display->PhysicalFloats(aWM);
|
|
if ((NS_STYLE_FLOAT_LEFT == floatStyle) == aWM.IsBidiLTR()) {
|
|
region.IStart(aWM) = region.IEnd(aWM);
|
|
}
|
|
region.ISize(aWM) = 0;
|
|
}
|
|
if (region.BSize(aWM) < 0) {
|
|
region.BSize(aWM) = 0;
|
|
}
|
|
return region;
|
|
}
|
|
|
|
NS_DECLARE_FRAME_PROPERTY_DELETABLE(FloatRegionProperty, nsMargin)
|
|
|
|
LogicalRect
|
|
nsFloatManager::GetRegionFor(WritingMode aWM, nsIFrame* aFloat,
|
|
const nsSize& aContainerSize)
|
|
{
|
|
LogicalRect region = aFloat->GetLogicalRect(aWM, aContainerSize);
|
|
void* storedRegion = aFloat->Properties().Get(FloatRegionProperty());
|
|
if (storedRegion) {
|
|
nsMargin margin = *static_cast<nsMargin*>(storedRegion);
|
|
region.Inflate(aWM, LogicalMargin(aWM, margin));
|
|
}
|
|
return region;
|
|
}
|
|
|
|
void
|
|
nsFloatManager::StoreRegionFor(WritingMode aWM, nsIFrame* aFloat,
|
|
const LogicalRect& aRegion,
|
|
const nsSize& aContainerSize)
|
|
{
|
|
nsRect region = aRegion.GetPhysicalRect(aWM, aContainerSize);
|
|
nsRect rect = aFloat->GetRect();
|
|
FrameProperties props = aFloat->Properties();
|
|
if (region.IsEqualEdges(rect)) {
|
|
props.Delete(FloatRegionProperty());
|
|
}
|
|
else {
|
|
nsMargin* storedMargin = static_cast<nsMargin*>
|
|
(props.Get(FloatRegionProperty()));
|
|
if (!storedMargin) {
|
|
storedMargin = new nsMargin();
|
|
props.Set(FloatRegionProperty(), storedMargin);
|
|
}
|
|
*storedMargin = region - rect;
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
nsFloatManager::RemoveTrailingRegions(nsIFrame* aFrameList)
|
|
{
|
|
if (!aFrameList) {
|
|
return NS_OK;
|
|
}
|
|
// This could be a good bit simpler if we could guarantee that the
|
|
// floats given were at the end of our list, so we could just search
|
|
// for the head of aFrameList. (But we can't;
|
|
// layout/reftests/bugs/421710-1.html crashes.)
|
|
nsTHashtable<nsPtrHashKey<nsIFrame> > frameSet(1);
|
|
|
|
for (nsIFrame* f = aFrameList; f; f = f->GetNextSibling()) {
|
|
frameSet.PutEntry(f);
|
|
}
|
|
|
|
uint32_t newLength = mFloats.Length();
|
|
while (newLength > 0) {
|
|
if (!frameSet.Contains(mFloats[newLength - 1].mFrame)) {
|
|
break;
|
|
}
|
|
--newLength;
|
|
}
|
|
mFloats.TruncateLength(newLength);
|
|
|
|
#ifdef DEBUG
|
|
for (uint32_t i = 0; i < mFloats.Length(); ++i) {
|
|
NS_ASSERTION(!frameSet.Contains(mFloats[i].mFrame),
|
|
"Frame region deletion was requested but we couldn't delete it");
|
|
}
|
|
#endif
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
nsFloatManager::PushState(SavedState* aState)
|
|
{
|
|
NS_PRECONDITION(aState, "Need a place to save state");
|
|
|
|
// This is a cheap push implementation, which
|
|
// only saves the (x,y) and last frame in the mFrameInfoMap
|
|
// which is enough info to get us back to where we should be
|
|
// when pop is called.
|
|
//
|
|
// This push/pop mechanism is used to undo any
|
|
// floats that were added during the unconstrained reflow
|
|
// in nsBlockReflowContext::DoReflowBlock(). (See bug 96736)
|
|
//
|
|
// It should also be noted that the state for mFloatDamage is
|
|
// intentionally not saved or restored in PushState() and PopState(),
|
|
// since that could lead to bugs where damage is missed/dropped when
|
|
// we move from position A to B (during the intermediate incremental
|
|
// reflow mentioned above) and then from B to C during the subsequent
|
|
// reflow. In the typical case A and C will be the same, but not always.
|
|
// Allowing mFloatDamage to accumulate the damage incurred during both
|
|
// reflows ensures that nothing gets missed.
|
|
aState->mLineLeft = mLineLeft;
|
|
aState->mBlockStart = mBlockStart;
|
|
aState->mPushedLeftFloatPastBreak = mPushedLeftFloatPastBreak;
|
|
aState->mPushedRightFloatPastBreak = mPushedRightFloatPastBreak;
|
|
aState->mSplitLeftFloatAcrossBreak = mSplitLeftFloatAcrossBreak;
|
|
aState->mSplitRightFloatAcrossBreak = mSplitRightFloatAcrossBreak;
|
|
aState->mFloatInfoCount = mFloats.Length();
|
|
}
|
|
|
|
void
|
|
nsFloatManager::PopState(SavedState* aState)
|
|
{
|
|
NS_PRECONDITION(aState, "No state to restore?");
|
|
|
|
mLineLeft = aState->mLineLeft;
|
|
mBlockStart = aState->mBlockStart;
|
|
mPushedLeftFloatPastBreak = aState->mPushedLeftFloatPastBreak;
|
|
mPushedRightFloatPastBreak = aState->mPushedRightFloatPastBreak;
|
|
mSplitLeftFloatAcrossBreak = aState->mSplitLeftFloatAcrossBreak;
|
|
mSplitRightFloatAcrossBreak = aState->mSplitRightFloatAcrossBreak;
|
|
|
|
NS_ASSERTION(aState->mFloatInfoCount <= mFloats.Length(),
|
|
"somebody misused PushState/PopState");
|
|
mFloats.TruncateLength(aState->mFloatInfoCount);
|
|
}
|
|
|
|
nscoord
|
|
nsFloatManager::GetLowestFloatTop() const
|
|
{
|
|
if (mPushedLeftFloatPastBreak || mPushedRightFloatPastBreak) {
|
|
return nscoord_MAX;
|
|
}
|
|
if (!HasAnyFloats()) {
|
|
return nscoord_MIN;
|
|
}
|
|
return mFloats[mFloats.Length() -1].BStart() - mBlockStart;
|
|
}
|
|
|
|
#ifdef DEBUG_FRAME_DUMP
|
|
void
|
|
DebugListFloatManager(const nsFloatManager *aFloatManager)
|
|
{
|
|
aFloatManager->List(stdout);
|
|
}
|
|
|
|
nsresult
|
|
nsFloatManager::List(FILE* out) const
|
|
{
|
|
if (!HasAnyFloats())
|
|
return NS_OK;
|
|
|
|
for (uint32_t i = 0; i < mFloats.Length(); ++i) {
|
|
const FloatInfo &fi = mFloats[i];
|
|
fprintf_stderr(out, "Float %u: frame=%p rect={%d,%d,%d,%d} ymost={l:%d, r:%d}\n",
|
|
i, static_cast<void*>(fi.mFrame),
|
|
fi.LineLeft(), fi.BStart(), fi.ISize(), fi.BSize(),
|
|
fi.mLeftBEnd, fi.mRightBEnd);
|
|
}
|
|
return NS_OK;
|
|
}
|
|
#endif
|
|
|
|
nscoord
|
|
nsFloatManager::ClearFloats(nscoord aBCoord, uint8_t aBreakType,
|
|
uint32_t aFlags) const
|
|
{
|
|
if (!(aFlags & DONT_CLEAR_PUSHED_FLOATS) && ClearContinues(aBreakType)) {
|
|
return nscoord_MAX;
|
|
}
|
|
if (!HasAnyFloats()) {
|
|
return aBCoord;
|
|
}
|
|
|
|
nscoord blockEnd = aBCoord + mBlockStart;
|
|
|
|
const FloatInfo &tail = mFloats[mFloats.Length() - 1];
|
|
switch (aBreakType) {
|
|
case NS_STYLE_CLEAR_BOTH:
|
|
blockEnd = std::max(blockEnd, tail.mLeftBEnd);
|
|
blockEnd = std::max(blockEnd, tail.mRightBEnd);
|
|
break;
|
|
case NS_STYLE_CLEAR_LEFT:
|
|
blockEnd = std::max(blockEnd, tail.mLeftBEnd);
|
|
break;
|
|
case NS_STYLE_CLEAR_RIGHT:
|
|
blockEnd = std::max(blockEnd, tail.mRightBEnd);
|
|
break;
|
|
default:
|
|
// Do nothing
|
|
break;
|
|
}
|
|
|
|
blockEnd -= mBlockStart;
|
|
|
|
return blockEnd;
|
|
}
|
|
|
|
bool
|
|
nsFloatManager::ClearContinues(uint8_t aBreakType) const
|
|
{
|
|
return ((mPushedLeftFloatPastBreak || mSplitLeftFloatAcrossBreak) &&
|
|
(aBreakType == NS_STYLE_CLEAR_BOTH ||
|
|
aBreakType == NS_STYLE_CLEAR_LEFT)) ||
|
|
((mPushedRightFloatPastBreak || mSplitRightFloatAcrossBreak) &&
|
|
(aBreakType == NS_STYLE_CLEAR_BOTH ||
|
|
aBreakType == NS_STYLE_CLEAR_RIGHT));
|
|
}
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
// FloatInfo
|
|
|
|
nsFloatManager::FloatInfo::FloatInfo(nsIFrame* aFrame,
|
|
nscoord aLineLeft, nscoord aBStart,
|
|
nscoord aISize, nscoord aBSize)
|
|
: mFrame(aFrame)
|
|
, mRect(aLineLeft, aBStart, aISize, aBSize)
|
|
{
|
|
MOZ_COUNT_CTOR(nsFloatManager::FloatInfo);
|
|
}
|
|
|
|
#ifdef NS_BUILD_REFCNT_LOGGING
|
|
nsFloatManager::FloatInfo::FloatInfo(const FloatInfo& aOther)
|
|
: mFrame(aOther.mFrame),
|
|
mLeftBEnd(aOther.mLeftBEnd),
|
|
mRightBEnd(aOther.mRightBEnd),
|
|
mRect(aOther.mRect)
|
|
{
|
|
MOZ_COUNT_CTOR(nsFloatManager::FloatInfo);
|
|
}
|
|
|
|
nsFloatManager::FloatInfo::~FloatInfo()
|
|
{
|
|
MOZ_COUNT_DTOR(nsFloatManager::FloatInfo);
|
|
}
|
|
#endif
|
|
|
|
//----------------------------------------------------------------------
|
|
|
|
nsAutoFloatManager::~nsAutoFloatManager()
|
|
{
|
|
// Restore the old float manager in the reflow state if necessary.
|
|
if (mNew) {
|
|
#ifdef NOISY_FLOATMANAGER
|
|
printf("restoring old float manager %p\n", mOld);
|
|
#endif
|
|
|
|
mReflowState.mFloatManager = mOld;
|
|
|
|
#ifdef NOISY_FLOATMANAGER
|
|
if (mOld) {
|
|
static_cast<nsFrame *>(mReflowState.frame)->ListTag(stdout);
|
|
printf(": space-manager %p after reflow\n", mOld);
|
|
mOld->List(stdout);
|
|
}
|
|
#endif
|
|
|
|
delete mNew;
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
nsAutoFloatManager::CreateFloatManager(nsPresContext *aPresContext)
|
|
{
|
|
// Create a new float manager and install it in the reflow
|
|
// state. `Remember' the old float manager so we can restore it
|
|
// later.
|
|
mNew = new nsFloatManager(aPresContext->PresShell(),
|
|
mReflowState.GetWritingMode());
|
|
if (! mNew)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
#ifdef NOISY_FLOATMANAGER
|
|
printf("constructed new float manager %p (replacing %p)\n",
|
|
mNew, mReflowState.mFloatManager);
|
|
#endif
|
|
|
|
// Set the float manager in the existing reflow state
|
|
mOld = mReflowState.mFloatManager;
|
|
mReflowState.mFloatManager = mNew;
|
|
return NS_OK;
|
|
}
|