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

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

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/RenderListItem.cpp ('k') | Source/core/rendering/RenderListMarker.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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 static UChar listMarkerSuffix(EListStyleType, int value); 55 static UChar listMarkerSuffix(EListStyleType, int value);
56 56
57 void listItemStyleDidChange(); 57 void listItemStyleDidChange();
58 58
59 private: 59 private:
60 RenderListMarker(RenderListItem*); 60 RenderListMarker(RenderListItem*);
61 61
62 virtual const char* renderName() const override { return "RenderListMarker"; } 62 virtual const char* renderName() const override { return "RenderListMarker"; }
63 virtual void computePreferredLogicalWidths() override; 63 virtual void computePreferredLogicalWidths() override;
64 64
65 virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectListMarker || RenderBox::isOfType(type); } 65 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectListMarker || RenderBox::isOfType(type); }
66 66
67 virtual void paint(const PaintInfo&, const LayoutPoint&) override; 67 virtual void paint(const PaintInfo&, const LayoutPoint&) override;
68 68
69 virtual void layout() override; 69 virtual void layout() override;
70 70
71 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override; 71 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
72 72
73 virtual InlineBox* createInlineBox() override; 73 virtual InlineBox* createInlineBox() override;
74 74
75 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const override; 75 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const override;
76 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const override; 76 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const override;
77 77
78 bool isText() const { return !isImage(); } 78 bool isText() const { return !isImage(); }
79 79
80 virtual void setSelectionState(SelectionState) override; 80 virtual void setSelectionState(SelectionState) override;
81 virtual LayoutRect selectionRectForPaintInvalidation(const LayoutLayerModelO bject* paintInvalidationContainer) const override; 81 virtual LayoutRect selectionRectForPaintInvalidation(const LayoutLayerModelO bject* paintInvalidationContainer) const override;
82 virtual bool canBeSelectionLeaf() const override { return true; } 82 virtual bool canBeSelectionLeaf() const override { return true; }
83 83
84 void updateMargins(); 84 void updateMargins();
85 void updateContent(); 85 void updateContent();
86 86
87 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) o verride; 87 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) o verride;
88 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride; 88 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride;
89 89
90 String m_text; 90 String m_text;
91 RefPtr<StyleImage> m_image; 91 RefPtr<StyleImage> m_image;
92 RenderListItem* m_listItem; 92 RenderListItem* m_listItem;
93 }; 93 };
94 94
95 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderListMarker, isListMarker()); 95 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderListMarker, isListMarker());
96 96
97 } // namespace blink 97 } // namespace blink
98 98
99 #endif // RenderListMarker_h 99 #endif // RenderListMarker_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListItem.cpp ('k') | Source/core/rendering/RenderListMarker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698