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

Unified Diff: Source/core/rendering/RenderListMarker.h

Issue 590413005: Move paint code from RenderListMarker/RenderListItem to ListMarkerPainter/ListItemPainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/paint/ListMarkerPainter.cpp ('k') | Source/core/rendering/RenderListMarker.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderListMarker.h
diff --git a/Source/core/rendering/RenderListMarker.h b/Source/core/rendering/RenderListMarker.h
index 4d70139bb025f23c1587d888f6e6244c2269964d..529d13d442b9669c3cb46a4b515ba6930659cbf2 100644
--- a/Source/core/rendering/RenderListMarker.h
+++ b/Source/core/rendering/RenderListMarker.h
@@ -47,6 +47,14 @@ public:
void updateMarginsAndContent();
+ IntRect getRelativeMarkerRect();
+ LayoutRect localSelectionRect();
+ virtual bool isImage() const OVERRIDE;
+ const StyleImage* image() { return m_image.get(); }
+ const RenderListItem* listItem() { return m_listItem.get(); }
+
+ static UChar listMarkerSuffix(EListStyleType, int value);
+
private:
RenderListMarker(RenderListItem*);
@@ -66,7 +74,6 @@ private:
virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
- virtual bool isImage() const OVERRIDE;
bool isText() const { return !isImage(); }
virtual void setSelectionState(SelectionState) OVERRIDE;
@@ -79,9 +86,6 @@ private:
virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) OVERRIDE;
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
- IntRect getRelativeMarkerRect();
- LayoutRect localSelectionRect();
-
String m_text;
RefPtr<StyleImage> m_image;
RawPtrWillBeMember<RenderListItem> m_listItem;
« no previous file with comments | « Source/core/paint/ListMarkerPainter.cpp ('k') | Source/core/rendering/RenderListMarker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698