| 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 e3aa46bcc7e34ac121fc293a48037f7bc2191e67..8eb6562d095b027614a742e891ba05715b94c20a 100644
|
| --- a/third_party/WebKit/Source/core/layout/TextAutosizer.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/TextAutosizer.cpp
|
| @@ -631,15 +631,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
|
|
|