Modified: trunk/Source/WebKit/blackberry/ChangeLog (134794 => 134795)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-11-15 18:33:31 UTC (rev 134794)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-11-15 18:40:35 UTC (rev 134795)
@@ -1,3 +1,20 @@
+2012-11-15 Mike Fenton <mifen...@rim.com>
+
+ [BlackBerry] Don't restore zoom and scroll when leaving an input field.
+ https://bugs.webkit.org/show_bug.cgi?id=102376
+
+ Reviewed by Yong Li.
+
+ Restoring the zoom causes undesirable behavior when switching between fields.
+
+ Reviewed Internally by Andrew Lo.
+
+ * WebKitSupport/InputHandler.cpp:
+ (BlackBerry::WebKit::InputHandler::InputHandler):
+ (BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+ * WebKitSupport/InputHandler.h:
+ (InputHandler):
+
2012-11-15 Jakob Petsovits <jpetsov...@rim.com>
[BlackBerry] Fix suspend/resume assertion in setCompositor().
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (134794 => 134795)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-11-15 18:33:31 UTC (rev 134794)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-11-15 18:40:35 UTC (rev 134795)
@@ -139,7 +139,6 @@
, m_delayKeyboardVisibilityChange(false)
, m_request(0)
, m_processingTransactionId(-1)
- , m_focusZoomScale(0.0)
, m_receivedBackspaceKeyDown(false)
, m_expectedKeyUpChar(0)
{
@@ -1116,17 +1115,6 @@
break;
}
case VisibleSelection::NoSelection:
- if (m_focusZoomScale) {
- m_webPage->zoomAboutPoint(m_focusZoomScale, selectionFocusRect.location());
- InputLog(LogLevelInfo, "InputHandler::ensureFocusTextElementVisible resetting zoom to %f", m_focusZoomScale);
- m_focusZoomScale = 0.0;
- }
-
- if (m_focusScrollLocation != WebCore::IntPoint(-1, -1)) {
- mainFrameView->setScrollPosition(m_focusScrollLocation);
- InputLog(LogLevelInfo, "InputHandler::ensureFocusTextElementVisible resetting scroll to %d, %d", m_focusScrollLocation.x(), m_focusScrollLocation.y());
- m_focusScrollLocation = WebCore::IntPoint(-1, -1);
- }
return;
}
@@ -1134,17 +1122,11 @@
m_webPage->suspendBackingStore();
- WebCore::IntPoint sourceScrollPosition = mainFrameView->scrollPosition();
-
// If the text is too small, zoom in to make it a minimum size.
// 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 (m_webPage->isUserScalable() && fontHeight && fontHeight * m_webPage->currentScale() < s_minimumTextHeightInPixels && !isRunningDrt()) {
- if (!m_focusZoomScale) {
- m_focusZoomScale = m_webPage->currentScale();
- m_focusScrollLocation = sourceScrollPosition;
- }
double zoomScaleRequired = static_cast<double>(s_minimumTextHeightInPixels) / fontHeight;
m_webPage->zoomAboutPoint(zoomScaleRequired, selectionFocusRect.location());
InputLog(LogLevelInfo, "InputHandler::ensureFocusTextElementVisible zooming in to %f at point %d, %d", zoomScaleRequired, selectionFocusRect.location().x(), selectionFocusRect.location().y());
@@ -1216,8 +1198,6 @@
WebCore::IntPoint maximumScrollPosition = WebCore::IntPoint(mainFrameView->contentsWidth() - actualScreenRect.width(), mainFrameView->contentsHeight() - actualScreenRect.height());
scrollLocation = scrollLocation.shrunkTo(maximumScrollPosition);
if (scrollLocation != mainFrameView->scrollPosition()) {
- if (m_focusScrollLocation == WebCore::IntPoint(-1, -1))
- m_focusScrollLocation = sourceScrollPosition;
mainFrameView->setScrollPosition(scrollLocation);
mainFrameView->setConstrainsScrollingToContentEdge(true);
InputLog(LogLevelInfo, "InputHandler::ensureFocusTextElementVisible scrolling to point %d, %d", scrollLocation.x(), scrollLocation.y());
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h (134794 => 134795)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h 2012-11-15 18:33:31 UTC (rev 134794)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h 2012-11-15 18:40:35 UTC (rev 134795)
@@ -224,9 +224,6 @@
RefPtr<WebCore::TextCheckingRequest> m_request;
int32_t m_processingTransactionId;
- double m_focusZoomScale;
- WebCore::IntPoint m_focusScrollLocation;
-
bool m_receivedBackspaceKeyDown;
unsigned short m_expectedKeyUpChar;
};
