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

Side by Side Diff: Source/core/rendering/RenderBR.cpp

Issue 351033003: Simplify use of styleOrFirstLineStyle (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@rename-style-bool-to-0
Patch Set: Created 6 years, 6 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 | « no previous file | 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2006 Apple Computer, Inc. 3 * Copyright (C) 2006 Apple Computer, Inc.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 26 matching lines...) Expand all
37 : RenderText(node, newlineString()) 37 : RenderText(node, newlineString())
38 { 38 {
39 } 39 }
40 40
41 RenderBR::~RenderBR() 41 RenderBR::~RenderBR()
42 { 42 {
43 } 43 }
44 44
45 int RenderBR::lineHeight(bool firstLine) const 45 int RenderBR::lineHeight(bool firstLine) const
46 { 46 {
47 RenderStyle* s = styleOrFirstLineStyle(firstLine && document().styleEngine() ->usesFirstLineRules()); 47 return styleOrFirstLineStyle(firstLine)->computedLineHeight();
48 return s->computedLineHeight();
49 } 48 }
50 49
51 void RenderBR::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle) 50 void RenderBR::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
52 { 51 {
53 RenderText::styleDidChange(diff, oldStyle); 52 RenderText::styleDidChange(diff, oldStyle);
54 } 53 }
55 54
56 int RenderBR::caretMinOffset() const 55 int RenderBR::caretMinOffset() const
57 { 56 {
58 return 0; 57 return 0;
59 } 58 }
60 59
61 int RenderBR::caretMaxOffset() const 60 int RenderBR::caretMaxOffset() const
62 { 61 {
63 return 1; 62 return 1;
64 } 63 }
65 64
66 PositionWithAffinity RenderBR::positionForPoint(const LayoutPoint&) 65 PositionWithAffinity RenderBR::positionForPoint(const LayoutPoint&)
67 { 66 {
68 return createPositionWithAffinity(0, DOWNSTREAM); 67 return createPositionWithAffinity(0, DOWNSTREAM);
69 } 68 }
70 69
71 } // namespace WebCore 70 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698