corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 4126c66c9a80 (bug 1166728) for Gaia sound_manager_test.js failures.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen
2015-05-29 15:16:53 -04:00
parent 95c354d08b
commit c86afc17c0
43 changed files with 514 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
layout/tables/FixedTableLayoutStrategy.cpp
View File

@@ -252,9 +252,19 @@ FixedTableLayoutStrategy::ComputeColumnISizes(const nsHTMLReflowState& aReflowSt
float pct = styleWidth->GetPercentValue();
colWidth = NSToCoordFloor(pct * float(tableWidth));
if (cellFrame->StylePosition()->mBoxSizing == NS_STYLE_BOX_SIZING_CONTENT) {
colWidth += offsets.hPadding + offsets.hBorder;
nscoord boxSizingAdjust = 0;
switch (cellFrame->StylePosition()->mBoxSizing) {
case NS_STYLE_BOX_SIZING_CONTENT:
boxSizingAdjust += offsets.hPadding;
// Fall through
case NS_STYLE_BOX_SIZING_PADDING:
boxSizingAdjust += offsets.hBorder;
// Fall through
case NS_STYLE_BOX_SIZING_BORDER:
// Don't add anything
break;
}
colWidth += boxSizingAdjust;
pct /= float(colSpan);
colFrame->AddPrefPercent(pct);