Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

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

Issue 137943002: Update more core classes to use OVERRIDE / FINAL when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/InlineTextBox.h ('k') | Source/core/rendering/RenderBox.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 LayoutUnit minLineHeightForReplacedRenderer(bool isFirstLine, LayoutUnit rep lacedHeight) const; 97 LayoutUnit minLineHeightForReplacedRenderer(bool isFirstLine, LayoutUnit rep lacedHeight) const;
98 98
99 RenderLineBoxList* lineBoxes() { return &m_lineBoxes; } 99 RenderLineBoxList* lineBoxes() { return &m_lineBoxes; }
100 100
101 InlineFlowBox* firstLineBox() const { return m_lineBoxes.firstLineBox(); } 101 InlineFlowBox* firstLineBox() const { return m_lineBoxes.firstLineBox(); }
102 InlineFlowBox* lastLineBox() const { return m_lineBoxes.lastLineBox(); } 102 InlineFlowBox* lastLineBox() const { return m_lineBoxes.lastLineBox(); }
103 103
104 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow 104 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow
105 virtual void deleteLineBoxTree(); 105 virtual void deleteLineBoxTree();
106 106
107 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) ; 107 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;
108 virtual void removeChild(RenderObject*); 108 virtual void removeChild(RenderObject*) OVERRIDE;
109 109
110 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0); 110 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0);
111 111
112 void insertPositionedObject(RenderBox*); 112 void insertPositionedObject(RenderBox*);
113 static void removePositionedObject(RenderBox*); 113 static void removePositionedObject(RenderBox*);
114 void removePositionedObjects(RenderBlock*, ContainingBlockState = SameContai ningBlock); 114 void removePositionedObjects(RenderBlock*, ContainingBlockState = SameContai ningBlock);
115 115
116 TrackedRendererListHashSet* positionedObjects() const; 116 TrackedRendererListHashSet* positionedObjects() const;
117 bool hasPositionedObjects() const 117 bool hasPositionedObjects() const
118 { 118 {
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE; 349 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE;
350 350
351 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE; 351 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;
352 virtual void computePreferredLogicalWidths() OVERRIDE; 352 virtual void computePreferredLogicalWidths() OVERRIDE;
353 void adjustIntrinsicLogicalWidthsForColumns(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const; 353 void adjustIntrinsicLogicalWidthsForColumns(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const;
354 354
355 virtual int firstLineBoxBaseline() const OVERRIDE; 355 virtual int firstLineBoxBaseline() const OVERRIDE;
356 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE; 356 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;
357 int lastLineBoxBaseline(LineDirectionMode) const; 357 int lastLineBoxBaseline(LineDirectionMode) const;
358 358
359 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&); 359 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) OVERRID E;
360 360
361 // Delay update scrollbar until finishDelayRepaint() will be 361 // Delay update scrollbar until finishDelayRepaint() will be
362 // called. This function is used when a flexbox is laying out its 362 // called. This function is used when a flexbox is laying out its
363 // descendant. If multiple calls are made to startDelayRepaint(), 363 // descendant. If multiple calls are made to startDelayRepaint(),
364 // finishDelayRepaint() will do nothing until finishDelayRepaint() 364 // finishDelayRepaint() will do nothing until finishDelayRepaint()
365 // is called the same number of times. 365 // is called the same number of times.
366 static void startDelayUpdateScrollInfo(); 366 static void startDelayUpdateScrollInfo();
367 static void finishDelayUpdateScrollInfo(); 367 static void finishDelayUpdateScrollInfo();
368 368
369 void updateScrollInfoAfterLayout(); 369 void updateScrollInfoAfterLayout();
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 return false; 643 return false;
644 } 644 }
645 return true; 645 return true;
646 } 646 }
647 647
648 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 648 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
649 649
650 } // namespace WebCore 650 } // namespace WebCore
651 651
652 #endif // RenderBlock_h 652 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « Source/core/rendering/InlineTextBox.h ('k') | Source/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698