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

Side by Side Diff: Source/core/layout/LayoutListMarker.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/LayoutListMarker.h ('k') | Source/core/layout/LayoutMenuList.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com) 6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 return toGeorgian(value); 1042 return toGeorgian(value);
1043 case Hebrew: 1043 case Hebrew:
1044 return toHebrew(value); 1044 return toHebrew(value);
1045 } 1045 }
1046 1046
1047 ASSERT_NOT_REACHED(); 1047 ASSERT_NOT_REACHED();
1048 return ""; 1048 return "";
1049 } 1049 }
1050 1050
1051 LayoutListMarker::LayoutListMarker(LayoutListItem* item) 1051 LayoutListMarker::LayoutListMarker(LayoutListItem* item)
1052 : LayoutBox(0) 1052 : LayoutBox(nullptr)
1053 , m_listItem(item) 1053 , m_listItem(item)
1054 { 1054 {
1055 // init LayoutObject attributes 1055 // init LayoutObject attributes
1056 setInline(true); // our object is Inline 1056 setInline(true); // our object is Inline
1057 setReplaced(true); // pretend to be replaced 1057 setReplaced(true); // pretend to be replaced
1058 } 1058 }
1059 1059
1060 LayoutListMarker::~LayoutListMarker() 1060 LayoutListMarker::~LayoutListMarker()
1061 { 1061 {
1062 } 1062 }
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
1643 if (style()) { 1643 if (style()) {
1644 // Reuse the current margins. Otherwise resetting the margins to initial values 1644 // Reuse the current margins. Otherwise resetting the margins to initial values
1645 // would trigger unnecessary layout. 1645 // would trigger unnecessary layout.
1646 newStyle->setMarginStart(style()->marginStart()); 1646 newStyle->setMarginStart(style()->marginStart());
1647 newStyle->setMarginEnd(style()->marginRight()); 1647 newStyle->setMarginEnd(style()->marginRight());
1648 } 1648 }
1649 setStyle(newStyle.release()); 1649 setStyle(newStyle.release());
1650 } 1650 }
1651 1651
1652 } // namespace blink 1652 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutListMarker.h ('k') | Source/core/layout/LayoutMenuList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698