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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderListMarker.h ('k') | Source/core/rendering/RenderMedia.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 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 } 1044 }
1045 1045
1046 ASSERT_NOT_REACHED(); 1046 ASSERT_NOT_REACHED();
1047 return ""; 1047 return "";
1048 } 1048 }
1049 1049
1050 RenderListMarker::RenderListMarker(RenderListItem* item) 1050 RenderListMarker::RenderListMarker(RenderListItem* item)
1051 : RenderBox(0) 1051 : RenderBox(0)
1052 , m_listItem(item) 1052 , m_listItem(item)
1053 { 1053 {
1054 // init RenderObject attributes 1054 // init LayoutObject attributes
1055 setInline(true); // our object is Inline 1055 setInline(true); // our object is Inline
1056 setReplaced(true); // pretend to be replaced 1056 setReplaced(true); // pretend to be replaced
1057 } 1057 }
1058 1058
1059 RenderListMarker::~RenderListMarker() 1059 RenderListMarker::~RenderListMarker()
1060 { 1060 {
1061 } 1061 }
1062 1062
1063 void RenderListMarker::destroy() 1063 void RenderListMarker::destroy()
1064 { 1064 {
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
1639 if (style()) { 1639 if (style()) {
1640 // Reuse the current margins. Otherwise resetting the margins to initial values 1640 // Reuse the current margins. Otherwise resetting the margins to initial values
1641 // would trigger unnecessary layout. 1641 // would trigger unnecessary layout.
1642 newStyle->setMarginStart(style()->marginStart()); 1642 newStyle->setMarginStart(style()->marginStart());
1643 newStyle->setMarginEnd(style()->marginRight()); 1643 newStyle->setMarginEnd(style()->marginRight());
1644 } 1644 }
1645 setStyle(newStyle.release()); 1645 setStyle(newStyle.release());
1646 } 1646 }
1647 1647
1648 } // namespace blink 1648 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListMarker.h ('k') | Source/core/rendering/RenderMedia.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698