diff -r ac77f89b1d9e -r 4917f9bf7995 webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp --- a/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp Wed Apr 14 17:06:56 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp Tue Apr 27 17:46:17 2010 +0300 @@ -80,6 +80,7 @@ #include "httpDownload.h" #include "BrCtlSoftkeysObserverImpl.h" #include "BrCtlSpecialLoadObserverImpl.h" +#include "WebFrameBridge.h" #include "BrCtlLayoutObserverImpl.h" #include "BrCtlWindowObserverImpl.h" #include "WidgetExtension.h" @@ -479,7 +480,7 @@ // Create and initialize the Layout Observer if (m_brCtlLayoutObserver == NULL) { - m_brCtlLayoutObserver = new (ELeave) CBrCtlLayoutObserver(); + m_brCtlLayoutObserver = new (ELeave) CBrCtlLayoutObserver(m_webView); m_ownsLayoutObserver = true; } // Create and initialize the Dialog Provider @@ -592,6 +593,10 @@ if (m_webView->formFillPopup() && m_webView->formFillPopup()->IsVisible()) m_webView->formFillPopup()->handleCommandL(TBrCtlDefs::ECommandCancel); break; + case TBrCtlDefs::EEventNewContentDisplayed: + if(m_brCtlLayoutObserver && m_webView) + m_brCtlLayoutObserver->NotifyLayoutChange( (webView()->mainFrame()->bridge()->m_rtl ? EOriginTopRight : EOriginTopLeft)); + break; case TBrCtlDefs::EEventContentFinished: case TBrCtlDefs::EEventUploadFinished: m_pageLoadFinished = true; @@ -961,7 +966,6 @@ break; } -#ifdef BRDO_OCC_ENABLED_FF case TBrCtlDefs::ECommandSetRetryConnectivityFlag: { StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->setRetryConnectivityFlag(); @@ -975,7 +979,7 @@ case TBrCtlDefs::ECommandRetryTransactions: { StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->retryTransactions(); - m_webView->reCreatePlugins(); + m_webView->mainFrame()->reCreatePlugins(); break; } case TBrCtlDefs::ECommandClearQuedTransactions: @@ -1001,8 +1005,7 @@ } break; } -#endif - + default: { if ( m_wmlEngineInterface && @@ -2527,3 +2530,4 @@ +