--- a/webengine/osswebengine/webkit/s60/webview/WebPagePinchZoomHandler.cpp Wed Mar 31 23:16:40 2010 +0300
+++ b/webengine/osswebengine/webkit/s60/webview/WebPagePinchZoomHandler.cpp Wed Apr 14 17:06:56 2010 +0300
@@ -63,6 +63,7 @@
, m_zoomStepSize(0)
, m_pinchActive(false)
, m_pinchCenter(0,0)
+, m_isPluginsVisible(true)
{
}
@@ -186,6 +187,10 @@
// -----------------------------------------------------------------------------
void WebPagePinchZoomHandler::setZoomLevel(int zoomLevel)
{
+ if (m_isPluginsVisible) {
+ m_webView->mainFrame()->makeVisiblePlugins(false);
+ m_isPluginsVisible = false;
+ }
m_webView->setPinchBitmapZoomLevel(zoomLevel);
}
@@ -207,6 +212,7 @@
// -----------------------------------------------------------------------------
void WebPagePinchZoomHandler::updateBitmap(void)
{
+ m_isPluginsVisible = true;
m_bitmapUpdateTimer->Cancel();
m_webView->restoreZoomLevel(m_webView->scalingFactor());
//update the plugin rect after pinch zoom exit