summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/AutoTableLayout.cpp
diff options
context:
space:
mode:
authorLeon Clarke <leonclarke@google.com>2010-06-03 14:33:32 +0100
committerLeon Clarke <leonclarke@google.com>2010-06-08 12:24:51 +0100
commit5af96e2c7b73ebc627c6894727826a7576d31758 (patch)
treef9d5e6f6175ccd7e3d14de9b290f08937a0d17ba /WebCore/rendering/AutoTableLayout.cpp
parent8cc4fcf4f6adcbc0e0aebfc24fbad9a4cddf2cfb (diff)
downloadexternal_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.zip
external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.gz
external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.bz2
Merge webkit.org at r60469 : Initial merge by git.
Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
Diffstat (limited to 'WebCore/rendering/AutoTableLayout.cpp')
-rw-r--r--WebCore/rendering/AutoTableLayout.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/rendering/AutoTableLayout.cpp b/WebCore/rendering/AutoTableLayout.cpp
index 2a4958a..1633d88 100644
--- a/WebCore/rendering/AutoTableLayout.cpp
+++ b/WebCore/rendering/AutoTableLayout.cpp
@@ -64,7 +64,6 @@ void AutoTableLayout::recalcColumn(int effCol)
else if (child->isTableSection()) {
RenderTableSection* section = toRenderTableSection(child);
int numRows = section->numRows();
- RenderTableCell* last = 0;
for (int i = 0; i < numRows; i++) {
RenderTableSection::CellStruct current = section->cellAt(i, effCol);
RenderTableCell* cell = current.cell;
@@ -133,7 +132,6 @@ void AutoTableLayout::recalcColumn(int effCol)
l.maxWidth = max(l.maxWidth, 1);
insertSpanCell(cell);
}
- last = cell;
}
}
}
@@ -513,7 +511,6 @@ void AutoTableLayout::layout()
calcEffectiveWidth();
bool havePercent = false;
- bool haveRelative = false;
int totalRelative = 0;
int numAuto = 0;
int numFixed = 0;
@@ -535,7 +532,6 @@ void AutoTableLayout::layout()
totalPercent += width.rawValue();
break;
case Relative:
- haveRelative = true;
totalRelative += width.value();
break;
case Fixed: