--- a/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp	Tue Feb 02 00:56:45 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp	Fri Mar 19 09:52:28 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 // INCLUDE FILES
-#include <browser_platform_variant.hrh>
+#include <Browser_platform_variant.hrh>
 #include <../bidi.h>
 #include <avkon.hrh>
 #include <apmrec.h>
@@ -32,9 +32,9 @@
 #endif
 #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"
@@ -68,7 +68,7 @@
 #include "WebCursor.h"
 #include "WebUtil.h"
 #include "WebCharsetData.h"
-#include "httpcachemanager.h"
+#include "HttpCacheManager.h"
 #include "ResourceLoaderDelegate.h"
 #include "EventHandler.h"
 #include "timer.h"
@@ -86,7 +86,7 @@
 #include "HttpUiCallbacks.h"
 #include "PluginWin.h"
 #include <BrowserVersion.h>
-#include <cuseragent.h>
+#include <CUserAgent.h>
 
 #ifndef BRDO_WML_DISABLED_FF
 #include "wmlinterface.h"
@@ -414,7 +414,6 @@
    , m_commandIdBase(aCommandIdBase)
    , m_capabilities(aBrCtlCapabilities)
    , m_suspendTimers(false)
-   , m_pageLoadFinished(false)
    , m_wmlEngineInterface(NULL)
    , m_brCtlDownloadObserver(aBrCtlDownloadObserver)
    , m_windoCloseTimer(NULL)
@@ -496,9 +495,6 @@
         }
     
     LoadResourceFileL();
-
-    MemoryManager::InitOOMDialog();
-    
     // Set the rect for BrowserControl (a CCoeControl).
     SetRect(aRect);
     CCoeEnv::Static()->DisableExitChecks(true);
@@ -587,7 +583,6 @@
 
     switch (aLoadEvent) {
         case TBrCtlDefs::EEventNewContentStart:
-            m_pageLoadFinished = false;
             if (m_webView->pageScalerEnabled())
                 m_webView->pageScaler()->DocumentStarted();
             if (m_webView->formFillPopup() && m_webView->formFillPopup()->IsVisible()) 
@@ -595,10 +590,9 @@
             break;
         case TBrCtlDefs::EEventContentFinished:
         case TBrCtlDefs::EEventUploadFinished:
-            m_pageLoadFinished = true;
             if (m_suspendTimers) {
                 m_suspendTimers = false;
-                setDeferringTimers(true);
+                HandleCommandL(TBrCtlDefs::ECommandAppBackground);
             }
 #ifndef BRDO_WML_DISABLED_FF
             if (m_wmlUnloadPending)
@@ -776,20 +770,10 @@
         case TBrCtlDefs::ECommandAppBackground:
             {
 #ifndef PERF_REGRESSION_LOG
-                if(m_webView->widgetExtension())
-                    {
-                    if(m_pageLoadFinished)
-                        setDeferringTimers(true);
-                    else 
-                        m_suspendTimers = true;
-                    }
-                else
-                    {
-                    if (m_webView->isLoading())
-                        m_suspendTimers = true;
-                    else if (!isDeferringTimers())
-                        setDeferringTimers(true);
-                    }
+                if (m_webView->isLoading())
+                    m_suspendTimers = true;
+                else if (!isDeferringTimers())
+                    setDeferringTimers(true);
 #endif
 
                 //Disable the zooming bar when it goes to background
@@ -2467,3 +2451,9 @@
 
 
 
+void CBrCtl::HandlePointerBufferReadyL()
+{
+    m_webView->HandlePointerBufferReadyL();
+}
+
+