| Index: third_party/WebKit/Source/core/layout/TextAutosizer.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/TextAutosizer.cpp b/third_party/WebKit/Source/core/layout/TextAutosizer.cpp
|
| index f598a3fdb57e9c6d6c0dd4c0c1f2760502777148..c5d3c00c5b03800b924ddba31b9f7d5572cf2b26 100644
|
| --- a/third_party/WebKit/Source/core/layout/TextAutosizer.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/TextAutosizer.cpp
|
| @@ -628,15 +628,16 @@ void TextAutosizer::updatePageInfo() {
|
| // TODO(pdr): Accessibility should be moved out of the text autosizer. See:
|
| // crbug.com/645717.
|
| m_pageInfo.m_accessibilityFontScaleFactor =
|
| - m_document->settings()->accessibilityFontScaleFactor();
|
| + m_document->settings()->GetAccessibilityFontScaleFactor();
|
|
|
| // If the page has a meta viewport or @viewport, don't apply the device
|
| // scale adjustment.
|
| - if (!mainFrame->document()->viewportDescription().isSpecifiedByAuthor())
|
| + if (!mainFrame->document()->viewportDescription().isSpecifiedByAuthor()) {
|
| m_pageInfo.m_deviceScaleAdjustment =
|
| - m_document->settings()->deviceScaleAdjustment();
|
| - else
|
| + m_document->settings()->GetDeviceScaleAdjustment();
|
| + } else {
|
| m_pageInfo.m_deviceScaleAdjustment = 1.0f;
|
| + }
|
|
|
| // TODO(pdr): pageNeedsAutosizing should take into account whether
|
| // text-size-adjust is used anywhere on the page because that also needs to
|
|
|