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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTable.cpp

Issue 2861773004: Move border-*-width out of BorderValue and store on SurroundData in ComputedStyle instead (Closed)
Patch Set: meade@'s suggestion Created 3 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
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. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc.
8 * All rights reserved. 8 * All rights reserved.
9 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 9 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
10 * 10 *
(...skipping 1679 matching lines...) Expand 10 before | Expand all | Expand 10 after
1690 RefPtr<ComputedStyle> new_style = 1690 RefPtr<ComputedStyle> new_style =
1691 ComputedStyle::CreateAnonymousStyleWithDisplay( 1691 ComputedStyle::CreateAnonymousStyleWithDisplay(
1692 parent->StyleRef(), 1692 parent->StyleRef(),
1693 parent->IsLayoutInline() ? EDisplay::kInlineTable : EDisplay::kTable); 1693 parent->IsLayoutInline() ? EDisplay::kInlineTable : EDisplay::kTable);
1694 LayoutTable* new_table = new LayoutTable(nullptr); 1694 LayoutTable* new_table = new LayoutTable(nullptr);
1695 new_table->SetDocumentForAnonymous(&parent->GetDocument()); 1695 new_table->SetDocumentForAnonymous(&parent->GetDocument());
1696 new_table->SetStyle(std::move(new_style)); 1696 new_table->SetStyle(std::move(new_style));
1697 return new_table; 1697 return new_table;
1698 } 1698 }
1699 1699
1700 const BorderValue& LayoutTable::TableStartBorderAdjoiningCell( 1700 BorderValue LayoutTable::TableStartBorderAdjoiningCell(
1701 const LayoutTableCell* cell) const { 1701 const LayoutTableCell* cell) const {
1702 #if DCHECK_IS_ON() 1702 #if DCHECK_IS_ON()
1703 DCHECK(cell->IsFirstOrLastCellInRow()); 1703 DCHECK(cell->IsFirstOrLastCellInRow());
1704 #endif 1704 #endif
1705 if (HasSameDirectionAs(cell->Row())) 1705 if (HasSameDirectionAs(cell->Row()))
1706 return Style()->BorderStart(); 1706 return Style()->BorderStart();
1707 1707
1708 return Style()->BorderEnd(); 1708 return Style()->BorderEnd();
1709 } 1709 }
1710 1710
1711 const BorderValue& LayoutTable::TableEndBorderAdjoiningCell( 1711 BorderValue LayoutTable::TableEndBorderAdjoiningCell(
1712 const LayoutTableCell* cell) const { 1712 const LayoutTableCell* cell) const {
1713 #if DCHECK_IS_ON() 1713 #if DCHECK_IS_ON()
1714 DCHECK(cell->IsFirstOrLastCellInRow()); 1714 DCHECK(cell->IsFirstOrLastCellInRow());
1715 #endif 1715 #endif
1716 if (HasSameDirectionAs(cell->Row())) 1716 if (HasSameDirectionAs(cell->Row()))
1717 return Style()->BorderEnd(); 1717 return Style()->BorderEnd();
1718 1718
1719 return Style()->BorderStart(); 1719 return Style()->BorderStart();
1720 } 1720 }
1721 1721
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
1760 } 1760 }
1761 1761
1762 LayoutUnit LayoutTable::PaddingRight() const { 1762 LayoutUnit LayoutTable::PaddingRight() const {
1763 if (ShouldCollapseBorders()) 1763 if (ShouldCollapseBorders())
1764 return LayoutUnit(); 1764 return LayoutUnit();
1765 1765
1766 return LayoutBlock::PaddingRight(); 1766 return LayoutBlock::PaddingRight();
1767 } 1767 }
1768 1768
1769 } // namespace blink 1769 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTable.h ('k') | third_party/WebKit/Source/core/layout/LayoutTableBoxComponent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698