equal
deleted
inserted
replaced
232 // operates on the WebView object |
232 // operates on the WebView object |
233 delete m_pageZoomHandler; |
233 delete m_pageZoomHandler; |
234 m_pageZoomHandler = NULL; |
234 m_pageZoomHandler = NULL; |
235 |
235 |
236 m_zoomLevelArray.Close(); |
236 m_zoomLevelArray.Close(); |
|
237 m_visiblePlugins.Reset(); |
|
238 m_visiblePlugins.Close(); |
237 |
239 |
238 // prevent frameViews to access members when topView is |
240 // prevent frameViews to access members when topView is |
239 // closing down. |
241 // closing down. |
240 m_isClosing = true; |
242 m_isClosing = true; |
241 m_page->setGroupName(String()); |
243 m_page->setGroupName(String()); |
403 cache()->setCapacities(0, 0, defaultCacheCapacity); |
405 cache()->setCapacities(0, 0, defaultCacheCapacity); |
404 |
406 |
405 m_waiter = new(ELeave) CActiveSchedulerWait(); |
407 m_waiter = new(ELeave) CActiveSchedulerWait(); |
406 |
408 |
407 m_checkerBoardDestroyTimer = CPeriodic::NewL(CActive::EPriorityIdle); |
409 m_checkerBoardDestroyTimer = CPeriodic::NewL(CActive::EPriorityIdle); |
|
410 m_visiblePlugins.Reset(); |
408 |
411 |
409 } |
412 } |
410 |
413 |
411 void WebView::initializePageScalerL() |
414 void WebView::initializePageScalerL() |
412 { |
415 { |
648 if (m_pageScaler && m_pageScaler->FullScreenMode()) { |
651 if (m_pageScaler && m_pageScaler->FullScreenMode()) { |
649 ScaledPageChanged(m_pageScaler->Rect(), EFalse, EFalse); |
652 ScaledPageChanged(m_pageScaler->Rect(), EFalse, EFalse); |
650 return; |
653 return; |
651 } |
654 } |
652 |
655 |
653 if (!IsVisible()) { |
656 if (!IsVisible() || ( StaticObjectsContainer::instance()->webSurface()->topView() != this ) ) { |
654 return; |
657 return; |
655 } |
658 } |
656 |
659 |
657 if (StaticObjectsContainer::instance()->isPluginFullscreen()) return; |
660 if (StaticObjectsContainer::instance()->isPluginFullscreen()) return; |
658 CFbsBitGc& gc = m_webcorecontext->gc(); |
661 CFbsBitGc& gc = m_webcorecontext->gc(); |
1178 * For keypress event we need a char code and since we don't |
1181 * For keypress event we need a char code and since we don't |
1179 * have it at the time of EEventKeyDown we pospond it until EEventKey |
1182 * have it at the time of EEventKeyDown we pospond it until EEventKey |
1180 * and send it here. |
1183 * and send it here. |
1181 */ |
1184 */ |
1182 if (eventcode == EEventKeyDown){ |
1185 if (eventcode == EEventKeyDown){ |
1183 downEventConsumed = sendKeyEventToEngine(keyevent, EEventKeyDown, frame) || |
1186 downEventConsumed = sendKeyEventToEngine(keyevent, EEventKeyDown, frame); |
1184 ((m_focusedElementType == TBrCtlDefs::EElementActivatedInputBox && // style of input box |
1187 } |
1185 page()->chrome()->client()->elementVisibilityChanged())); |
|
1186 } |
|
1187 |
|
1188 /* |
1188 /* |
1189 * downEventConsumed will be true if JavaScript consumes key event |
1189 * downEventConsumed will be true if JavaScript consumes key event |
1190 * If we are not in the widget mode we want to deactivate input box |
1190 * If we are not in the widget mode we want to deactivate input box |
1191 * regardless of whether event was consumed by JavaScript or not. |
1191 * regardless of whether event was consumed by JavaScript or not. |
1192 * Othrerwise we have a risk to be trapped inside input box. |
1192 * Othrerwise we have a risk to be trapped inside input box. |
2122 |
2122 |
2123 bool WebView::isSmallPage() |
2123 bool WebView::isSmallPage() |
2124 { |
2124 { |
2125 TSize docSize = DocumentSize(); |
2125 TSize docSize = DocumentSize(); |
2126 TSize viewSize = DocumentViewport().Size(); |
2126 TSize viewSize = DocumentViewport().Size(); |
2127 return ((docSize.iWidth * docSize.iHeight*100)/(viewSize.iWidth*viewSize.iHeight) < KSmallPageScale); |
2127 return (docSize.iWidth/viewSize.iWidth) * (docSize.iHeight/viewSize.iHeight) * 100 < KSmallPageScale; |
2128 } |
2128 } |
2129 |
2129 |
2130 void WebView::willSubmitForm(FormState* formState) |
2130 void WebView::willSubmitForm(FormState* formState) |
2131 { |
2131 { |
2132 if (m_webFormFill) { |
2132 if (m_webFormFill) { |