summaryrefslogtreecommitdiff
path: root/Source/WebCore/rendering/RenderLineBoxList.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/rendering/RenderLineBoxList.h')
-rw-r--r--Source/WebCore/rendering/RenderLineBoxList.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/Source/WebCore/rendering/RenderLineBoxList.h b/Source/WebCore/rendering/RenderLineBoxList.h
index 615bcb5f9..231d8f0fc 100644
--- a/Source/WebCore/rendering/RenderLineBoxList.h
+++ b/Source/WebCore/rendering/RenderLineBoxList.h
@@ -10,7 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
@@ -26,9 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-#ifndef RenderLineBoxList_h
-#define RenderLineBoxList_h
+#pragma once
#include "RenderObject.h"
@@ -40,8 +38,8 @@ class RenderBlockFlow;
class RenderLineBoxList {
public:
RenderLineBoxList()
- : m_firstLineBox(0)
- , m_lastLineBox(0)
+ : m_firstLineBox(nullptr)
+ , m_lastLineBox(nullptr)
{
}
@@ -64,13 +62,13 @@ public:
void removeLineBox(InlineFlowBox*);
void dirtyLineBoxes();
- void dirtyLinesFromChangedChild(RenderBoxModelObject* parent, RenderObject* child);
+ void dirtyLinesFromChangedChild(RenderBoxModelObject& parent, RenderObject& child);
void paint(RenderBoxModelObject*, PaintInfo&, const LayoutPoint&) const;
bool hitTest(RenderBoxModelObject*, const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) const;
private:
- bool anyLineIntersectsRect(RenderBoxModelObject*, const LayoutRect&, const LayoutPoint&, bool usePrintRect = false, LayoutUnit outlineSize = 0) const;
+ bool anyLineIntersectsRect(RenderBoxModelObject*, const LayoutRect&, const LayoutPoint&, bool usePrintRect = false) const;
bool lineIntersectsDirtyRect(RenderBoxModelObject*, InlineFlowBox*, const PaintInfo&, const LayoutPoint&) const;
bool rangeIntersectsRect(RenderBoxModelObject*, LayoutUnit logicalTop, LayoutUnit logicalBottom, const LayoutRect&, const LayoutPoint&) const;
@@ -89,5 +87,3 @@ inline void RenderLineBoxList::checkConsistency() const
#endif
} // namespace WebCore
-
-#endif // RenderFlow_h