Source/core/rendering/RenderListMarker.h - Issue 945803004: Merge back LayoutLayerModelObject into RenderBoxModelObject

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

Issue 945803004: Merge back LayoutLayerModelObject into RenderBoxModelObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Better rebasing. 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/RenderInline.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 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 LayoutBoxModelObj ect* 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 LayoutStyle& newStyle) o verride;	87 virtual void styleWillChange(StyleDifference, const LayoutStyle& newStyle) o verride;

88 virtual void styleDidChange(StyleDifference, const LayoutStyle* oldStyle) ov erride;	88 virtual void styleDidChange(StyleDifference, const LayoutStyle* 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_LAYOUT_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

OLD	NEW