diff options
| author | Steve Block <steveblock@google.com> | 2010-09-29 17:32:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:35:08 +0100 |
| commit | 68513a70bcd92384395513322f1b801e7bf9c729 (patch) | |
| tree | 161b50f75a5921d61731bb25e730005994fcec85 /WebCore/rendering/RenderTable.cpp | |
| parent | fd5c6425ce58eb75211be7718d5dee960842a37e (diff) | |
| download | external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.zip external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.gz external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.bz2 | |
Merge WebKit at r67908: Initial merge by Git
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
Diffstat (limited to 'WebCore/rendering/RenderTable.cpp')
| -rw-r--r-- | WebCore/rendering/RenderTable.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebCore/rendering/RenderTable.cpp b/WebCore/rendering/RenderTable.cpp index 48f3920..124dacb 100644 --- a/WebCore/rendering/RenderTable.cpp +++ b/WebCore/rendering/RenderTable.cpp @@ -62,11 +62,16 @@ RenderTable::RenderTable(Node* node) , m_borderLeft(0) , m_borderRight(0) { +<<<<<<< HEAD #ifdef ANDROID_LAYOUT m_singleColumn = false; #endif +======= + setChildrenInline(false); +>>>>>>> webkit.org at r67908 m_columnPos.fill(0, 2); m_columns.fill(ColumnStruct(), 1); + } void RenderTable::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle) @@ -458,6 +463,9 @@ void RenderTable::layout() statePusher.pop(); + if (view()->layoutState()->m_pageHeight) + setPageY(view()->layoutState()->pageY(y())); + bool didFullRepaint = repainter.repaintAfterLayout(); // Repaint with our new bounds if they are different from our old bounds. if (!didFullRepaint && sectionMoved) |