--- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebFrameLoaderClient.cpp	Tue Aug 31 16:17:46 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebFrameLoaderClient.cpp	Wed Sep 01 12:28:30 2010 +0100
@@ -15,7 +15,7 @@
 *
 */
 
-#include <Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 #include "config.h"
 #include <../bidi.h>
 #include "WebFrameLoaderClient.h"
@@ -25,7 +25,7 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "HTMLFrameOwnerElement.h"
-#include "HTMLNames.h"
+#include "HtmlNames.h"
 #include "HTMLFrameElement.h"
 #include "WebCoreFrameBridge.h"
 #include "HTMLFormElement.h"
@@ -38,16 +38,16 @@
 #include "WebFrameView.h"
 #include "WebFrameBridge.h"
 #include "WebDocumentLoader.h"
-#include "BrCtl.h"
-#include "Page.h"
+#include "brctl.h"
+#include "page.h"
 #include "ProgressTracker.h"
 #include "WebPolicyManager.h"
 #include "StaticObjectsContainer.h"
 #include "ResourceLoaderDelegate.h"
-#include "BrCtlWindowObserver.h"
+#include <brctlwindowobserver.h>
 #include "WmlDispatcher.h"
 #include "WebUtil.h"
-#include "ErrorDefs.h"
+#include "errordefs.h"
 #include "WebFepTextEditor.h"
 #include "SettingsContainer.h"
 #include "WebTabbedNavigation.h"
@@ -56,7 +56,7 @@
 #include "WebCharsetData.h"
 #include "WebKitLogger.h"
 #include "PluginHandler.h"
-#include "MimeTypeRegistry.h"
+#include "MIMETypeRegistry.h"
 #include "WidgetExtension.h"
 
 using namespace WebCore;
@@ -115,14 +115,13 @@
     //NSView <WebDocumentView> *documentView = [v _makeDocumentViewForDataSource:ds];
     //if (!documentView)
     //    return;
-
-    if (m_webFrame && 
-        m_webFrame->frameView() && 
-        m_webFrame->frameView()->topView()&&
-        !m_webFrame->parentFrame()) {
-
-        m_webFrame->frameView()->topView()->setEditable(false);
-    }
+    if(m_webFrame) {
+        if (m_webFrame->frameView() && 
+            m_webFrame->frameView()->topView()&&
+           !m_webFrame->parentFrame()) {
+            m_webFrame->frameView()->topView()->setEditable(false);
+        }
+        
     WebFrameBridge *bridge = m_webFrame->bridge();
 
     // FIXME: We could save work and not do this for a top-level view that is not a WebHTMLView.
@@ -130,6 +129,7 @@
     bridge->createFrameViewWithScrollView(v, v->marginWidth(), v->marginHeight());
     //m_webFrame.get() _updateBackground];
     bridge->installInFrame(v);
+    }
 
     // Call setDataSource on the document view after it has been placed in the view hierarchy.
     // This what we for the top-level view, so should do this for views in subframes as well.
@@ -147,7 +147,9 @@
                 brctl(m_webFrame)->setWmlDispatcher(m_WmlContentListener);
                 }
         }
-        TRAPD(err,m_WmlContentListener->HeadersL( 0, m_response ));
+        if ( m_WmlContentListener ) {
+          TRAPD(err,m_WmlContentListener->HeadersL( 0, m_response ));
+        }
     }
     else{
         if (m_WmlContentListener) {
@@ -161,6 +163,7 @@
             core(m_webFrame)->loader()->isLoadingMainFrame() &&
             FrameLoadTypeStandard == core(m_webFrame)->loader()->loadType()){
             m_webFrame->frameView()->topView()->resetZoomLevel();
+            m_webFrame->frameView()->topView()->resetJsTimers();
         }
 
         if (!core(m_webFrame)->ownerElement()) {
@@ -931,9 +934,10 @@
 void WebFrameLoaderClient::committedLoad(DocumentLoader* loader, const char* data, int length) 
 { 
     if (brctl(m_webFrame)->wmlMode()) {
-        TRAP_IGNORE(
-        m_WmlContentListener->ResponseL( data, length );
-        );
+    if(m_WmlContentListener)
+    	TRAP_IGNORE(
+         m_WmlContentListener->ResponseL( data, length );
+         );
         return;
     }
     m_webFrame->bridge()->receivedData(data, length, m_response.textEncodingName());
@@ -1142,9 +1146,9 @@
 void WebFrameLoaderClient::frameLoadCompleted()
 {
     if (brctl(m_webFrame)->wmlMode()) {
+    if (m_WmlContentListener)
         TRAP_IGNORE(
-		if (m_WmlContentListener)
-        	m_WmlContentListener->CompleteL( 0, 0 );
+         m_WmlContentListener->CompleteL( 0, 0 );
         );
         return;
     }