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

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

Issue 215063004: Reset multipliers correctly when autosizing is turned off. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add initializer. Created 6 years, 9 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/TextAutosizer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/TextAutosizer.cpp
diff --git a/Source/core/rendering/TextAutosizer.cpp b/Source/core/rendering/TextAutosizer.cpp
index 7e1b350c8c1249e949c81d04aef1eb97e6bd1b41..f464479921ed9c99a745d2e7fc9ce9d85ad29903 100644
--- a/Source/core/rendering/TextAutosizer.cpp
+++ b/Source/core/rendering/TextAutosizer.cpp
@@ -148,6 +148,7 @@ static unsigned computeLocalHash(const RenderObject* renderer)
TextAutosizer::TextAutosizer(Document* document)
: m_document(document)
+ , m_previouslyAutosized(false)
{
}
@@ -180,7 +181,7 @@ bool TextAutosizer::isApplicable() const
void TextAutosizer::recalculateMultipliers()
{
- if (!isApplicable())
+ if (!isApplicable() && !m_previouslyAutosized)
return;
RenderObject* renderer = m_document->renderer();
@@ -189,6 +190,7 @@ void TextAutosizer::recalculateMultipliers()
setMultiplier(renderer, 1);
renderer = renderer->nextInPreOrder();
}
+ m_previouslyAutosized = false;
}
bool TextAutosizer::processSubtree(RenderObject* layoutRoot)
@@ -244,6 +246,7 @@ bool TextAutosizer::processSubtree(RenderObject* layoutRoot)
m_nonAutosizedClusters.clear();
#endif
InspectorInstrumentation::didAutosizeText(layoutRoot);
+ m_previouslyAutosized = true;
return true;
}
« no previous file with comments | « Source/core/rendering/TextAutosizer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698