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

Side by Side Diff: Source/core/rendering/RenderListBox.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/RenderInline.cpp ('k') | Source/core/rendering/RenderListBox.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * This file is part of the select element renderer in WebCore.	2 * This file is part of the select element renderer in WebCore.

3 *	3 *

4 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.	4 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.

5 *	5 *

6 * Redistribution and use in source and binary forms, with or without	6 * Redistribution and use in source and binary forms, with or without

7 * modification, are permitted provided that the following conditions	7 * modification, are permitted provided that the following conditions

8 * are met:	8 * are met:

9 *	9 *

10 * 1. Redistributions of source code must retain the above copyright	10 * 1. Redistributions of source code must retain the above copyright

(...skipping 59 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
70 virtual bool hasControlClip() const OVERRIDE { return true; }	70 virtual bool hasControlClip() const OVERRIDE { return true; }

71 virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE;	71 virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE;

72 virtual LayoutRect controlClipRect(const LayoutPoint&) const OVERRIDE;	72 virtual LayoutRect controlClipRect(const LayoutPoint&) const OVERRIDE;

73	73

74 virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& loc ationInContainer, const LayoutPoint& accumulatedOffset) OVERRIDE;	74 virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& loc ationInContainer, const LayoutPoint& accumulatedOffset) OVERRIDE;

75	75

76 virtual bool scroll(ScrollDirection, ScrollGranularity, float) OVERRIDE;	76 virtual bool scroll(ScrollDirection, ScrollGranularity, float) OVERRIDE;

77	77

78 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;	78 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;

79 virtual void computePreferredLogicalWidths() OVERRIDE;	79 virtual void computePreferredLogicalWidths() OVERRIDE;

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

81 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const OVERRIDE;	81 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const OVERRIDE;

82	82

83 virtual void layout() OVERRIDE;	83 virtual void layout() OVERRIDE;

84	84

85 virtual void invalidateTreeAfterLayout(const RenderLayerModelObject&) OVERRI DE FINAL;	85 virtual void invalidateTreeAfterLayout(const RenderLayerModelObject&) OVERRI DE FINAL;

86	86

87 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition alOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE;	87 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition alOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE;

88	88

89 virtual bool canBeProgramaticallyScrolled() const OVERRIDE { return true; }	89 virtual bool canBeProgramaticallyScrolled() const OVERRIDE { return true; }

90 virtual void autoscroll(const IntPoint&) OVERRIDE;	90 virtual void autoscroll(const IntPoint&) OVERRIDE;

(...skipping 72 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
163 int m_listItemCount;	163 int m_listItemCount;

164	164

165 RefPtr<Scrollbar> m_vBar;	165 RefPtr<Scrollbar> m_vBar;

166 };	166 };

167	167

168 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderListBox, isListBox());	168 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderListBox, isListBox());

169	169

170 } // namepace WebCore	170 } // namepace WebCore

171	171

172 #endif // RenderListBox_h	172 #endif // RenderListBox_h

OLD	NEW