diff -r c711bdda59f4 -r ac77f89b1d9e webengine/osswebengine/WebKit/s60/webview/WebFrameView.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebFrameView.cpp Wed Mar 31 23:16:40 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebFrameView.cpp Wed Apr 14 17:06:56 2010 +0300 @@ -72,6 +72,10 @@ void WebFrameView::draw(WebCoreGraphicsContext& gc, const TRect& r) { + if (m_topView->isPinchZoom()) { + return; + } + TRect vr(visibleRect()); TRect rect(r); if (isScaled() || m_frame->isFrameSet()) @@ -121,33 +125,31 @@ frameClip.Move(-cpos); gc.setClippingRect( frameClip ); } - - if (!m_topView->pinchZoomHandler()->isPinchActive()) { - - // draw frame border - CFbsBitGc& realgc = gc.gc(); - if (m_hasBorder && !m_frame->isFrameSet()) { - // already moved the origin - TRect borderRect(TPoint(-1,-1),toViewCoords(m_frameRect).Size()); - borderRect.iBr += TPoint(2,2); - realgc.SetPenColor(TRgb(0x55,0x55,0x55)); - realgc.SetPenStyle(CGraphicsContext::ESolidPen); - realgc.SetBrushStyle(CGraphicsContext::ENullBrush); - realgc.SetPenSize(TSize(1,1)); - realgc.DrawRect(borderRect); - // double border in bottom/right - borderRect.iBr += TPoint(1,1); - realgc.DrawRect(borderRect); - } + + // draw frame border + CFbsBitGc& realgc = gc.gc(); + if (m_hasBorder && !m_frame->isFrameSet()) { + // already moved the origin + TRect borderRect(TPoint(-1,-1),toViewCoords(m_frameRect).Size()); + borderRect.iBr += TPoint(2,2); + realgc.SetPenColor(TRgb(0x55,0x55,0x55)); + realgc.SetPenStyle(CGraphicsContext::ESolidPen); + realgc.SetBrushStyle(CGraphicsContext::ENullBrush); + realgc.SetPenSize(TSize(1,1)); + realgc.DrawRect(borderRect); + // double border in bottom/right + borderRect.iBr += TPoint(1,1); + realgc.DrawRect(borderRect); + } - // draw scrollbars - rect.Move( -m_contentPos ); - WebCore::GraphicsContext ctx(&gc); - if (m_vScrollbar->isEnabled()) - m_vScrollbar->paint(&ctx, rect); - if (m_hScrollbar->isEnabled()) - m_hScrollbar->paint(&ctx, rect); - } + // draw scrollbars + rect.Move( -m_contentPos ); + WebCore::GraphicsContext ctx(&gc); + if (m_vScrollbar->isEnabled()) + m_vScrollbar->paint(&ctx, rect); + if (m_hScrollbar->isEnabled()) + m_hScrollbar->paint(&ctx, rect); + gc.cancelClipping(); gc.restore(saved); }