Commit 831eb55c authored by Rune Lillesveen's avatar Rune Lillesveen Committed by Commit Bot

[Squad] Remove mutable style access in TextAutosizer.

Bug: 813068
Change-Id: If8b7489c69b85237d422c6b3d030fdd79ca7017a
Reviewed-on: https://chromium-review.googlesource.com/983955Reviewed-by: default avatarPhilip Rogers <pdr@chromium.org>
Commit-Queue: Rune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547667}
parent 8b9174f8
...@@ -1111,7 +1111,7 @@ void TextAutosizer::ApplyMultiplier(LayoutObject* layout_object, ...@@ -1111,7 +1111,7 @@ void TextAutosizer::ApplyMultiplier(LayoutObject* layout_object,
SubtreeLayoutScope* layouter, SubtreeLayoutScope* layouter,
RelayoutBehavior relayout_behavior) { RelayoutBehavior relayout_behavior) {
DCHECK(layout_object); DCHECK(layout_object);
ComputedStyle& current_style = layout_object->MutableStyleRef(); const ComputedStyle& current_style = layout_object->StyleRef();
if (!current_style.GetTextSizeAdjust().IsAuto()) { if (!current_style.GetTextSizeAdjust().IsAuto()) {
// The accessibility font scale factor is applied by the autosizer so we // The accessibility font scale factor is applied by the autosizer so we
// need to apply that scale factor on top of the text-size-adjust // need to apply that scale factor on top of the text-size-adjust
......
...@@ -351,7 +351,7 @@ class CORE_EXPORT TextAutosizer final ...@@ -351,7 +351,7 @@ class CORE_EXPORT TextAutosizer final
// Clusters are created and destroyed during layout // Clusters are created and destroyed during layout
ClusterStack cluster_stack_; ClusterStack cluster_stack_;
FingerprintMapper fingerprint_mapper_; FingerprintMapper fingerprint_mapper_;
Vector<scoped_refptr<ComputedStyle>> styles_retained_during_layout_; Vector<scoped_refptr<const ComputedStyle>> styles_retained_during_layout_;
// FIXME: All frames should share the same m_pageInfo instance. // FIXME: All frames should share the same m_pageInfo instance.
PageInfo page_info_; PageInfo page_info_;
bool update_page_info_deferred_; bool update_page_info_deferred_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment