third_party/WebKit/Source/core/layout/LayoutListMarker.h - Issue 1407003005: Lists: Render marker text closer to list items.

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutListMarker.h

Issue 1407003005: Lists: Render marker text closer to list items. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updated test expectations, again. Created 5 years, 2 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 | « third_party/WebKit/LayoutTests/fast/lists/list-marker-padding-overflow-hidden-rtl.html ('k') | third_party/WebKit/Source/core/layout/LayoutListMarker.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87	87

88 LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;	88 LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;

89 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePo sitionMode = PositionOnContainingLine) const override;	89 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePo sitionMode = PositionOnContainingLine) const override;

90	90

91 bool isText() const { return !isImage(); }	91 bool isText() const { return !isImage(); }

92	92

93 void setSelectionState(SelectionState) override;	93 void setSelectionState(SelectionState) override;

94 LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* pai ntInvalidationContainer) const override;	94 LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* pai ntInvalidationContainer) const override;

95 bool canBeSelectionLeaf() const override { return true; }	95 bool canBeSelectionLeaf() const override { return true; }

96	96

	97 LayoutUnit getWidthOfTextWithSuffix() const;

97 void updateMargins();	98 void updateMargins();

98 void updateContent();	99 void updateContent();

99	100

100 void styleWillChange(StyleDifference, const ComputedStyle& newStyle) overrid e;	101 void styleWillChange(StyleDifference, const ComputedStyle& newStyle) overrid e;

101 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override ;	102 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override ;

102	103

103 String m_text;	104 String m_text;

104 RefPtrWillBePersistent<StyleImage> m_image;	105 RefPtrWillBePersistent<StyleImage> m_image;

105 LayoutListItem* m_listItem;	106 LayoutListItem* m_listItem;

106 };	107 };

107	108

108 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListMarker, isListMarker());	109 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutListMarker, isListMarker());

109	110

110 } // namespace blink	111 } // namespace blink

111	112

112 #endif // LayoutListMarker_h	113 #endif // LayoutListMarker_h

OLD	NEW