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

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

Issue 12545020: Revert 145087 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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 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 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 for (RenderTableSection* section = bottomSection(); section; section = sectionAbove(section)) { 649 for (RenderTableSection* section = bottomSection(); section; section = sectionAbove(section)) {
650 LayoutPoint childPoint = flipForWritingModeForChild(section, pai ntOffset); 650 LayoutPoint childPoint = flipForWritingModeForChild(section, pai ntOffset);
651 section->paint(info, childPoint); 651 section->paint(info, childPoint);
652 } 652 }
653 } 653 }
654 m_currentBorder = 0; 654 m_currentBorder = 0;
655 } 655 }
656 656
657 // Paint outline. 657 // Paint outline.
658 if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) && hasOutline() && style()->visibility() == VISIBLE) 658 if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) && hasOutline() && style()->visibility() == VISIBLE)
659 paintOutline(paintInfo, LayoutRect(paintOffset, size())); 659 paintOutline(paintInfo.context, LayoutRect(paintOffset, size()));
660 } 660 }
661 661
662 void RenderTable::subtractCaptionRect(LayoutRect& rect) const 662 void RenderTable::subtractCaptionRect(LayoutRect& rect) const
663 { 663 {
664 for (unsigned i = 0; i < m_captions.size(); i++) { 664 for (unsigned i = 0; i < m_captions.size(); i++) {
665 LayoutUnit captionLogicalHeight = m_captions[i]->logicalHeight() + m_cap tions[i]->marginBefore() + m_captions[i]->marginAfter(); 665 LayoutUnit captionLogicalHeight = m_captions[i]->logicalHeight() + m_cap tions[i]->marginBefore() + m_captions[i]->marginAfter();
666 bool captionIsBefore = (m_captions[i]->style()->captionSide() != CAPBOTT OM) ^ style()->isFlippedBlocksWritingMode(); 666 bool captionIsBefore = (m_captions[i]->style()->captionSide() != CAPBOTT OM) ^ style()->isFlippedBlocksWritingMode();
667 if (style()->isHorizontalWritingMode()) { 667 if (style()->isHorizontalWritingMode()) {
668 rect.setHeight(rect.height() - captionLogicalHeight); 668 rect.setHeight(rect.height() - captionLogicalHeight);
669 if (captionIsBefore) 669 if (captionIsBefore)
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
1385 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const 1385 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const
1386 { 1386 {
1387 ASSERT(cell->isFirstOrLastCellInRow()); 1387 ASSERT(cell->isFirstOrLastCellInRow());
1388 if (hasSameDirectionAs(cell->row())) 1388 if (hasSameDirectionAs(cell->row()))
1389 return style()->borderEnd(); 1389 return style()->borderEnd();
1390 1390
1391 return style()->borderStart(); 1391 return style()->borderStart();
1392 } 1392 }
1393 1393
1394 } 1394 }
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderReplaced.cpp ('k') | Source/WebCore/rendering/RenderTableRow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698