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

Side by Side Diff: Source/core/rendering/RenderTableRow.cpp

Issue 532513002: Don't use rowIndex() if needsCellRecalc(). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: NULL check in assertion, to avoid crash in unit tests. Created 6 years, 3 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/core/rendering/RenderTableRow.h ('k') | Source/core/rendering/RenderTableSection.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, 2010, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 } 69 }
70 70
71 void RenderTableRow::styleDidChange(StyleDifference diff, const RenderStyle* old Style) 71 void RenderTableRow::styleDidChange(StyleDifference diff, const RenderStyle* old Style)
72 { 72 {
73 ASSERT(style()->display() == TABLE_ROW); 73 ASSERT(style()->display() == TABLE_ROW);
74 74
75 RenderBox::styleDidChange(diff, oldStyle); 75 RenderBox::styleDidChange(diff, oldStyle);
76 propagateStyleToAnonymousChildren(); 76 propagateStyleToAnonymousChildren();
77 77
78 if (section() && oldStyle && style()->logicalHeight() != oldStyle->logicalHe ight()) 78 if (section() && oldStyle && style()->logicalHeight() != oldStyle->logicalHe ight())
79 section()->rowLogicalHeightChanged(rowIndex()); 79 section()->rowLogicalHeightChanged(this);
80 80
81 // If border was changed, notify table. 81 // If border was changed, notify table.
82 if (parent()) { 82 if (parent()) {
83 RenderTable* table = this->table(); 83 RenderTable* table = this->table();
84 if (table && !table->selfNeedsLayout() && !table->normalChildNeedsLayout () && oldStyle && oldStyle->border() != style()->border()) 84 if (table && !table->selfNeedsLayout() && !table->normalChildNeedsLayout () && oldStyle && oldStyle->border() != style()->border())
85 table->invalidateCollapsedBorders(); 85 table->invalidateCollapsedBorders();
86 86
87 if (table && oldStyle && diff.needsFullLayout() && needsLayout() && tabl e->collapseBorders() && borderWidthChanged(oldStyle, style())) { 87 if (table && oldStyle && diff.needsFullLayout() && needsLayout() && tabl e->collapseBorders() && borderWidthChanged(oldStyle, style())) {
88 // If the border width changes on a row, we need to make sure the ce lls in the row know to lay out again. 88 // If the border width changes on a row, we need to make sure the ce lls in the row know to lay out again.
89 // This only happens when borders are collapsed, since they end up a ffecting the border sides of the cell 89 // This only happens when borders are collapsed, since they end up a ffecting the border sides of the cell
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 257
258 RenderTableRow* RenderTableRow::createAnonymousWithParentRenderer(const RenderOb ject* parent) 258 RenderTableRow* RenderTableRow::createAnonymousWithParentRenderer(const RenderOb ject* parent)
259 { 259 {
260 RenderTableRow* newRow = RenderTableRow::createAnonymous(&parent->document() ); 260 RenderTableRow* newRow = RenderTableRow::createAnonymous(&parent->document() );
261 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay( parent->style(), TABLE_ROW); 261 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay( parent->style(), TABLE_ROW);
262 newRow->setStyle(newStyle.release()); 262 newRow->setStyle(newStyle.release());
263 return newRow; 263 return newRow;
264 } 264 }
265 265
266 } // namespace blink 266 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTableRow.h ('k') | Source/core/rendering/RenderTableSection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698