FCL/sf/mw/web: comparison webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp

equal deleted inserted replaced

-:e1bea15f9a39
+:79859ed3eea9
 * Description:   Implementation of the Browser Control
 *
 */
 // INCLUDE FILES
-#include <browser_platform_variant.hrh>
+#include <Browser_platform_variant.hrh>
 #include <../bidi.h>
 #include <avkon.hrh>
 #include <apmrec.h>
 #include <apgcli.h>
 #include <badesca.h>
 #if defined(__BROWSER_SDK)
 #include <webkit_sdk.rsg>
 #else
 #include <Webkit.rsg>
 #endif
-#include <GULICON.h>
+#include <gulicon.h>
 #include <e32uid.h>
-#include <browserdialogsprovider.h>
+#include <BrowserDialogsProvider.h>
 //tot:fixme
-//#include "oom.h"
+//#include <oom.h>
 #include "config.h"
 #include "BrCtl.h"
 #include "WebView.h"
 #include "WebFrame.h"
 #include "WebFrameView.h"
 #include "WebDataLoadConsumer.h"
 #include "WebFormFillPopup.h"
 #include "WebPageFullScreenHandler.h"
-#include "PageScaler.h"
+#include "pagescaler.h"
-#include "ThumbnailGenerator.h"
 #include "HistoryController.h"
 #include "HistoryEntry.h"
 #include "HistoryInterface.h"
 #include "HistoryView.h"
 #include "FormData.h"
 #include "WebUtil.h"
 #include "WebCharsetData.h"
 #include "httpcachemanager.h"
 #include "ResourceLoaderDelegate.h"
 #include "EventHandler.h"
-#include "timer.h"
+#include "Timer.h"
-#include "page.h"
+#include "Page.h"
-#include "range.h"
+#include "Range.h"
-#include "focusController.h"
+#include "FocusController.h"
 #include "IconDatabase.h"
-#include "httpDownload.h"
+#include "HttpDownload.h"
 #include "BrCtlSoftkeysObserverImpl.h"
 #include "BrCtlSpecialLoadObserverImpl.h"
-#include "WebFrameBridge.h"
 #include "BrCtlLayoutObserverImpl.h"
 #include "BrCtlWindowObserverImpl.h"
 #include "WidgetExtension.h"
 #include "PluginSkin.h"
 #include "HttpUiCallbacks.h"
 #include "PluginWin.h"
-#include "GCController.h"
+#include <CUserAgent.h>
-#include <BrowserVersion.h>
-#include <cuseragent.h>
-#include "kjs_window.h"
 #ifndef BRDO_WML_DISABLED_FF
-#include "wmlinterface.h"
+#include "WmlInterface.h"
 #include "WmlInterfaceImpl.h"
 #include "WmlEngineInterface.h"
 #endif
 #include "WmlDispatcher.h"
 , m_brCtlSoftkeysObserver(aBrCtlSoftkeysObserver)
 , m_brCtlLayoutObserver(aBrCtlLayoutObserver)
 , m_commandIdBase(aCommandIdBase)
 , m_capabilities(aBrCtlCapabilities)
 , m_suspendTimers(false)
-, m_pageLoadFinished(false)
 , m_wmlEngineInterface(NULL)
 , m_brCtlDownloadObserver(aBrCtlDownloadObserver)
 , m_windoCloseTimer(NULL)
-, m_didFirstLayout(false)
-, m_NotifyPluginFocusChangeEvent(false)
 {
 m_documentHeight = 0;
 m_displayHeight = 0;
 m_displayPosY = 0;
 m_documentWidth = 0;
 }
 // Create and initialize the Layout Observer
 if (m_brCtlLayoutObserver == NULL)
 {
-m_brCtlLayoutObserver = new (ELeave) CBrCtlLayoutObserver(m_webView);
+m_brCtlLayoutObserver = new (ELeave) CBrCtlLayoutObserver();
 m_ownsLayoutObserver = true;
 }
 // Create and initialize the Dialog Provider
 if (m_brCtlDialogsProvider == NULL)
 {
 m_brCtlWindowObserver = new (ELeave) CBrCtlWindowObserver();
 m_ownsWindowObserver = true;
 }
 LoadResourceFileL();
-MemoryManager::InitOOMDialog();
 // Set the rect for BrowserControl (a CCoeControl).
 SetRect(aRect);
 CCoeEnv::Static()->DisableExitChecks(true);
+Window().AllocPointerMoveBuffer(256, 0);
+Window().DisablePointerMoveBuffer();
 Window().PointerFilter(EPointerFilterMove | EPointerFilterDrag | EPointerFilterEnterExit, 0);
 ActivateL();
 }
 // -----------------------------------------------------------------------------
 for (int i = 0; i < iLoadEventObserversArray.Count(); i++)
 iLoadEventObserversArray[i]->HandleBrowserLoadEventL(aLoadEvent, aSize, aTransactionId);
 switch (aLoadEvent) {
 case TBrCtlDefs::EEventNewContentStart:
-m_pageLoadFinished = false;
 if (m_webView->pageScalerEnabled())
 m_webView->pageScaler()->DocumentStarted();
 if (m_webView->formFillPopup() && m_webView->formFillPopup()->IsVisible())
 m_webView->formFillPopup()->handleCommandL(TBrCtlDefs::ECommandCancel);
 break;
-case TBrCtlDefs::EEventNewContentDisplayed:
-if(m_brCtlLayoutObserver && m_webView && !m_didFirstLayout)  {
-m_brCtlLayoutObserver->NotifyLayoutChange( (webView()->mainFrame()->bridge()->m_rtl ? EOriginTopRight : EOriginTopLeft));
-m_didFirstLayout = true;
-}
-break;
 case TBrCtlDefs::EEventContentFinished:
 case TBrCtlDefs::EEventUploadFinished:
-m_pageLoadFinished = true;
-m_didFirstLayout= false;
 if (m_suspendTimers) {
 m_suspendTimers = false;
-m_webView->pauseJsTimers();
+HandleCommandL(TBrCtlDefs::ECommandAppBackground);
 }
 #ifndef BRDO_WML_DISABLED_FF
 if (m_wmlUnloadPending)
 {
 UnloadDllWmlEngine();
 else if (FocusedElementType() == TBrCtlDefs::EElementActivatedObjectBox) {
 Frame* coreFrame = m_webView->page()->focusController()->focusedOrMainFrame();
 if (coreFrame)
 coreFrame->eventHandler()->deactivatedEvent();
 }
-m_webView->setEditable(EFalse);
 break;
 }
 case TBrCtlDefs::ECommandCancelFetch:
 {
-m_webView->Stop();
+m_webView->mainFrame()->stopLoading();
-break;
-}
-case TBrCtlDefs::ECommandOOMExit:
-{
-WebCore::gcController().startedExit(true);
-KJS::setDeferringJSTimers(true);
 break;
 }
 case TBrCtlDefs::ECommandShowThumbnailView:
 {
 }
 case TBrCtlDefs::ECommandOpen:
 {
 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
 TKeyEvent keyEvent;
 keyEvent.iCode = EKeyDevice3;
 #ifndef PERF_REGRESSION_LOG
 if (isDeferringTimers())
 setDeferringTimers(false);
 m_suspendTimers = false;
 #endif
-m_webView->resumeJsTimers();
 break;
 }
 case TBrCtlDefs::ECommandAppBackground:
 {
 #ifndef PERF_REGRESSION_LOG
-if(m_webView->widgetExtension())
+if (m_webView->isLoading())
-{
+m_suspendTimers = true;
-if(m_pageLoadFinished)
+else if (!isDeferringTimers())
-m_webView->pauseJsTimers();
+setDeferringTimers(true);
-else
-m_suspendTimers = true;
-}
-else
-{
-if (m_webView->isLoading())
-m_suspendTimers = true;
-else
-m_webView->pauseJsTimers();
-}
 #endif
 //Disable the zooming bar when it goes to background
 m_webView->hideZoomSliderL();
-m_webView->scrollStatus(false);
-// Instruct JS to garbage collect
-WebCore::gcController().garbageCollectSoon();
 break;
 }
 case TBrCtlDefs::ECommandClearAutoFormFillData:
 {
 StaticObjectsContainer::instance()->formFillController()->clearFormData();
 break;
 }
 case TBrCtlDefs::ECommandEnterFullscreenBrowsing:
 {
-m_webView->resumeJsTimers();
 m_webView->EnterFullscreenBrowsingL();
 break;
 }
 case TBrCtlDefs::ECommandLeaveFullscreenBrowsing:
 {
 m_webView->LeaveFullscreenBrowsingL();
 break;
 }
-case TBrCtlDefs::ECommandSetRetryConnectivityFlag:
-{
-StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->setRetryConnectivityFlag();
-break;
-}
-case TBrCtlDefs::ECommandUnSetRetryConnectivityFlag:
-{
-StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->unSetRetryConnectivityFlag();
-break;
-}
-case TBrCtlDefs::ECommandRetryTransactions:
-{
-StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->retryTransactions();
-m_webView->mainFrame()->reCreatePlugins();
-break;
-}
-case TBrCtlDefs::ECommandClearQuedTransactions:
-{
-StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->handleError(KErrCancel);
-break;
-}
-case TBrCtlDefs::ECommandConnToDownloadManager:
-{
-TInt connectionPtr = 0;
-TInt sockSvrHandle = 0;
-TBool newConn = ETrue;
-TApBearerType bearerType;
-TInt error = KErrNone;
-TRAP(error, m_brCtlSpecialLoadObserver->NetworkConnectionNeededL(&connectionPtr, &sockSvrHandle, &newConn, &bearerType));
-if( error == KErrNone && connectionPtr )
-{
-RConnection* connPtr = REINTERPRET_CAST( RConnection*, connectionPtr );
-TName name;
-connPtr->Name( name );
-StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->httpDownload()->connect(name);
-}
-break;
-}
-case TBrCtlDefs::ECommandLoseFocus:
-case TBrCtlDefs::ECommandPauseScriptTimers:
-{
-m_webView->pauseJsTimers();
-break;
-}
-case TBrCtlDefs::ECommandGainFocus:
-case TBrCtlDefs::ECommandResumeScriptTimers:
-{
-m_webView->resumeJsTimers();
-break;
-}
-case TBrCtlDefs::ECommandCancelQueuedTransactions:
-{
-StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->cancelQueuedTransactions();
-		   break;
-}
-	   // Messages sent by OOM monitor
-case TBrCtlDefs::ECommandFreeMemory:
-{
-MemoryManager::FreeRam(); // invoke memory collect operation
-break;
-}
-case TBrCtlDefs::ECommandMemoryGood:
-{
-MemoryManager::RestoreCollectors(); // restore collectors
-break;
-}
-case TBrCtlDefs::ECommandNotifyPluginFocusChangeEvent:
-{
-m_NotifyPluginFocusChangeEvent = true;
-break;
-}
 default:
 {
 if ( m_wmlEngineInterface &&
 (TUint)aCommand >= m_commandIdBase + TBrCtlDefs::ECommandIdWMLBase &&
 (TUint)aCommand <= m_commandIdBase + TBrCtlDefs::ECommandIdRange )
 }
 }
 }
 }
-EXPORT_C TBool CBrCtl::IsSynchRequestPending()
-{
-return m_webView->isSynchRequestPending();
-}
 // -----------------------------------------------------------------------------
 // CBrCtl::HandleDownloadCommandL
 // This method calls to download manager in order to send commands to the DlMgr
 // -----------------------------------------------------------------------------
 //
 m_webView->widgetExtension()->AddOptionMenuItemsL( aMenuPane, aResourceId );
 return;
 }
 int after = aAfter == -1 ? aAfter :0;
-TBrCtlDefs::TBrCtlElementType focusedElementType = TBrCtlDefs::EElementNone;
+TBrCtlDefs::TBrCtlElementType focusedElementType = FocusedElementType();
-if(m_webView)
-focusedElementType = FocusedElementType();
 int count = sizeof(commandsArray) / sizeof(TCommandsArray);
 bool found = false;
 int i;
 for (i = count - 1; i >= 0; i--) {
 // Give the plugin a chance to add its option menu items, send the Command Id
 // Base we're using for the plug-ins
 // tot fixme
 //TPluginControl pluginControl(*iWebKitControl);
 //pluginControl.AddPluginOptionMenuItemsL(aMenuPane, TBrCtlDefs::ECommandIdPluginBase, aAfter);
-if(m_webView) {
+PluginSkin* plugin = m_webView->mainFrame()->focusedPlugin();
-PluginSkin* plugin = m_webView->mainFrame()->focusedPlugin();
+if(plugin && plugin->pluginWin())
-if(plugin && plugin->pluginWin())
+plugin->pluginWin()->addPluginOptionsL(aMenuPane, TBrCtlDefs::ECommandIdPluginBase, aAfter );
-plugin->pluginWin()->addPluginOptionsL(aMenuPane, TBrCtlDefs::ECommandIdPluginBase, aAfter );
-}
 }
 // -----------------------------------------------------------------------------
 // CBrCtl::ClearCache
 HBufC* versionInfo = HBufC::NewLC( versionPtr.Length() );
 versionInfo->Des().Copy(versionPtr);
 return versionInfo;
 }
-case TBrCtlDefs::EVersionInfoBuild:
+/*case TBrCtlDefs::EVersionInfoBuild:
 {
 return MobileBrowserBuild.AllocLC();
-}
+}*/
 case TBrCtlDefs::EBrowserVersion:
 {
 TPtr nameAndVersionPtr = m_usrAgnt->BrowserNameAndVersionL()->Des();
 HBufC* nameAndVersionInfo = HBufC::NewLC( nameAndVersionPtr.Length() );
 // Check that we got a valid url
 if (url.Ptr() == NULL || url.Length() == 0)
 User::Leave(KErrArgument);
 // convert to 8
-// reset timers ptr, if paused from last page
-m_webView->resetJsTimers();
 _LIT(KJs, "javascript:");
 if (url.Length() > KJs().Length()) {
 if (url.Left(KJs().Length()).FindF(KJs) == 0) {
 core(m_webView->mainFrame())->loader()->executeScript(String(url.Mid(KJs().Length())), true);
 return;
 if(!visible){
 m_webView->mainFrame()->frameLoader()->stopRedirectionTimerNow();
 }
 else if(m_webView->mainFrame()->frameLoader()->checkScheduledRedirection())
 m_webView->mainFrame()->frameLoader()->startRedirectionTimerNow();
-if( m_NotifyPluginFocusChangeEvent ) {
-m_NotifyPluginFocusChangeEvent = false;
-webView()->mainFrame()->notifyPluginFocusChangeEvent(visible);
-}
 m_webView->MakeVisible(visible);
 }
 if( visible && !isvisible && m_webView ) {
 m_webView->checkForZoomChange();
 }
-if(m_webView && m_webView->pageFullScreenHandler() && m_webView->pageFullScreenHandler()->isFullScreenMode() ) {
+if( m_webView->pageFullScreenHandler() && m_webView->pageFullScreenHandler()->isFullScreenMode() ) {
 if (visible)
 m_webView->pageFullScreenHandler()->showEscBtnL();
 else
 m_webView->pageFullScreenHandler()->hideEscBtnL();
 }
 return m_webView->focusedImageLC();
 }
 EXPORT_C TBool CBrCtl::OkToExit()
 {
-HttpDownload* httpDownload = WebCore::StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->httpDownload();
+return WebCore::StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->httpDownload()->okToExit();
-if ( httpDownload )
-{
-return httpDownload->okToExit();
-}
-return ETrue;
 }
 EXPORT_C CGulIcon* CBrCtl::GetBitmapData(const TDesC& aUrl, TBrCtlDefs::TBrCtlBitmapInfo aBitmapInfo)
 {
 CGulIcon* icon = NULL;
 {
 HistoryEntry* entry = m_historyHandler->historyController()->entry(EHistoryStackDirectionCurrent);
 if ( entry ) {
 CFbsBitmap* bitmap = entry->thumbnail();
 if(!bitmap) {
-if(m_webView->pageThumbnailGenerator()) {
+// get scaled page from PageScaler;
-//get the page thumbnail
+bitmap = m_webView->pageScaler()->ScaledPage();
-bitmap = m_webView->pageThumbnailGenerator()->PageThumbnail();
-}
-else {
-// get scaled page from PageScaler;
-bitmap = m_webView->pageScaler()->ScaledPage();
-}
 }
 if(bitmap) {
 // update the history with new bitmap
 TRAP_IGNORE(m_historyHandler->historyController()->updateHistoryEntryThumbnailL(bitmap));
 TRAP_IGNORE(icon = CGulIcon::NewL(bitmap, NULL));
 if (!newBrctl)
 {
 if(StaticObjectsContainer::instance()->isPluginFullscreen())
 {
 PluginSkin* plugin=m_webView->mainFrame()->focusedPlugin();
-if(plugin)
 plugin->deActivate();
 }
 newBrctl = m_brCtlWindowObserver->OpenWindowL(emptyUrl, &windowName, userGesture, 0);
 }
 }
 void CBrCtl::doCloseWindowSoon()
 {
 m_windoCloseTimer->Cancel();
 if (brCtlWindowObserver())
-{
+TRAP_IGNORE(brCtlWindowObserver()->HandleWindowCommandL(KNullDesC(), ECloseWindow));
-TRAPD(err,brCtlWindowObserver()->HandleWindowCommandL(KNullDesC(), ECloseWindow));
-		if ( err == KLeaveExit )
-		    { // while we exit the browser it actually leaves with KLeaveExit from the system.
-		      // If we block this here then the exit would not happen so propogate the leave
-		      // condition to the system for handling
-		    User::Leave(KLeaveExit);
-		    }
-}
 }
 TBool CBrCtl::sendCommandsToClient(
 TBrCtlDefs::TBrCtlClientCommands aCommand,
 const CArrayFix<TPtrC>& aAttributesNames,
 for (TInt i=0; i<m_stateChangeObserverArray.Count(); i++) {
 m_stateChangeObserverArray[i]->StateChanged(TBrCtlDefs::EStateScriptLog, aMode);
 }
 }
-CWidgetExtension* CBrCtl::getWidgetExt()
-{
-if ( m_webView) {
-return m_webView->widgetExtension();
-}
-return NULL;
-}
 int CBrCtl::getMainScrollbarWidth() const
 {
 return 0;
 }
 return m_brCtlDownloadObserver;
 }
+void CBrCtl::HandlePointerBufferReadyL()
+{
+m_webView->HandlePointerBufferReadyL();
+}

branch	RCL_3
changeset 93	79859ed3eea9
parent 92	e1bea15f9a39
child 94	919f36ff910f