| Index: Source/WebKit/chromium/src/WebViewImpl.cpp
|
| diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
|
| index dd732f5136c940f128c2b12c2e3d106a5fc0eb30..b62b43c1c62c7f46d801cab9d88d3fab58fc2404 100644
|
| --- a/Source/WebKit/chromium/src/WebViewImpl.cpp
|
| +++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
|
| @@ -1200,10 +1200,8 @@ void WebViewImpl::computeScaleAndScrollForHitRect(const WebRect& hitRect, AutoZo
|
| // be allowed to manually pinch zoom in further if they desire.
|
| const float defaultScaleWhenAlreadyLegible = m_minimumPageScaleFactor * doubleTapZoomAlreadyLegibleRatio;
|
| float legibleScale = 1;
|
| -#if ENABLE(TEXT_AUTOSIZING)
|
| if (page() && page()->settings())
|
| legibleScale *= page()->settings()->textAutosizingFontScaleFactor();
|
| -#endif
|
| if (legibleScale < defaultScaleWhenAlreadyLegible)
|
| legibleScale = (scale == m_minimumPageScaleFactor) ? defaultScaleWhenAlreadyLegible : m_minimumPageScaleFactor;
|
|
|
| @@ -2782,10 +2780,9 @@ void WebViewImpl::computeScaleAndScrollForFocusedNode(Node* focusedNode, float&
|
| // the caret height will become minReadableCaretHeight (adjusted for dpi
|
| // and font scale factor).
|
| float targetScale = 1;
|
| -#if ENABLE(TEXT_AUTOSIZING)
|
| if (page() && page()->settings())
|
| targetScale *= page()->settings()->textAutosizingFontScaleFactor();
|
| -#endif
|
| +
|
| newScale = clampPageScaleFactorToLimits(minReadableCaretHeight * targetScale / caret.height);
|
| const float deltaScale = newScale / pageScaleFactor();
|
|
|
|
|