| Index: Source/core/rendering/TextAutosizer.cpp
|
| diff --git a/Source/core/rendering/TextAutosizer.cpp b/Source/core/rendering/TextAutosizer.cpp
|
| index f3ebe7f45eb89003dc8e37a9551fbe1aa148e64a..a9a9ca9cad5da4a524c82f6351f4ae820bb87c43 100644
|
| --- a/Source/core/rendering/TextAutosizer.cpp
|
| +++ b/Source/core/rendering/TextAutosizer.cpp
|
| @@ -222,7 +222,7 @@ static bool blockHeightConstrained(const RenderBlock* block)
|
| // FIXME: This code needs to take into account vertical writing modes.
|
| // FIXME: Consider additional heuristics, such as ignoring fixed heights if the content is already overflowing before autosizing kicks in.
|
| for (; block; block = block->containingBlock()) {
|
| - RenderStyle* style = block->style();
|
| + const RenderStyle* style = block->style();
|
| if (style->overflowY() >= OSCROLL)
|
| return false;
|
| if (style->height().isSpecified() || style->maxHeight().isSpecified() || block->isOutOfFlowPositioned()) {
|
| @@ -566,7 +566,7 @@ void TextAutosizer::resetMultipliers()
|
| {
|
| RenderObject* renderer = m_document->renderView();
|
| while (renderer) {
|
| - if (RenderStyle* style = renderer->style()) {
|
| + if (const RenderStyle* style = renderer->style()) {
|
| if (style->textAutosizingMultiplier() != 1)
|
| applyMultiplier(renderer, 1, LayoutNeeded);
|
| }
|
| @@ -685,7 +685,7 @@ TextAutosizer::Fingerprint TextAutosizer::computeFingerprint(const RenderObject*
|
|
|
| data.m_qualifiedNameHash = QualifiedNameHash::hash(toElement(node)->tagQName());
|
|
|
| - if (RenderStyle* style = renderer->style()) {
|
| + if (const RenderStyle* style = renderer->style()) {
|
| data.m_packedStyleProperties = style->direction();
|
| data.m_packedStyleProperties |= (style->position() << 1);
|
| data.m_packedStyleProperties |= (style->floating() << 4);
|
| @@ -964,7 +964,7 @@ const RenderObject* TextAutosizer::findTextLeaf(const RenderObject* parent, size
|
| void TextAutosizer::applyMultiplier(RenderObject* renderer, float multiplier, RelayoutBehavior relayoutBehavior)
|
| {
|
| ASSERT(renderer && renderer->style());
|
| - RenderStyle* currentStyle = renderer->style();
|
| + RenderStyle* currentStyle = renderer->deprecatedMutableStyle();
|
| if (currentStyle->textAutosizingMultiplier() == multiplier)
|
| return;
|
|
|
|
|