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

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

Issue 162613007: Reduce the number of parameters to LayoutStateMaintainer by one (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 | « Source/core/rendering/RenderMedia.cpp ('k') | Source/core/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, 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 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 419
420 if (simplifiedLayout()) 420 if (simplifiedLayout())
421 return; 421 return;
422 422
423 recalcSectionsIfNeeded(); 423 recalcSectionsIfNeeded();
424 // FIXME: We should do this recalc lazily in borderStart/borderEnd so that w e don't have to make sure 424 // FIXME: We should do this recalc lazily in borderStart/borderEnd so that w e don't have to make sure
425 // to call this before we call borderStart/borderEnd to avoid getting a stal e value. 425 // to call this before we call borderStart/borderEnd to avoid getting a stal e value.
426 recalcBordersInRowDirection(); 426 recalcBordersInRowDirection();
427 427
428 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); 428 LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
429 LayoutStateMaintainer statePusher(view(), this, locationOffset(), style()->i sFlippedBlocksWritingMode()); 429 LayoutStateMaintainer statePusher(this, locationOffset(), style()->isFlipped BlocksWritingMode());
430 430
431 setLogicalHeight(0); 431 setLogicalHeight(0);
432 432
433 LayoutUnit oldLogicalWidth = logicalWidth(); 433 LayoutUnit oldLogicalWidth = logicalWidth();
434 updateLogicalWidth(); 434 updateLogicalWidth();
435 435
436 SubtreeLayoutScope layouter(this); 436 SubtreeLayoutScope layouter(this);
437 437
438 if (logicalWidth() != oldLogicalWidth) { 438 if (logicalWidth() != oldLogicalWidth) {
439 for (unsigned i = 0; i < m_captions.size(); i++) 439 for (unsigned i = 0; i < m_captions.size(); i++)
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1454 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const 1454 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const
1455 { 1455 {
1456 ASSERT(cell->isFirstOrLastCellInRow()); 1456 ASSERT(cell->isFirstOrLastCellInRow());
1457 if (hasSameDirectionAs(cell->row())) 1457 if (hasSameDirectionAs(cell->row()))
1458 return style()->borderEnd(); 1458 return style()->borderEnd();
1459 1459
1460 return style()->borderStart(); 1460 return style()->borderStart();
1461 } 1461 }
1462 1462
1463 } 1463 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderMedia.cpp ('k') | Source/core/rendering/RenderTableRow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698