diff options
Diffstat (limited to 'WebCore/rendering/RenderTableSection.cpp')
| -rw-r--r-- | WebCore/rendering/RenderTableSection.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/WebCore/rendering/RenderTableSection.cpp b/WebCore/rendering/RenderTableSection.cpp index a2457e1..e8ab4a4 100644 --- a/WebCore/rendering/RenderTableSection.cpp +++ b/WebCore/rendering/RenderTableSection.cpp @@ -807,13 +807,13 @@ int RenderTableSection::calcOuterBorderTop() const if (sb.style() == BHIDDEN) return -1; if (sb.style() > BHIDDEN) - borderWidth = sb.width; + borderWidth = sb.width(); const BorderValue& rb = firstChild()->style()->borderTop(); if (rb.style() == BHIDDEN) return -1; - if (rb.style() > BHIDDEN && rb.width > borderWidth) - borderWidth = rb.width; + if (rb.style() > BHIDDEN && rb.width() > borderWidth) + borderWidth = rb.width(); bool allHidden = true; for (int c = 0; c < totalCols; c++) { @@ -829,17 +829,17 @@ int RenderTableSection::calcOuterBorderTop() const continue; else allHidden = false; - if (gb.style() > BHIDDEN && gb.width > borderWidth) - borderWidth = gb.width; - if (cb.style() > BHIDDEN && cb.width > borderWidth) - borderWidth = cb.width; + if (gb.style() > BHIDDEN && gb.width() > borderWidth) + borderWidth = gb.width(); + if (cb.style() > BHIDDEN && cb.width() > borderWidth) + borderWidth = cb.width(); } else { if (cb.style() == BHIDDEN) continue; else allHidden = false; - if (cb.style() > BHIDDEN && cb.width > borderWidth) - borderWidth = cb.width; + if (cb.style() > BHIDDEN && cb.width() > borderWidth) + borderWidth = cb.width(); } } if (allHidden) @@ -860,13 +860,13 @@ int RenderTableSection::calcOuterBorderBottom() const if (sb.style() == BHIDDEN) return -1; if (sb.style() > BHIDDEN) - borderWidth = sb.width; + borderWidth = sb.width(); const BorderValue& rb = lastChild()->style()->borderBottom(); if (rb.style() == BHIDDEN) return -1; - if (rb.style() > BHIDDEN && rb.width > borderWidth) - borderWidth = rb.width; + if (rb.style() > BHIDDEN && rb.width() > borderWidth) + borderWidth = rb.width(); bool allHidden = true; for (int c = 0; c < totalCols; c++) { @@ -882,17 +882,17 @@ int RenderTableSection::calcOuterBorderBottom() const continue; else allHidden = false; - if (gb.style() > BHIDDEN && gb.width > borderWidth) - borderWidth = gb.width; - if (cb.style() > BHIDDEN && cb.width > borderWidth) - borderWidth = cb.width; + if (gb.style() > BHIDDEN && gb.width() > borderWidth) + borderWidth = gb.width(); + if (cb.style() > BHIDDEN && cb.width() > borderWidth) + borderWidth = cb.width(); } else { if (cb.style() == BHIDDEN) continue; else allHidden = false; - if (cb.style() > BHIDDEN && cb.width > borderWidth) - borderWidth = cb.width; + if (cb.style() > BHIDDEN && cb.width() > borderWidth) + borderWidth = cb.width(); } } if (allHidden) @@ -913,7 +913,7 @@ int RenderTableSection::calcOuterBorderLeft(bool rtl) const if (sb.style() == BHIDDEN) return -1; if (sb.style() > BHIDDEN) - borderWidth = sb.width; + borderWidth = sb.width(); int leftmostColumn = rtl ? totalCols - 1 : 0; RenderTableCol* colGroup = table()->colElement(leftmostColumn); @@ -921,8 +921,8 @@ int RenderTableSection::calcOuterBorderLeft(bool rtl) const const BorderValue& gb = colGroup->style()->borderLeft(); if (gb.style() == BHIDDEN) return -1; - if (gb.style() > BHIDDEN && gb.width > borderWidth) - borderWidth = gb.width; + if (gb.style() > BHIDDEN && gb.width() > borderWidth) + borderWidth = gb.width(); } bool allHidden = true; @@ -937,10 +937,10 @@ int RenderTableSection::calcOuterBorderLeft(bool rtl) const continue; else allHidden = false; - if (cb.style() > BHIDDEN && cb.width > borderWidth) - borderWidth = cb.width; - if (rb.style() > BHIDDEN && rb.width > borderWidth) - borderWidth = rb.width; + if (cb.style() > BHIDDEN && cb.width() > borderWidth) + borderWidth = cb.width(); + if (rb.style() > BHIDDEN && rb.width() > borderWidth) + borderWidth = rb.width(); } if (allHidden) return -1; @@ -960,7 +960,7 @@ int RenderTableSection::calcOuterBorderRight(bool rtl) const if (sb.style() == BHIDDEN) return -1; if (sb.style() > BHIDDEN) - borderWidth = sb.width; + borderWidth = sb.width(); int rightmostColumn = rtl ? 0 : totalCols - 1; RenderTableCol* colGroup = table()->colElement(rightmostColumn); @@ -968,8 +968,8 @@ int RenderTableSection::calcOuterBorderRight(bool rtl) const const BorderValue& gb = colGroup->style()->borderRight(); if (gb.style() == BHIDDEN) return -1; - if (gb.style() > BHIDDEN && gb.width > borderWidth) - borderWidth = gb.width; + if (gb.style() > BHIDDEN && gb.width() > borderWidth) + borderWidth = gb.width(); } bool allHidden = true; @@ -984,10 +984,10 @@ int RenderTableSection::calcOuterBorderRight(bool rtl) const continue; else allHidden = false; - if (cb.style() > BHIDDEN && cb.width > borderWidth) - borderWidth = cb.width; - if (rb.style() > BHIDDEN && rb.width > borderWidth) - borderWidth = rb.width; + if (cb.style() > BHIDDEN && cb.width() > borderWidth) + borderWidth = cb.width(); + if (rb.style() > BHIDDEN && rb.width() > borderWidth) + borderWidth = rb.width(); } if (allHidden) return -1; |