--- a/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp Fri Mar 12 15:48:51 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp Mon Mar 15 12:44:50 2010 +0200
@@ -699,6 +699,9 @@
{
if (m_webView->pageView()) {
m_webView->closePageView();
+ PluginSkin* plugin = m_webView->mainFrame()->focusedPlugin();
+ if(plugin)
+ plugin->setPluginWinClipedRect();
} else {
if (m_historyHandler->historyController()->historyView()) {
// this is a weird way of managing history view. needs fixing
@@ -2024,7 +2027,12 @@
EXPORT_C TBool CBrCtl::OkToExit()
{
- return WebCore::StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->httpDownload()->okToExit();
+ HttpDownload* httpDownload = WebCore::StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->httpDownload();
+ if ( httpDownload )
+ {
+ return httpDownload->okToExit();
+ }
+ return ETrue;
}
EXPORT_C CGulIcon* CBrCtl::GetBitmapData(const TDesC& aUrl, TBrCtlDefs::TBrCtlBitmapInfo aBitmapInfo)
@@ -2467,3 +2475,4 @@
+