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

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

Issue 260073005: Do not cache the result of RenderStyle::computedLineHeight() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated 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 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 7704a1e941f172d5ad8dbd26221fad472ba08578..e928cceceb7fb5c0a6e6fb81edef5948acecb57e 100644
--- a/Source/core/rendering/RenderBR.cpp
+++ b/Source/core/rendering/RenderBR.cpp
@@ -35,7 +35,6 @@ static PassRefPtr<StringImpl> newlineString()
RenderBR::RenderBR(Node* node)
: RenderText(node, newlineString())
- , m_lineHeight(-1)
{
}
@@ -45,22 +44,13 @@ RenderBR::~RenderBR()
int RenderBR::lineHeight(bool firstLine) const
{
- if (firstLine && document().styleEngine()->usesFirstLineRules()) {
- RenderStyle* s = style(firstLine);
- if (s != style())
- return s->computedLineHeight();
- }
-
- if (m_lineHeight == -1)
- m_lineHeight = style()->computedLineHeight();
-
- return m_lineHeight;
+ RenderStyle* s = style(firstLine && document().styleEngine()->usesFirstLineRules());
+ return s->computedLineHeight();
}
void RenderBR::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
{
RenderText::styleDidChange(diff, oldStyle);
- m_lineHeight = -1;
}
int RenderBR::caretMinOffset() const
« 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