Title: [131622] trunk/Source/WebKit/blackberry
- Revision
- 131622
- Author
- mifen...@rim.com
- Date
- 2012-10-17 10:55:30 -0700 (Wed, 17 Oct 2012)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (131621 => 131622)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-10-17 17:50:40 UTC (rev 131621)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-10-17 17:55:30 UTC (rev 131622)
@@ -1,3 +1,19 @@
+2012-10-17 Mike Fenton <mifen...@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 <mlattan...@rim.com>
2012-10-16 Mike Lattanzio <mlattan...@rim.com>
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (131621 => 131622)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-10-17 17:50:40 UTC (rev 131621)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-10-17 17:55:30 UTC (rev 131622)
@@ -1079,7 +1079,7 @@
// 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();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
