Source/core/rendering/RenderListMarker.h - Issue 351213002: Change RenderObject::style(bool) to accept an enum instead

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

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 years, 5 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 | « Source/core/rendering/RenderListBox.cpp ('k') | Source/core/rendering/RenderListMarker.cpp » ('j') | no next file with comments »

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 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 virtual bool isListMarker() const OVERRIDE { return true; }	55 virtual bool isListMarker() const OVERRIDE { return true; }

56	56

57 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;	57 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;

58	58

59 virtual void layout() OVERRIDE;	59 virtual void layout() OVERRIDE;

60	60

61 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE;	61 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE;

62	62

63 virtual InlineBox* createInlineBox() OVERRIDE;	63 virtual InlineBox* createInlineBox() OVERRIDE;

64	64

65 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const OVERRIDE;	65 virtual LayoutUnit lineHeight(OwnOrFirstLineStyle, LineDirectionMode, LinePo sitionMode = PositionOnContainingLine) const OVERRIDE;

66 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const OVERRIDE;	66 virtual int baselinePosition(FontBaseline, OwnOrFirstLineStyle, LineDirectio nMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;

67	67

68 virtual bool isImage() const OVERRIDE;	68 virtual bool isImage() const OVERRIDE;

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

70	70

71 virtual void setSelectionState(SelectionState) OVERRIDE;	71 virtual void setSelectionState(SelectionState) OVERRIDE;

72 virtual LayoutRect selectionRectForPaintInvalidation(const RenderLayerModelO bject* paintInvalidationContainer, bool clipToVisibleContent = true) OVERRIDE;	72 virtual LayoutRect selectionRectForPaintInvalidation(const RenderLayerModelO bject* paintInvalidationContainer, bool clipToVisibleContent = true) OVERRIDE;

73 virtual bool canBeSelectionLeaf() const OVERRIDE { return true; }	73 virtual bool canBeSelectionLeaf() const OVERRIDE { return true; }

74	74

75 void updateMargins();	75 void updateMargins();

76 void updateContent();	76 void updateContent();

77	77

78 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) O VERRIDE;	78 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) O VERRIDE;

79 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;	79 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;

80	80

81 IntRect getRelativeMarkerRect();	81 IntRect getRelativeMarkerRect();

82 LayoutRect localSelectionRect();	82 LayoutRect localSelectionRect();

83	83

84 String m_text;	84 String m_text;

85 RefPtr<StyleImage> m_image;	85 RefPtr<StyleImage> m_image;

86 RenderListItem* m_listItem;	86 RenderListItem* m_listItem;

87 };	87 };

88	88

89 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderListMarker, isListMarker());	89 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderListMarker, isListMarker());

90	90

91 } // namespace WebCore	91 } // namespace WebCore

92	92

93 #endif // RenderListMarker_h	93 #endif // RenderListMarker_h

OLD	NEW