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

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

Issue 10388225: Merge 117309 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 7 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/css-generated-content/first-letter-table-cell-format-block-crash-expected.txt ('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 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 { 180 {
181 if (w == logicalWidth()) 181 if (w == logicalWidth())
182 return; 182 return;
183 183
184 setLogicalWidth(w); 184 setLogicalWidth(w);
185 setCellWidthChanged(true); 185 setCellWidthChanged(true);
186 } 186 }
187 187
188 void RenderTableCell::layout() 188 void RenderTableCell::layout()
189 { 189 {
190 updateFirstLetter();
190 layoutBlock(cellWidthChanged()); 191 layoutBlock(cellWidthChanged());
191 setCellWidthChanged(false); 192 setCellWidthChanged(false);
192 } 193 }
193 194
194 LayoutUnit RenderTableCell::paddingTop(PaddingOptions paddingOption) const 195 LayoutUnit RenderTableCell::paddingTop(PaddingOptions paddingOption) const
195 { 196 {
196 LayoutUnit result = RenderBlock::paddingTop(); 197 LayoutUnit result = RenderBlock::paddingTop();
197 if (paddingOption == ExcludeIntrinsicPadding || !isHorizontalWritingMode()) 198 if (paddingOption == ExcludeIntrinsicPadding || !isHorizontalWritingMode())
198 return result; 199 return result;
199 return result + (style()->writingMode() == TopToBottomWritingMode ? intrinsi cPaddingBefore() : intrinsicPaddingAfter()); 200 return result + (style()->writingMode() == TopToBottomWritingMode ? intrinsi cPaddingBefore() : intrinsicPaddingAfter());
(...skipping 922 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 { 1123 {
1123 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyle(parent->sty le()); 1124 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyle(parent->sty le());
1124 newStyle->setDisplay(TABLE_CELL); 1125 newStyle->setDisplay(TABLE_CELL);
1125 1126
1126 RenderTableCell* newCell = new (parent->renderArena()) RenderTableCell(paren t->document() /* is anonymous */); 1127 RenderTableCell* newCell = new (parent->renderArena()) RenderTableCell(paren t->document() /* is anonymous */);
1127 newCell->setStyle(newStyle.release()); 1128 newCell->setStyle(newStyle.release());
1128 return newCell; 1129 return newCell;
1129 } 1130 }
1130 1131
1131 } // namespace WebCore 1132 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/css-generated-content/first-letter-table-cell-format-block-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698