mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-29 10:32:23 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1140148 - Update reftest manifests for Android 4.3 emulator; r=dminor (69b7ed099) - Bug 742176 - Remove/reduce fuzz annotations for tests that no longer appear to be affected by bad overflow areas. r=ehsan (8fac68e26) - pieces of older patches (6d4b30aed) - Bug 1153574 - Re-enable Mulet reftests taskcluster-specific disables. r=ahal, a=test-only (72ed7dbc2) - part of Bug 1138442 - Disable reftests on Mulet in parity with B2G/B2G (8baf07b3c) - Bug 1073209 - Eliminate usage of CreateSamplingRestrictedDrawable on OS X. r=jrmuizel (86bee3fbc) - Bug 1148889 - Fuzz some android tests. r=mstange (f63be045e) - Mark unaccelerated antialiasing reftest failures with APZ as fuzzy. (bug 1157716, r=mstange) (4c0c0f034) - Bug 1156197. Just use the return value of the cols DOM property for determining the default number of rendered columns for a textarea. r=ms2ger (16ab3064f) - uniform emoji tests here (5a1e9802c) - mulet was missing (433a50d93) - Bug 1141511 - Disable some gtk2Widget-dependant reftests on Mulet. r=ahal (80d3cef05) - Bug 1141607. Fix the initial value of outline-color to actually be correct. r=dbaron (309275f24) - part of Bug 1138442 - Disable reftests on Mulet in parity with B2G/B2G (b7a3bb189) - Bug 1141511 - Disable some gtk2Widget-dependant reftests on Mulet. r=ahal (1afac0742) - Bug 1153845 - For CSS filters, make the primitive subregions big enough to contain the whole pre-filter visual overflow rect. r=roc (6d56dd6f9) - annotate (090064379) - boh (39f7c5aba) - Bug 1170158 - Apply GTK2 reftest exceptions to GTK3. r=karlt (1f1299503) - Bug 1165185 - Try to avoid invalidations when scrolling transformed elements. r=roc (d4693eb11) - Bug 1165185 - Nudge layer prescale to integers. r=roc (2ac6881fc) - remove spurious file (58fc9059b) - Bug 1145730 - Restrict the async transforms applied to mask layers to those caused by fixed-position adjustment. r=kats (ebdcc1223) - Bug 1146024 - Fix up input routing for APZ on Fennec. r=kats (85e8b249b) - Bug 1146024 - Followup to fix non-android bustage on a CLOSED TREE. r=bustage (1ccd4a58f) - Bug 1133905. Add some reftests. (89c9f9c8c) - Bug 1133905. Make layout place scrollbars at the scroll position clamping scrollport size when one is set so that scrollbars are positioned properly on b2g. r=mstange (841279606) - Bug 1155359 - Add a reftest; r=gw280 (a6e7aeb78) - Bug 1155359 follow-up: Disable the test on B2G and Mulet (d709b7c54) - Bug 1157726: Updated algorithm to match ICU implementation of support for bidi isolates. r=smontagu (96d9801e1) - Bug 1154892 - mozinstall fails to install on Mac with paths which contain white spaces. r=chmanchester (1bddadcdd) - Bug 1151908 - Updating our character property data with new Bidi info from Unicode 6.3. r=smontagu (c34f88172) - Bug 817406 part 2 - Tests for propagating 'direction' to the viewport. (3bc7bfa40) - Bug 1139306. Adjust heights of scrollable area so scrollbar sizes almost match in reftests now that RTL scrollbars correctly show in these reftests. r=smontagu (9c77c96ed) - Bug 817406 part 3 - Increase the fuzz factors slightly on a few tests for bug 1133905. (22d8a4cbc) - Bug 1148582. Part 3 follow up. Properly test if a scroll frame uses async scrolling when determining if it needs its clip put on its layer. r=mstange (13beb6a24) - Fix tests that depend on synchronous scrolling. (bug 1140293, r=mstange,masayuki,kgilbert) (578d2ff1e) - fix order because of mispatch (75279e185) - Bug 1162009 - Add TOUCH_CANCEL sending on e10s. r=kats (0fc5574ac) - Bug 1162179 - Don't create APZCTreeManagers for windows which aren't multiprocess. r=dvander (135d115e0) - Enable APZ for all Desktop windows if E10s is enabled. (bug 1163115, r=kats) (354729297) - Fix wheel events not applying root scroll delta overrides. (bug 1147223 part 1, r=kats) (6d650c449) - fix patch order (08b9ad9bd) - Improve bad APZ wheel pref detection in about:support. (bug 1147223 part 2, r=kats) (292fa3634) - Bug 1151890 - Explicitly set a null MessageLoop for the APZ controller thread on OS X. r=mstange (a4fe37d78) - Bug 1148868 - Put the APZ event thread on Mac behind a pref layers.async-pan-zoom.separate-event-thread that defaults to false. r=dvander (827a7cca7) - Backed out changeset c5af69669855 (bug 1124084) for various regressions. (28d328c8d) - Bug 1141819 - Don't implicitly dispatch a runnable to the main thread in RasterImage::StartDecoding. r=baku (1d1233319) - Bug 1124088 - Rename decode-on-draw to decode-only-on-draw. r=tn (83c24cdb7) - Bug 1149893 - Add a pref that makes us decode all images immediately. r=baku (6432ae587) - Bug 1156401 - Fix ContextMenu handling when building Fennec with C++ APZ. r=kats, r=botond (dd784945c) - Bug 1168629. Always make sure that there is at least one layer with the metrics for the root scroll frame/root element. r=botond,kats (06f19aef3) - Bug 1154478 - Rename gfxPrefs::LayoutEventRegionsEnabled to LayoutEventRegionsEnabledDoNotUseDirectly. r=kats (68790b756) - Don't expand displayports beyond the maximum texture size. (bug 1135907, r=kats) (805866f66) - Bug 1138444 - Add Mulet detection for reftests. r=jgriffin (cc9378556) - Use widgets for APZ checks, rather than gfxPrefs. (bug 1162064, r=kats,mstange) (40d2823a5) - Bug 1151993 - Apply shrink-wrapping to block frames that are orthogonal to their containing block. r=smontagu (9fdd76008) - Bug 1156021 - Use containing block inline-size (as appropriate for writing mode) to compute text-indent when specified as percentage. r=dbaron (c7fcb4193) - Bug 1152941 - Always use unconstrained block-size when reflowing an orthogonal child block, to avoid incomplete reflow across orthogonal boundary. r=dbaron (5f4748c5a) - Bug 1163238 - Don't set available block-size to unconstrained for orthogonal-block reflow state until after InitConstraints etc. r=dholbert (07ca784bf) - Bug 1155798: Drop end-of-line whitespace from C++ files in layout/tables. (whitespace-only, no review, DONTBUILD) (6ad9c50d8) - Bug 1155880 part 1: Rename nsITableLayoutStrategy::ComputeColumnWidths and associated comments to use "ISize" instead of "Width". r=jfkthame (c3bec937b) - Bug 1155880 part 2: Rename nsTableColFrame Get/Set/ResetFinalWidth methods to use ISize instead of Width. r=jfkthame (1d2bfd990) - Bug 1155880 part 3: Rename nsTableFrame::GetColumnWidth to use "ISize" instead of "Width". r=jfkthame (8a0d7a3c8) - Bug 1159101 part 1 - Alter dependencies among headers of table struct frames. r=roc (b943ee1c3) - Bug 1159101 part 2 - Add GetTableFrame() for table inner frames. r=roc (6641affa7) - Bug 1145036 part 1 - Rename mBorderSpacingX/Y to mBorderSpacingCol/Row. r=heycam (7e91504af) - Bug 1145036 part 2 - Rename nsTableFrame::GetCellSpacingX/Y to GetCol/RowSpacing. r=roc (b439569de) - Bug 1159101 part 3 - Replace most of nsTableFrame::GetTableFrame() usage with new GetTableFrame() methods. r=roc (4bdf27d00) - Bug 1159990 - Add TableArea struct and replace nsIntRect with it for table damage area. r=roc (ebca44c12)
This commit is contained in:
@@ -55,7 +55,7 @@ FixedTableLayoutStrategy::GetMinISize(nsRenderingContext* aRenderingContext)
|
||||
nscoord result = 0;
|
||||
|
||||
if (colCount > 0) {
|
||||
result += mTableFrame->GetCellSpacingX(-1, colCount);
|
||||
result += mTableFrame->GetColSpacing(-1, colCount);
|
||||
}
|
||||
|
||||
for (int32_t col = 0; col < colCount; ++col) {
|
||||
@@ -64,7 +64,7 @@ FixedTableLayoutStrategy::GetMinISize(nsRenderingContext* aRenderingContext)
|
||||
NS_ERROR("column frames out of sync with cell map");
|
||||
continue;
|
||||
}
|
||||
nscoord spacing = mTableFrame->GetCellSpacingX(col);
|
||||
nscoord spacing = mTableFrame->GetColSpacing(col);
|
||||
const nsStyleCoord *styleWidth =
|
||||
&colFrame->StylePosition()->mWidth;
|
||||
if (styleWidth->ConvertsToLength()) {
|
||||
@@ -151,7 +151,7 @@ AllocateUnassigned(nscoord aUnassignedSpace, float aShare)
|
||||
}
|
||||
|
||||
/* virtual */ void
|
||||
FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowState)
|
||||
FixedTableLayoutStrategy::ComputeColumnISizes(const nsHTMLReflowState& aReflowState)
|
||||
{
|
||||
nscoord tableWidth = aReflowState.ComputedWidth();
|
||||
|
||||
@@ -168,14 +168,14 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
|
||||
}
|
||||
|
||||
// border-spacing isn't part of the basis for percentages.
|
||||
tableWidth -= mTableFrame->GetCellSpacingX(-1, colCount);
|
||||
tableWidth -= mTableFrame->GetColSpacing(-1, colCount);
|
||||
|
||||
// store the old column widths. We might call multiple times SetFinalWidth
|
||||
// store the old column widths. We might call multiple times SetFinalISize
|
||||
// on the columns, due to this we can't compare at the last call that the
|
||||
// width has changed with the respect to the last call to
|
||||
// ComputeColumnWidths. In order to overcome this we store the old values
|
||||
// in this array. A single call to SetFinalWidth would make it possible to
|
||||
// call GetFinalWidth before and to compare when setting the final width.
|
||||
// ComputeColumnISizes. In order to overcome this we store the old values
|
||||
// in this array. A single call to SetFinalISize would make it possible to
|
||||
// call GetFinalISize before and to compare when setting the final width.
|
||||
nsTArray<nscoord> oldColWidths;
|
||||
|
||||
// XXX This ignores the 'min-width' and 'max-width' properties
|
||||
@@ -203,7 +203,7 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
|
||||
NS_ERROR("column frames out of sync with cell map");
|
||||
continue;
|
||||
}
|
||||
oldColWidths.AppendElement(colFrame->GetFinalWidth());
|
||||
oldColWidths.AppendElement(colFrame->GetFinalISize());
|
||||
colFrame->ResetPrefPercent();
|
||||
const nsStyleCoord *styleWidth =
|
||||
&colFrame->StylePosition()->mWidth;
|
||||
@@ -280,7 +280,7 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
|
||||
// row, split up the space evenly. (XXX This
|
||||
// isn't quite right if some of the columns it's
|
||||
// in have specified widths. Should we care?)
|
||||
nscoord spacing = mTableFrame->GetCellSpacingX(col);
|
||||
nscoord spacing = mTableFrame->GetColSpacing(col);
|
||||
colWidth = ((colWidth + spacing) / colSpan) - spacing;
|
||||
if (colWidth < 0)
|
||||
colWidth = 0;
|
||||
@@ -294,7 +294,7 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
|
||||
}
|
||||
}
|
||||
|
||||
colFrame->SetFinalWidth(colWidth);
|
||||
colFrame->SetFinalISize(colWidth);
|
||||
|
||||
if (colWidth == unassignedMarker) {
|
||||
++unassignedCount;
|
||||
@@ -317,12 +317,12 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
|
||||
NS_ERROR("column frames out of sync with cell map");
|
||||
continue;
|
||||
}
|
||||
nscoord colWidth = colFrame->GetFinalWidth();
|
||||
nscoord colWidth = colFrame->GetFinalISize();
|
||||
colWidth -= NSToCoordFloor(colFrame->GetPrefPercent() *
|
||||
reduceRatio);
|
||||
if (colWidth < 0)
|
||||
colWidth = 0;
|
||||
colFrame->SetFinalWidth(colWidth);
|
||||
colFrame->SetFinalISize(colWidth);
|
||||
}
|
||||
}
|
||||
unassignedSpace = 0;
|
||||
@@ -338,8 +338,8 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
|
||||
NS_ERROR("column frames out of sync with cell map");
|
||||
continue;
|
||||
}
|
||||
if (colFrame->GetFinalWidth() == unassignedMarker)
|
||||
colFrame->SetFinalWidth(toAssign);
|
||||
if (colFrame->GetFinalISize() == unassignedMarker)
|
||||
colFrame->SetFinalISize(toAssign);
|
||||
}
|
||||
} else if (unassignedSpace > 0) {
|
||||
// The spec doesn't say how to distribute the unassigned space.
|
||||
@@ -353,12 +353,12 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
|
||||
continue;
|
||||
}
|
||||
if (colFrame->GetPrefPercent() == 0.0f) {
|
||||
NS_ASSERTION(colFrame->GetFinalWidth() <= specUndist,
|
||||
NS_ASSERTION(colFrame->GetFinalISize() <= specUndist,
|
||||
"widths don't add up");
|
||||
nscoord toAdd = AllocateUnassigned(unassignedSpace,
|
||||
float(colFrame->GetFinalWidth()) / float(specUndist));
|
||||
specUndist -= colFrame->GetFinalWidth();
|
||||
colFrame->SetFinalWidth(colFrame->GetFinalWidth() + toAdd);
|
||||
float(colFrame->GetFinalISize()) / float(specUndist));
|
||||
specUndist -= colFrame->GetFinalISize();
|
||||
colFrame->SetFinalISize(colFrame->GetFinalISize() + toAdd);
|
||||
unassignedSpace -= toAdd;
|
||||
if (specUndist <= 0) {
|
||||
NS_ASSERTION(specUndist == 0,
|
||||
@@ -386,7 +386,7 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
|
||||
}
|
||||
nscoord toAdd = AllocateUnassigned(unassignedSpace,
|
||||
colFrame->GetPrefPercent() / pctUndist);
|
||||
colFrame->SetFinalWidth(colFrame->GetFinalWidth() + toAdd);
|
||||
colFrame->SetFinalISize(colFrame->GetFinalISize() + toAdd);
|
||||
unassignedSpace -= toAdd;
|
||||
pctUndist -= colFrame->GetPrefPercent();
|
||||
if (pctUndist <= 0.0f) {
|
||||
@@ -403,10 +403,10 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
|
||||
NS_ERROR("column frames out of sync with cell map");
|
||||
continue;
|
||||
}
|
||||
NS_ASSERTION(colFrame->GetFinalWidth() == 0, "yikes");
|
||||
NS_ASSERTION(colFrame->GetFinalISize() == 0, "yikes");
|
||||
nscoord toAdd = AllocateUnassigned(unassignedSpace,
|
||||
1.0f / float(colsLeft));
|
||||
colFrame->SetFinalWidth(toAdd);
|
||||
colFrame->SetFinalISize(toAdd);
|
||||
unassignedSpace -= toAdd;
|
||||
--colsLeft;
|
||||
}
|
||||
@@ -419,7 +419,7 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
|
||||
NS_ERROR("column frames out of sync with cell map");
|
||||
continue;
|
||||
}
|
||||
if (oldColWidths.ElementAt(col) != colFrame->GetFinalWidth()) {
|
||||
if (oldColWidths.ElementAt(col) != colFrame->GetFinalISize()) {
|
||||
mTableFrame->DidResizeColumns();
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user