Changeset 20911 for S60/trunk/WebKit

Timestamp:

04/16/07 13:29:20 (21 months ago)

Author:

spadma

Message:

2007-04-16 hongzhao <set EMAIL_ADDRESS environment variable>

Reviewed by Sachin.
DESC: [S60] Browser crashes if original page is closed and user downloads something after closing in 3.1m.
Fix: Make CBrCtlDownloadObserver a singleton class to support multiple windows download.
http://bugs.webkit.org/show_bug.cgi?id=13296

• BrowserControl/inc/BrCtl.h:
• BrowserControl/src/BrCtl.cpp: (CBrCtl::ConstructL): (CBrCtl::~CBrCtl): (CBrCtl::SendCommandsToClient): (CBrCtl::BrCtlDownloadObserver):
• BrowserView/inc/WebKitControl.h:
• BrowserView/src/WebKitControl.cpp: (CStaticObjectContainer::~CStaticObjectContainer): (CStaticObjectContainer::DownloadObserver): (CStaticObjectContainer::InitializeFactoryObjectsL):

Location:

S60/trunk/WebKit

Files:

• BrowserControl/inc/BrCtl.h (modified) (1 diff)
• BrowserControl/src/BrCtl.cpp (modified) (3 diffs)
• BrowserView/inc/WebKitControl.h (modified) (3 diffs)
• BrowserView/src/WebKitControl.cpp (modified) (4 diffs)

S60/trunk/WebKit/BrowserControl/inc/BrCtl.h

@@ -244 +244 @@
         * @since 3.0
         */
-        MBrCtlDownloadObserver* BrCtlDownloadObserver() {return iBrCtlDownloadObserver;}
+        MBrCtlDownloadObserver* BrCtlDownloadObserver();
 
         /**

S60/trunk/WebKit/BrowserControl/src/BrCtl.cpp

@@ -361 +361 @@
     if( !iBrCtlDownloadObserver )
         {
-        iBrCtlDownloadObserver = new(ELeave) CBrCtlDownloadObserver;
         iOwnDownloadObserver = ETrue;
         }
@@ -441 +440 @@
         }
 
-    if (iOwnDownloadObserver)
-        {
-        delete (CBrCtlDownloadObserver*)iBrCtlDownloadObserver;
-        }
 
     // Delete our capabilites
@@ -2547 +2542 @@
     return WebKitControl()->WebKitView().FocusedImageLC();
     }
+// -----------------------------------------------------------------------------
+// CBrCtl::BrCtlDownloadObserver
+//
+// -----------------------------------------------------------------------------
+//
+MBrCtlDownloadObserver* CBrCtl::BrCtlDownloadObserver() 
+{
+    if (iOwnDownloadObserver) 
+        {
+        return &CStaticObjectContainer::Instance().DownloadObserver();  
+        }
+    else
+        return iBrCtlDownloadObserver;
+}
 
 //  End of File

S60/trunk/WebKit/BrowserView/inc/WebKitControl.h

@@ -82 +82 @@
 class TCertInfo;
 class CWebKitSurface;
+class CBrCtlDownloadObserver;
 class CWebKitCursor;
 class CWebKitBridge;
@@ -124 +125 @@
         */
         CWebKitSurface& SurfaceL(TDisplayMode aMode = EColor16MU);
+        /**
+        * Returns the download observer
+        */
+        CBrCtlDownloadObserver& DownloadObserver();
 
         /**Returns the cursor
@@ -209 +214 @@
         CWebKitSurface*     iWebKitSurface;
         //
+        CBrCtlDownloadObserver* iDownloadObserver;
         CWebKitCursor*          iWebKitCursor;
         //

S60/trunk/WebKit/BrowserView/src/WebKitControl.cpp

@@ -77 +77 @@
 #include "ImageRendererFactory.h"
 #include "WebKitSurface.h"
+#include "BrCtlDownloadObserverImpl.h"
 #include "CookieHandler.h"
 #include "Favicon.h"
@@ -360 +361 @@
     delete iStaticImageDecoder;
     delete iOOMNotifier;
+    delete iDownloadObserver;
     // important for reentry
     iInstance = 0;
@@ -519 +521 @@
 
 //-------------------------------------------------------------------------------
+// CStaticObjectContainer::DownloadObserver
+// shared BrCtl DownloadObserver.
+//
+//-------------------------------------------------------------------------------
+CBrCtlDownloadObserver& CStaticObjectContainer::DownloadObserver()
+    {
+    if( !iDownloadObserver )
+        {
+        // init 
+        iDownloadObserver = new (ELeave) CBrCtlDownloadObserver;
+        }
+    return *iDownloadObserver;
+    }
+//-------------------------------------------------------------------------------
 // CStaticObjectContainer::CursorL
 // shared offscreen surface
@@ -570 +586 @@
     //
     LoaderContainerL( aBrCtl );
+    DownloadObserver();    
     // save pages capability
     iImgRendererFactory->SetSaveImageData( iLoaderContainer->Capabilities() & TBrCtlDefs::ECapabilitySavedPage );