Source/core/rendering/RenderBlockFlow.h - Issue 129173004: Update rendering classes to use OVERRIDE / FINAL when needed

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

Issue 129173004: Update rendering classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase Created 6 years, 11 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/RenderBlock.h ('k') | Source/core/rendering/RenderBox.h » ('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 * (C) 2007 David Smith (catfish.man@gmail.com)	4 * (C) 2007 David Smith (catfish.man@gmail.com)

5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.	5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.

6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.	6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.

7 * Copyright (C) 2013 Google Inc. All rights reserved.	7 * Copyright (C) 2013 Google Inc. All rights reserved.

8 *	8 *

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

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

(...skipping 279 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
290 bool hasOverhangingFloat(RenderBox*);	290 bool hasOverhangingFloat(RenderBox*);

291 void addIntrudingFloats(RenderBlockFlow* prev, LayoutUnit xoffset, LayoutUni t yoffset);	291 void addIntrudingFloats(RenderBlockFlow* prev, LayoutUnit xoffset, LayoutUni t yoffset);

292 LayoutUnit addOverhangingFloats(RenderBlockFlow* child, bool makeChildPaintO therFloats);	292 LayoutUnit addOverhangingFloats(RenderBlockFlow* child, bool makeChildPaintO therFloats);

293	293

294 LayoutUnit lowestFloatLogicalBottom(FloatingObject::Type = FloatingObject::F loatLeftRight) const;	294 LayoutUnit lowestFloatLogicalBottom(FloatingObject::Type = FloatingObject::F loatLeftRight) const;

295 LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit, ShapeOutsideFloatOffsetMo de = ShapeOutsideFloatMarginBoxOffset) const;	295 LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit, ShapeOutsideFloatOffsetMo de = ShapeOutsideFloatMarginBoxOffset) const;

296	296

297 virtual bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitT estLocation& locationInContainer, const LayoutPoint& accumulatedOffset) OVERRIDE FINAL;	297 virtual bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitT estLocation& locationInContainer, const LayoutPoint& accumulatedOffset) OVERRIDE FINAL;

298	298

299 virtual void repaintOverhangingFloats(bool paintAllDescendants) OVERRIDE FIN AL;	299 virtual void repaintOverhangingFloats(bool paintAllDescendants) OVERRIDE FIN AL;

300 virtual void repaintOverflow() OVERRIDE;	300 virtual void repaintOverflow() OVERRIDE FINAL;

301 virtual void paintFloats(PaintInfo&, const LayoutPoint&, bool preservePhase = false) OVERRIDE FINAL;	301 virtual void paintFloats(PaintInfo&, const LayoutPoint&, bool preservePhase = false) OVERRIDE FINAL;

302 virtual void clipOutFloatingObjects(RenderBlock, const PaintInfo, const La youtPoint&, const LayoutSize&) OVERRIDE;	302 virtual void clipOutFloatingObjects(RenderBlock, const PaintInfo, const La youtPoint&, const LayoutSize&) OVERRIDE;

303 void clearFloats(EClear);	303 void clearFloats(EClear);

304	304

305 LayoutUnit logicalRightFloatOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixedOffset, LayoutUnit logicalHeight) const;	305 LayoutUnit logicalRightFloatOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixedOffset, LayoutUnit logicalHeight) const;

306 LayoutUnit logicalLeftFloatOffsetForLine(LayoutUnit logicalTop, LayoutUnit f ixedOffset, LayoutUnit logicalHeight) const;	306 LayoutUnit logicalLeftFloatOffsetForLine(LayoutUnit logicalTop, LayoutUnit f ixedOffset, LayoutUnit logicalHeight) const;

307	307

308 LayoutUnit logicalRightOffsetForPositioningFloat(LayoutUnit logicalTop, Layo utUnit fixedOffset, bool applyTextIndent, LayoutUnit* heightRemaining) const;	308 LayoutUnit logicalRightOffsetForPositioningFloat(LayoutUnit logicalTop, Layo utUnit fixedOffset, bool applyTextIndent, LayoutUnit* heightRemaining) const;

309 LayoutUnit logicalLeftOffsetForPositioningFloat(LayoutUnit logicalTop, Layou tUnit fixedOffset, bool applyTextIndent, LayoutUnit* heightRemaining) const;	309 LayoutUnit logicalLeftOffsetForPositioningFloat(LayoutUnit logicalTop, Layou tUnit fixedOffset, bool applyTextIndent, LayoutUnit* heightRemaining) const;

310	310

(...skipping 202 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
513	513

514 // END METHODS DEFINED IN RenderBlockLineLayout	514 // END METHODS DEFINED IN RenderBlockLineLayout

515	515

516 };	516 };

517	517

518 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow());	518 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow());

519	519

520 } // namespace WebCore	520 } // namespace WebCore

521	521

522 #endif // RenderBlockFlow_h	522 #endif // RenderBlockFlow_h

OLD	NEW