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

Side by Side Diff: Source/core/layout/LayoutTableCell.cpp

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutTableCell.h ('k') | Source/core/layout/LayoutTableCol.h » ('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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 } 161 }
162 } 162 }
163 163
164 void LayoutTableCell::addLayerHitTestRects(LayerHitTestRects& layerRects, const Layer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& container Rect) const 164 void LayoutTableCell::addLayerHitTestRects(LayerHitTestRects& layerRects, const Layer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& container Rect) const
165 { 165 {
166 LayoutPoint adjustedLayerOffset = layerOffset; 166 LayoutPoint adjustedLayerOffset = layerOffset;
167 // LayoutTableCell's location includes the offset of it's containing LayoutT ableRow, so 167 // LayoutTableCell's location includes the offset of it's containing LayoutT ableRow, so
168 // we need to subtract that again here (as for LayoutTableCell::offsetFromCo ntainer. 168 // we need to subtract that again here (as for LayoutTableCell::offsetFromCo ntainer.
169 if (parent()) 169 if (parent())
170 adjustedLayerOffset -= parentBox()->locationOffset(); 170 adjustedLayerOffset -= parentBox()->locationOffset();
171 RenderBox::addLayerHitTestRects(layerRects, currentLayer, adjustedLayerOffse t, containerRect); 171 LayoutBox::addLayerHitTestRects(layerRects, currentLayer, adjustedLayerOffse t, containerRect);
172 } 172 }
173 173
174 void LayoutTableCell::computeIntrinsicPadding(int rowHeight, SubtreeLayoutScope& layouter) 174 void LayoutTableCell::computeIntrinsicPadding(int rowHeight, SubtreeLayoutScope& layouter)
175 { 175 {
176 int oldIntrinsicPaddingBefore = intrinsicPaddingBefore(); 176 int oldIntrinsicPaddingBefore = intrinsicPaddingBefore();
177 int oldIntrinsicPaddingAfter = intrinsicPaddingAfter(); 177 int oldIntrinsicPaddingAfter = intrinsicPaddingAfter();
178 int logicalHeightWithoutIntrinsicPadding = pixelSnappedLogicalHeight() - old IntrinsicPaddingBefore - oldIntrinsicPaddingAfter; 178 int logicalHeightWithoutIntrinsicPadding = pixelSnappedLogicalHeight() - old IntrinsicPaddingBefore - oldIntrinsicPaddingAfter;
179 179
180 int intrinsicPaddingBefore = 0; 180 int intrinsicPaddingBefore = 0;
181 switch (style()->verticalAlign()) { 181 switch (style()->verticalAlign()) {
(...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 1048
1049 LayoutTableCell* LayoutTableCell::createAnonymousWithParentRenderer(const Layout Object* parent) 1049 LayoutTableCell* LayoutTableCell::createAnonymousWithParentRenderer(const Layout Object* parent)
1050 { 1050 {
1051 LayoutTableCell* newCell = LayoutTableCell::createAnonymous(&parent->documen t()); 1051 LayoutTableCell* newCell = LayoutTableCell::createAnonymous(&parent->documen t());
1052 RefPtr<LayoutStyle> newStyle = LayoutStyle::createAnonymousStyleWithDisplay( parent->styleRef(), TABLE_CELL); 1052 RefPtr<LayoutStyle> newStyle = LayoutStyle::createAnonymousStyleWithDisplay( parent->styleRef(), TABLE_CELL);
1053 newCell->setStyle(newStyle.release()); 1053 newCell->setStyle(newStyle.release());
1054 return newCell; 1054 return newCell;
1055 } 1055 }
1056 1056
1057 } // namespace blink 1057 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutTableCell.h ('k') | Source/core/layout/LayoutTableCol.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698