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

Unified Diff: Source/core/rendering/RenderBR.cpp

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderBR.h ('k') | Source/core/rendering/RenderBlock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBR.cpp
diff --git a/Source/core/rendering/RenderBR.cpp b/Source/core/rendering/RenderBR.cpp
index 451f1e2acee8835f8d12143a4cde8efea1630751..8dc0d20601d8ceaba2bde520dd2efa626564c678 100644
--- a/Source/core/rendering/RenderBR.cpp
+++ b/Source/core/rendering/RenderBR.cpp
@@ -44,9 +44,9 @@ RenderBR::~RenderBR()
{
}
-int RenderBR::lineHeight(bool firstLine) const
+int RenderBR::lineHeight(OwnOrFirstLineStyle firstLine) const
{
- RenderStyle* s = style(firstLine && document().styleEngine()->usesFirstLineRules());
+ RenderStyle* s = style(firstLine && document().styleEngine()->usesFirstLineRules() ? FirstLineStyle : OwnStyle);
return s->computedLineHeight();
}
« no previous file with comments | « Source/core/rendering/RenderBR.h ('k') | Source/core/rendering/RenderBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698