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

Side by Side Diff: Source/WebCore/rendering/RenderListItem.h

Issue 10914111: Merge 125737 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 3 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 | « no previous file | Source/WebCore/rendering/RenderListItem.cpp » ('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, 2009 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009 Apple Inc. All rights reserv ed.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 static RenderListItem* nextListItem(RenderObject* listRenderer, const Render ListItem* = 0); 52 static RenderListItem* nextListItem(RenderObject* listRenderer, const Render ListItem* = 0);
53 53
54 private: 54 private:
55 virtual const char* renderName() const { return "RenderListItem"; } 55 virtual const char* renderName() const { return "RenderListItem"; }
56 56
57 virtual bool isListItem() const { return true; } 57 virtual bool isListItem() const { return true; }
58 58
59 virtual void willBeDestroyed(); 59 virtual void willBeDestroyed();
60 60
61 virtual void insertedIntoTree() OVERRIDE;
62
61 virtual bool isEmpty() const; 63 virtual bool isEmpty() const;
62 virtual void paint(PaintInfo&, const LayoutPoint&); 64 virtual void paint(PaintInfo&, const LayoutPoint&);
63 65
64 virtual void layout(); 66 virtual void layout();
65 virtual void computePreferredLogicalWidths(); 67 virtual void computePreferredLogicalWidths();
66 68
67 void positionListMarker(); 69 void positionListMarker();
68 70
69 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 71 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
70 72
(...skipping 20 matching lines...) Expand all
91 ASSERT(!object || object->isListItem()); 93 ASSERT(!object || object->isListItem());
92 return static_cast<RenderListItem*>(object); 94 return static_cast<RenderListItem*>(object);
93 } 95 }
94 96
95 // This will catch anyone doing an unnecessary cast. 97 // This will catch anyone doing an unnecessary cast.
96 void toRenderListItem(const RenderListItem*); 98 void toRenderListItem(const RenderListItem*);
97 99
98 } // namespace WebCore 100 } // namespace WebCore
99 101
100 #endif // RenderListItem_h 102 #endif // RenderListItem_h
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/rendering/RenderListItem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698