--- a/webengine/osswebengine/WebCore/loader/DocumentLoader.cpp	Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/osswebengine/WebCore/loader/DocumentLoader.cpp	Tue Aug 31 16:17:46 2010 +0300
@@ -248,8 +248,7 @@
     if (!frameLoader())
         return;
     setMainDocumentError(error);
-    //During LWS for invalid webpage framloader was returning Null which is causing Dataabort panic 
-    if (isComplete && frameLoader())
+    if (isComplete)
         frameLoader()->mainReceivedCompleteError(this, error);
 }
 
@@ -358,7 +357,7 @@
     if (FrameLoader* frameLoader = DocumentLoader::frameLoader())
 #if PLATFORM(SYMBIAN)
     {
-    unsigned int needMemory = length * 4;
+    unsigned int needMemory = length * 16;
     if(needMemory >= 1024*1024) {
         OOM_PRE_CHECK(needMemory, 0, "DocumentLoader::commitLoad");
 #endif    
@@ -419,8 +418,7 @@
 void DocumentLoader::updateLoading()
 {
     ASSERT(this == frameLoader()->activeDocumentLoader());
-    if(m_frame)
-        setLoading(frameLoader()->isLoading());
+    setLoading(frameLoader()->isLoading());
 }
 
 void DocumentLoader::setFrame(Frame* frame)
@@ -713,7 +711,6 @@
 bool DocumentLoader::startLoadingMainResource(unsigned long identifier)
 {
     ASSERT(!m_mainResourceLoader);
-    MemoryManager::ResetOOMDialogDisplayed();
     m_mainResourceLoader = MainResourceLoader::create(m_frame);
     m_mainResourceLoader->setIdentifier(identifier);