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

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

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add one more file. Created 5 years, 6 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/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 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 return result; 694 return result;
695 } 695 }
696 696
697 // (3) Our row's before border. 697 // (3) Our row's before border.
698 result = chooseBorder(result, CollapsedBorderValue(parent()->style()->border Before(), includeColor ? parent()->resolveColor(beforeColorProperty) : Color(), BROW)); 698 result = chooseBorder(result, CollapsedBorderValue(parent()->style()->border Before(), includeColor ? parent()->resolveColor(beforeColorProperty) : Color(), BROW));
699 if (!result.exists()) 699 if (!result.exists())
700 return result; 700 return result;
701 701
702 // (4) The previous row's after border. 702 // (4) The previous row's after border.
703 if (prevCell) { 703 if (prevCell) {
704 LayoutObject* prevRow = 0; 704 LayoutObject* prevRow = nullptr;
705 if (prevCell->section() == section()) 705 if (prevCell->section() == section())
706 prevRow = parent()->previousSibling(); 706 prevRow = parent()->previousSibling();
707 else 707 else
708 prevRow = prevCell->section()->lastRow(); 708 prevRow = prevCell->section()->lastRow();
709 709
710 if (prevRow) { 710 if (prevRow) {
711 result = chooseBorder(CollapsedBorderValue(prevRow->style()->borderA fter(), includeColor ? prevRow->resolveColor(afterColorProperty) : Color(), BROW ), result); 711 result = chooseBorder(CollapsedBorderValue(prevRow->style()->borderA fter(), includeColor ? prevRow->resolveColor(afterColorProperty) : Color(), BROW ), result);
712 if (!result.exists()) 712 if (!result.exists())
713 return result; 713 return result;
714 } 714 }
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
1021 LayoutUnit newAfterPadding = totalHeight - heightWithoutIntrinsicPadding - newBeforePadding; 1021 LayoutUnit newAfterPadding = totalHeight - heightWithoutIntrinsicPadding - newBeforePadding;
1022 setIntrinsicPaddingBefore(newBeforePadding); 1022 setIntrinsicPaddingBefore(newBeforePadding);
1023 setIntrinsicPaddingAfter(newAfterPadding); 1023 setIntrinsicPaddingAfter(newAfterPadding);
1024 } else { 1024 } else {
1025 setIntrinsicPaddingAfter(intrinsicPaddingAfter() - scrollbarHeight); 1025 setIntrinsicPaddingAfter(intrinsicPaddingAfter() - scrollbarHeight);
1026 } 1026 }
1027 } 1027 }
1028 1028
1029 LayoutTableCell* LayoutTableCell::createAnonymous(Document* document) 1029 LayoutTableCell* LayoutTableCell::createAnonymous(Document* document)
1030 { 1030 {
1031 LayoutTableCell* layoutObject = new LayoutTableCell(0); 1031 LayoutTableCell* layoutObject = new LayoutTableCell(nullptr);
1032 layoutObject->setDocumentForAnonymous(document); 1032 layoutObject->setDocumentForAnonymous(document);
1033 return layoutObject; 1033 return layoutObject;
1034 } 1034 }
1035 1035
1036 LayoutTableCell* LayoutTableCell::createAnonymousWithParent(const LayoutObject* parent) 1036 LayoutTableCell* LayoutTableCell::createAnonymousWithParent(const LayoutObject* parent)
1037 { 1037 {
1038 LayoutTableCell* newCell = LayoutTableCell::createAnonymous(&parent->documen t()); 1038 LayoutTableCell* newCell = LayoutTableCell::createAnonymous(&parent->documen t());
1039 RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisp lay(parent->styleRef(), TABLE_CELL); 1039 RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWithDisp lay(parent->styleRef(), TABLE_CELL);
1040 newCell->setStyle(newStyle.release()); 1040 newCell->setStyle(newStyle.release());
1041 return newCell; 1041 return newCell;
1042 } 1042 }
1043 1043
1044 } // namespace blink 1044 } // 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