Commit 159c476e authored by mifenton@rim.com's avatar mifenton@rim.com

[BlackBerry] Prevent focus zoom on non-userscalable pages.

https://bugs.webkit.org/show_bug.cgi?id=99608

Reviewed by Rob Buis.

PR 222378.

Disable focus zoom when the page is non-user scalable.

Reviewed Internally by Nima Ghanavatian.

* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@131622 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 775e75a8
2012-10-17 Mike Fenton <mifenton@rim.com>
[BlackBerry] Prevent focus zoom on non-userscalable pages.
https://bugs.webkit.org/show_bug.cgi?id=99608
Reviewed by Rob Buis.
PR 222378.
Disable focus zoom when the page is non-user scalable.
Reviewed Internally by Nima Ghanavatian.
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
2012-10-16 Mike Lattanzio <mlattanzio@rim.com>
2012-10-16 Mike Lattanzio <mlattanzio@rim.com>
......
......@@ -1079,7 +1079,7 @@ void InputHandler::ensureFocusTextElementVisible(CaretScrollType scrollType)
// The minimum size being defined as 3 mm is a good value based on my observations.
static const int s_minimumTextHeightInPixels = Graphics::Screen::primaryScreen()->heightInMMToPixels(3);
if (fontHeight && fontHeight * m_webPage->currentScale() < s_minimumTextHeightInPixels && !isRunningDrt()) {
if (m_webPage->isUserScalable() && fontHeight && fontHeight * m_webPage->currentScale() < s_minimumTextHeightInPixels && !isRunningDrt()) {
if (!m_focusZoomScale) {
m_focusZoomScale = m_webPage->currentScale();
m_focusZoomLocation = selectionFocusRect.location();
......
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