Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Side by Side Diff: Source/WebCore/rendering/RenderTable.cpp

Issue 6471003: Merge 76915 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/table/resources/recalc-section-first-body-crash.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 * (C) 1997 Torben Weis (weis@kde.org) 3 * (C) 1997 Torben Weis (weis@kde.org)
4 * (C) 1998 Waldo Bastian (bastian@kde.org) 4 * (C) 1998 Waldo Bastian (bastian@kde.org)
5 * (C) 1999 Lars Knoll (knoll@kde.org) 5 * (C) 1999 Lars Knoll (knoll@kde.org)
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) 6 * (C) 1999 Antti Koivisto (koivisto@kde.org)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 1119
1120 void RenderTable::updateFirstLetter() 1120 void RenderTable::updateFirstLetter()
1121 { 1121 {
1122 } 1122 }
1123 1123
1124 int RenderTable::firstLineBoxBaseline() const 1124 int RenderTable::firstLineBoxBaseline() const
1125 { 1125 {
1126 if (isWritingModeRoot()) 1126 if (isWritingModeRoot())
1127 return -1; 1127 return -1;
1128 1128
1129 recalcSectionsIfNeeded();
1130
1129 RenderTableSection* firstNonEmptySection = m_head ? m_head : (m_firstBody ? m_firstBody : m_foot); 1131 RenderTableSection* firstNonEmptySection = m_head ? m_head : (m_firstBody ? m_firstBody : m_foot);
1130 if (firstNonEmptySection && !firstNonEmptySection->numRows()) 1132 if (firstNonEmptySection && !firstNonEmptySection->numRows())
1131 firstNonEmptySection = sectionBelow(firstNonEmptySection, true); 1133 firstNonEmptySection = sectionBelow(firstNonEmptySection, true);
1132 1134
1133 if (!firstNonEmptySection) 1135 if (!firstNonEmptySection)
1134 return -1; 1136 return -1;
1135 1137
1136 return firstNonEmptySection->logicalTop() + firstNonEmptySection->firstLineB oxBaseline(); 1138 return firstNonEmptySection->logicalTop() + firstNonEmptySection->firstLineB oxBaseline();
1137 } 1139 }
1138 1140
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
1182 if (visibleToHitTesting() && (action == HitTestBlockBackground || action == HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(xPos, yPos))) { 1184 if (visibleToHitTesting() && (action == HitTestBlockBackground || action == HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(xPos, yPos))) {
1183 updateHitTestResult(result, flipForWritingMode(IntPoint(xPos - tx, yPos - ty))); 1185 updateHitTestResult(result, flipForWritingMode(IntPoint(xPos - tx, yPos - ty)));
1184 if (!result.addNodeToRectBasedTestResult(node(), xPos, yPos, boundsRect) ) 1186 if (!result.addNodeToRectBasedTestResult(node(), xPos, yPos, boundsRect) )
1185 return true; 1187 return true;
1186 } 1188 }
1187 1189
1188 return false; 1190 return false;
1189 } 1191 }
1190 1192
1191 } 1193 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/table/resources/recalc-section-first-body-crash.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698