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

Side by Side Diff: Source/core/rendering/RenderBlock.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/RenderBR.cpp ('k') | Source/core/rendering/RenderBlock.cpp » ('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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // If you have a RenderBlock, use firstChild or lastChild instead. 77 // If you have a RenderBlock, use firstChild or lastChild instead.
78 void slowFirstChild() const WTF_DELETED_FUNCTION; 78 void slowFirstChild() const WTF_DELETED_FUNCTION;
79 void slowLastChild() const WTF_DELETED_FUNCTION; 79 void slowLastChild() const WTF_DELETED_FUNCTION;
80 80
81 const RenderObjectChildList* children() const { return &m_children; } 81 const RenderObjectChildList* children() const { return &m_children; }
82 RenderObjectChildList* children() { return &m_children; } 82 RenderObjectChildList* children() { return &m_children; }
83 83
84 bool beingDestroyed() const { return m_beingDestroyed; } 84 bool beingDestroyed() const { return m_beingDestroyed; }
85 85
86 // These two functions are overridden for inline-block. 86 // These two functions are overridden for inline-block.
87 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const OVERRIDE FINAL; 87 virtual LayoutUnit lineHeight(OwnOrFirstLineStyle, LineDirectionMode, LinePo sitionMode = PositionOnContainingLine) const OVERRIDE FINAL;
88 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const OVERRIDE; 88 virtual int baselinePosition(FontBaseline, OwnOrFirstLineStyle, LineDirectio nMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
89 89
90 LayoutUnit minLineHeightForReplacedRenderer(bool isFirstLine, LayoutUnit rep lacedHeight) const; 90 LayoutUnit minLineHeightForReplacedRenderer(OwnOrFirstLineStyle, LayoutUnit replacedHeight) const;
91 91
92 RenderLineBoxList* lineBoxes() { return &m_lineBoxes; } 92 RenderLineBoxList* lineBoxes() { return &m_lineBoxes; }
93 93
94 InlineFlowBox* firstLineBox() const { return m_lineBoxes.firstLineBox(); } 94 InlineFlowBox* firstLineBox() const { return m_lineBoxes.firstLineBox(); }
95 InlineFlowBox* lastLineBox() const { return m_lineBoxes.lastLineBox(); } 95 InlineFlowBox* lastLineBox() const { return m_lineBoxes.lastLineBox(); }
96 96
97 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow 97 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to Rend erBlockFlow
98 virtual void deleteLineBoxTree(); 98 virtual void deleteLineBoxTree();
99 99
100 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE; 100 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 // FIXME: This is temporary as we move code that accesses block flow 545 // FIXME: This is temporary as we move code that accesses block flow
546 // member variables out of RenderBlock and into RenderBlockFlow. 546 // member variables out of RenderBlock and into RenderBlockFlow.
547 friend class RenderBlockFlow; 547 friend class RenderBlockFlow;
548 }; 548 };
549 549
550 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); 550 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock());
551 551
552 } // namespace WebCore 552 } // namespace WebCore
553 553
554 #endif // RenderBlock_h 554 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBR.cpp ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698