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

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

Issue 10383285: Merge 116174 (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 | « Source/WebCore/rendering/RenderTable.cpp ('k') | Source/WebCore/rendering/RenderTableRow.cpp » ('j') | 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 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 LayoutUnit newBeforePadding = (totalHeight - heightWithoutIntrinsicPaddi ng) / 2; 1114 LayoutUnit newBeforePadding = (totalHeight - heightWithoutIntrinsicPaddi ng) / 2;
1115 LayoutUnit newAfterPadding = totalHeight - heightWithoutIntrinsicPadding - newBeforePadding; 1115 LayoutUnit newAfterPadding = totalHeight - heightWithoutIntrinsicPadding - newBeforePadding;
1116 setIntrinsicPaddingBefore(newBeforePadding); 1116 setIntrinsicPaddingBefore(newBeforePadding);
1117 setIntrinsicPaddingAfter(newAfterPadding); 1117 setIntrinsicPaddingAfter(newAfterPadding);
1118 } else 1118 } else
1119 setIntrinsicPaddingAfter(intrinsicPaddingAfter() - scrollbarHeight); 1119 setIntrinsicPaddingAfter(intrinsicPaddingAfter() - scrollbarHeight);
1120 } 1120 }
1121 1121
1122 RenderTableCell* RenderTableCell::createAnonymousWithParentRenderer(const Render Object* parent) 1122 RenderTableCell* RenderTableCell::createAnonymousWithParentRenderer(const Render Object* parent)
1123 { 1123 {
1124 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyle(parent->sty le()); 1124 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay( parent->style(), TABLE_CELL);
1125 newStyle->setDisplay(TABLE_CELL);
1126
1127 RenderTableCell* newCell = new (parent->renderArena()) RenderTableCell(paren t->document() /* is anonymous */); 1125 RenderTableCell* newCell = new (parent->renderArena()) RenderTableCell(paren t->document() /* is anonymous */);
1128 newCell->setStyle(newStyle.release()); 1126 newCell->setStyle(newStyle.release());
1129 return newCell; 1127 return newCell;
1130 } 1128 }
1131 1129
1132 } // namespace WebCore 1130 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderTable.cpp ('k') | Source/WebCore/rendering/RenderTableRow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698