Changeset 19405

Timestamp:

02/05/07 09:07:47 (2 years ago)

Author:

brmorris

Message:

bujtas <zbujtas@gmail.com>, reviewed by Yongjun.

DESC: browser is crashing if it is closed while a page is loading and closing and opening a new window crashes the browser as well TMCN-6XRQP2
fix:

1. change the order of destroying webkit objects.
2. cancel parsing when the document is being closed
3. flush static image decoder queue. remove images associated with the the view being destroyed
4. remove formfill dependency on webkitcontrol. formfill is static object while webkitcontrol is per window.
5. do not create formfill manager unless browser capabilities say so

http://bugs.webkit.org/show_bug.cgi?id=12542

Location:

S60/branches/3.1m

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bridge/WebCoreBridge.cpp (modified) (2 diffs)
• WebCore/bridge/WebCoreImageRendererFactory.h (modified) (2 diffs)
• WebCore/khtml/khtml_part.cpp (modified) (1 diff)
• WebCore/khtml/xml/dom_docimpl.cpp (modified) (1 diff)
• WebCore/khtml/xml/dom_docimpl.h (modified) (1 diff)
• WebKit/BrowserControl/src/BrCtl.cpp (modified) (3 diffs)
• WebKit/BrowserCore/Formcontrols/src/FControlInputSkin.cpp (modified) (3 diffs)
• WebKit/BrowserCore/Renderers/inc/ImageRenderer.h (modified) (5 diffs)
• WebKit/BrowserCore/Renderers/inc/ImageRendererFactory.h (modified) (1 diff)
• WebKit/BrowserCore/Renderers/inc/StaticImageDecoder.h (modified) (4 diffs)
• WebKit/BrowserCore/Renderers/src/ImageRendererFactory.cpp (modified) (1 diff)
• WebKit/BrowserCore/Renderers/src/StaticImageDecoder.cpp (modified) (7 diffs)
• WebKit/BrowserView/inc/FormDataManager.h (modified) (6 diffs)
• WebKit/BrowserView/inc/WebKitControl.h (modified) (2 diffs)
• WebKit/BrowserView/src/FormDataManager.cpp (modified) (15 diffs)
• WebKit/BrowserView/src/WebKitControl.cpp (modified) (5 diffs)
• WebKit/BrowserView/src/webkitbridge.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)

S60/branches/3.1m/WebCore/ChangeLog

@@ +1 @@
+bujtas, Reviewed by yongjun.
+        DESC: browser is crashing if it is closed while a page is loading and closing and opening a new window crashes the browser as well TMCN-6XRQP2 
+        fix: 
+        1. cancel parsing when the document is being closed
+        2. flush static image decoder queue. remove images associated with the the view being destroyed
+        
+        http://bugs.webkit.org/show_bug.cgi?id=12542
+
+        * bridge/WebCoreBridge.cpp:
+        (CWebCoreBridge::RemoveFromFrame):
+        * bridge/WebCoreImageRendererFactory.h:
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::clear):
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::cancelParsing):
+        * khtml/xml/dom_docimpl.h:
+
 yongjzha, Reviewed by zalan.
         DESC: backport google.com/ig refreshing memory leak fix in <http://bugs.webkit.org/show_bug.cgi?id=10773> PPEN-6QYG7L

S60/branches/3.1m/WebCore/bridge/WebCoreBridge.cpp

@@ -83 +83 @@
 
 #include "WebCoreImageRenderer.h"
+#include "WebCoreImageRendererFactory.h"
 //#include "WebCoreTextRendererFactory.h"
 //#include "WebCoreViewFactory.h"
@@ -863 +864 @@
         iPart->view()->setView(0);
     iPart->setView(0);
-
     // tell image renderers this frame does not exist any more
-    MWebCoreScrollView* view = &Client().DocumentView();
-    QDictIterator<khtml::CachedObject> it( *khtml::Cache::cache );
-    khtml::CachedObject* o = 0;
-    while( ( o = it.current() ) != NULL ) {
-        if( o->type() == khtml::CachedObject::Image ) {
-            const QPixmap& pm = static_cast<khtml::CachedImage *>(o)->pixmap();
-            if (pm.image())
-                pm.image()->RemoveFromScrollView(view);
-        }
-        ++it;
-    }
+    TWebCoreImageRendererFactory::Factory()->RemoveImagesInView( Client().DocumentView() );
 }
 

S60/branches/3.1m/WebCore/bridge/WebCoreImageRendererFactory.h

@@ -43 +43 @@
 
 class MWebCoreImageRenderer;
+class MWebCoreScrollView;
 
 // CLASS DECLARATION
@@ -61 +62 @@
         virtual MWebCoreImageRenderer* ImageRendererWithName(const TDesC& aName) = 0;
         virtual CArrayFix<TPtrC>* SupportedMIMETypes() = 0;
+        virtual void RemoveImagesInView(MWebCoreScrollView& aView) = 0;
         //  virtual int CGCompositeOperationInContext((CGContextRef)context);
         //    virtual void setCGCompositeOperation((int)op, (CGContextRef)context ) = 0;

S60/branches/3.1m/WebCore/khtml/khtml_part.cpp

@@ -1095 +1095 @@
 
 
-  if ( d->m_doc )
-    d->m_doc->detach();
-
+  if ( d->m_doc ) {    
+    d->m_doc->cancelParsing();
+    d->m_doc->detach();    
+    }
   // Moving past doc so that onUnload works.
   if ( d->m_jscript )

S60/branches/3.1m/WebCore/khtml/xml/dom_docimpl.cpp

@@ -1509 +1509 @@
 }
 
+void DocumentImpl::cancelParsing()
+{
+    if (m_tokenizer) {
+        // We have to clear the tokenizer to avoid possibly triggering
+        // the onload handler when closing as a side effect of a cancel-style
+        // change, such as opening a new document or closing the window while
+        // still parsing
+        delete m_tokenizer;
+        m_tokenizer = 0;
+        close();
+    }
+}
+
 void DocumentImpl::implicitOpen()
 {

S60/branches/3.1m/WebCore/khtml/xml/dom_docimpl.h

@@ -314 +314 @@
 
     void open();
+    void cancelParsing();
     void implicitOpen();
     void close();

S60/branches/3.1m/WebKit/BrowserControl/src/BrCtl.cpp

@@ -396 +396 @@
 EXPORT_C CBrCtl::~CBrCtl()
     {
+    // Delete our internal support
+    if(iWmlEngineInterface)
+        {
+        delete iWmlEngineInterface;
+        iLibrary.Close();
+        }
+
+    delete iWKWmlInterface;
+
+    //Delete the WebkitControl
+    delete iWebKitControl;
+    
     delete iSelfContentTypes;
     iLoadEventObserversArray.Reset();
@@ -455 +467 @@
     ResetSubscribeToItems();
 
-    // Delete our internal support
-    if(iWmlEngineInterface)
-        {
-        delete iWmlEngineInterface;
-        iLibrary.Close();
-        }
-
-    delete iWKWmlInterface;
-
-    //Delete the WebkitControl
-    delete iWebKitControl;
-    
     // close the arrays, avoid memory leaks
     iLoadEventObserversArray.Close();
@@ -822 +822 @@
         case TBrCtlDefs::ECommandClearAutoFormFillData:
             {
-            iWebKitControl->FormDataManagerL().ClearFormData();
+            if (iWebKitControl->FormDataManagerL())
+                {
+                iWebKitControl->FormDataManagerL()->ClearFormData();
+                }
             break;
             }
         case TBrCtlDefs::ECommandClearAutoFormFillPasswordData:
             {
-            iWebKitControl->FormDataManagerL().ClearLoginData();
+            if (iWebKitControl->FormDataManagerL())
+                {
+                iWebKitControl->FormDataManagerL()->ClearLoginData();
+                }
             break;
             }

S60/branches/3.1m/WebKit/BrowserCore/Formcontrols/src/FControlInputSkin.cpp

@@ -524 +524 @@
     // repaint the rect
     InvalidateRect();
-  if( iName && iData && iParent && !TWebCoreLoaderContainer::LoaderContainer()->BrowserEmbedded())
-    {
-    CWebKitFrame* webkitFrame = static_cast<CWebKitFrame*>(iParent);
-    TRAP_IGNORE(webkitFrame->WebKitView().WebKitControl().FormDataManagerL().ResetPasswordL(webkitFrame->WebKitBridge(),
-                                  webkitFrame->WebKitBridge().RequestedURLString(),
-                                  iName->Des(),
-                                  iData->Des()));
-    }
+    if( iName && iData && iParent && !TWebCoreLoaderContainer::LoaderContainer()->BrowserEmbedded())
+        {
+        CWebKitFrame* webkitFrame = static_cast<CWebKitFrame*>(iParent);
+        TRAP_IGNORE( 
+            CFormDataManager* formManager = webkitFrame->WebKitView().WebKitControl().FormDataManagerL();
+            if (formManager)
+                {
+                formManager->ResetPasswordL( webkitFrame->WebKitBridge(),webkitFrame->WebKitBridge().RequestedURLString(),
+                    iName->Des(),iData->Des());
+                }
+            );    
+        }
     }
 
@@ -726 +730 @@
         if(!TWebCoreLoaderContainer::LoaderContainer()->BrowserEmbedded())
             {
-            TRAP_IGNORE(iFormDataManager = &webkitFrame->WebKitView().WebKitControl().FormDataManagerL());
+            TRAP_IGNORE(iFormDataManager = webkitFrame->WebKitView().WebKitControl().FormDataManagerL());
             }
 
@@ -951 +955 @@
         iOptions = new (ELeave)CArrayPtrFlat<COptionData>(10);
         TBool isLogin = EFalse;
-        if (iName)
+        if (iName && iFormDataManager)
             {
             iFormDataManager->GetDataL(*iOptions,

S60/branches/3.1m/WebKit/BrowserCore/Renderers/inc/ImageRenderer.h

@@ -188 +188 @@
         * @return TBool
         */
-    TBool IsAnimation();
-
-        /**
-        *
-        * @since 3.1
-        * @param
-        * @return
-    */
-    void resetLoopCount();
+        TBool IsAnimation();
+
+        /**
+        *
+        * @since 3.1
+        * @param
+        * @return
+        */
+        void resetLoopCount();
 
         /**
@@ -203 +203 @@
         * @param
         * @return callback wrapper
-    */
+        */
         CWebCoreImageCallbackWrapper* InitCallbackWrapper();
 
@@ -211 +211 @@
         * @param
         * @return image raw data
-    */
+        */
         TPtrC8 GetRawData();
 
@@ -224 +224 @@
 #endif
 
-    private: // MBitmapScalingQueueObserver
-
-        void ScalingCompletedL(CMaskedBitmap*& aResultBitmap, const TRect& aTargetRect);
-
-    private: // MAnimationDecoderObserver
+    public: // MAnimationDecoderObserver
 
         void DecoderError( TInt aError );
@@ -236 +232 @@
         void StartAnimationDecoder();
 
+    private: // MBitmapScalingQueueObserver
+
+        void ScalingCompletedL(CMaskedBitmap*& aResultBitmap, const TRect& aTargetRect);
+
     public:
         void NextFrame();
 
         void LoadCannedImageL(TInt aImageId);
+        
+        MWebCoreScrollView* View() const { return iView; }
 
     private:

S60/branches/3.1m/WebKit/BrowserCore/Renderers/inc/ImageRendererFactory.h

@@ -161 +161 @@
         void SetSaveImageData( TBool aSave )        { iSaveImageData = aSave; } 
         TBool NeedSaveImageData()                   { return iSaveImageData; }
+        void RemoveImagesInView(MWebCoreScrollView& aView);
     public:
 

S60/branches/3.1m/WebKit/BrowserCore/Renderers/inc/StaticImageDecoder.h

@@ -29 +29 @@
 class TFrameInfo;
 class CBufferedImageDecoder;
+class CImageRenderer;
+class MWebCoreScrollView;
 
 struct CRawData : public CBase
     {
     static CRawData* NewL( const TDesC8& aData, TDesC* aMime, 
-           CMaskedBitmap* aTarget, MAnimationDecoderObserver* aObserv );
+           CMaskedBitmap* aTarget, CImageRenderer* aObserv );
     virtual ~CRawData();
 
     CRawData() : iData(0), iDataPtr(0,0), iMime(0), iTarget(0), iObserver(0) {}
     void ConstructL(const TDesC8& aData, TDesC* aMime, 
-        CMaskedBitmap* aTarget, MAnimationDecoderObserver* aObserv );
+        CMaskedBitmap* aTarget, CImageRenderer* aObserv );
     
     TAny*           iData;
@@ -44 +46 @@
     HBufC8*         iMime;
     CMaskedBitmap*  iTarget;
-    MAnimationDecoderObserver* iObserver;
+    CImageRenderer* iObserver;
     };
 
@@ -65 +67 @@
         // decode the image asynchorously
         TBool DecodeL( CRawData* aData  );
-        void StopObserving( MAnimationDecoderObserver* aObserv );
+        void StopObserving( CImageRenderer* aObserv );
         
         // from CActive
@@ -73 +75 @@
         // for image memory collector
         void StopAllDecoding();
+        // flush decoder queue
+        void RemoveImagesInView(MWebCoreScrollView& aView);
         
     private:

S60/branches/3.1m/WebKit/BrowserCore/Renderers/src/ImageRendererFactory.cpp

@@ -340 +340 @@
     }
 
+// -----------------------------------------------------------------------------
+// flush image decoder's queue when a view is destroyed
+// -----------------------------------------------------------------------------
+//
+void CImageRendererFactory::RemoveImagesInView(MWebCoreScrollView& aView)
+    {
+    CStaticObjectContainer::Instance().StaticImageDecoder().RemoveImagesInView(aView);
+    }
+
 #ifdef __OOM__
 // -----------------------------------------------------------------------------

S60/branches/3.1m/WebKit/BrowserCore/Renderers/src/StaticImageDecoder.cpp

@@ -19 +19 @@
 
 #include "StaticImageDecoder.h"
+#include "ImageRenderer.h"
 #include "MaskedBitmap.h"
 #include <imageconversion.h>
@@ -40 +41 @@
 // CRawData
 //=============================================================================
-CRawData* CRawData::NewL( const TDesC8& aData, TDesC* aMime, CMaskedBitmap* aTarget, MAnimationDecoderObserver* aObserv )
+CRawData* CRawData::NewL( const TDesC8& aData, TDesC* aMime, CMaskedBitmap* aTarget, CImageRenderer* aObserv )
     {
     CRawData* self = new (ELeave) CRawData();
@@ -49 +50 @@
     }
 
-void CRawData::ConstructL( const TDesC8& aData, TDesC* aMIMEType, CMaskedBitmap* aTarget, MAnimationDecoderObserver* aObserv )
+void CRawData::ConstructL( const TDesC8& aData, TDesC* aMIMEType, CMaskedBitmap* aTarget, CImageRenderer* aObserv )
     {
     // mime type
@@ -98 +99 @@
 CStaticImageDecoder::~CStaticImageDecoder()
     {
+    Cancel();
     
     iQueue.Reset();
     delete iDecoder;
     iContext = 0;
-    
-    if (IsActive())
-        {        
-        Cancel();
-        }
     }
 
@@ -212 +209 @@
         {
         // initalize decoding
-      TRequestStatus* status = &iStatus;
+        TRequestStatus* status = &iStatus;
         User::RequestComplete( status, 0 );
         SetActive();
@@ -268 +265 @@
     }
     
-void CStaticImageDecoder::StopObserving( MAnimationDecoderObserver* aObserv )
+void CStaticImageDecoder::StopObserving( CImageRenderer* aObserv )
     {
     // fast check
@@ -343 +340 @@
     }
 
+void CStaticImageDecoder::RemoveImagesInView(MWebCoreScrollView& aView)
+    {
+    // aView is about to be destroyed. remove all the images from the decoding queue 
+    // that are in that view
+    for (TInt i=iQueue.Count()-1; i>=0; --i)
+        {
+        if (iQueue[i]->iObserver && iQueue[i]->iObserver->View() == &aView )
+            {
+            if (i==0)
+                {
+                // cancel decoding
+                Cancel();
+                // start on the next
+                StartLoading();
+                }
+            iQueue[i]->iObserver->DecoderError(KErrCancel);
+            iQueue.Remove(i);
+            }
+        }
+    }
+
 // END OF FILE

S60/branches/3.1m/WebKit/BrowserView/inc/FormDataManager.h

@@ -10 +10 @@
 *    All rights reserved.
 *  
-*       Redistribution and use in source and binary forms, with or without
-*       modification, are permitted provided that the following conditions
-*       are met:
+*   Redistribution and use in source and binary forms, with or without
+*   modification, are permitted provided that the following conditions
+*   are met:
 *  
 *      * Redistributions of source code must retain the above copyright
@@ -24 +24 @@
 *        from this software without specific prior written permission.
 *  
-*       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*       DAMAGE.
+*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+*   DAMAGE.
 *  
 *    Please see file patentlicense.txt for further grants.
@@ -88 +88 @@
         * @return CFormDataManager *
         */
-        static CFormDataManager* NewL(CWebKitControl* aSettingsControler, MBrCtlDialogsProvider* aDialogProvider);
+        static CFormDataManager* NewL(MBrCtlDialogsProvider* aDialogProvider);
 
         /**
@@ -105 +105 @@
 
 
-                /**
-                * Hold key event if input widget was activated by pressing a char
-                */
-                void CFormDataManager::SetKeyEvent(const TKeyEvent& aKeyEvent, TEventCode aEventCode);
-                void CFormDataManager::ClearKeyEvent();
-                TKeyEvent CFormDataManager::LastKeyEvent( ) { return iLastKeyEvent; }
-                TEventCode CFormDataManager::LastEventCode( ) { return iLastEventCode; }
+        /**
+        * Hold key event if input widget was activated by pressing a char
+        */
+        void CFormDataManager::SetKeyEvent(const TKeyEvent& aKeyEvent, TEventCode aEventCode);
+        void CFormDataManager::ClearKeyEvent();
+        TKeyEvent CFormDataManager::LastKeyEvent( ) { return iLastKeyEvent; }
+        TEventCode CFormDataManager::LastEventCode( ) { return iLastEventCode; }
 
 
-                /**
-                * Clear the saved login data
-                */
-                void ClearLoginData ();
+        /**
+        * Clear the saved login data
+        */
+        void ClearLoginData ();
 
-                /**
-                * Clear the saved form data
-                */
-                void ClearFormData ();
+        /**
+        * Clear the saved form data
+        */
+        void ClearFormData ();
 
-                /**
-                * Update password field when login has been entered
-                */
-                void ResetPasswordL(CWebKitBridge& aWebKitBridge, 
-                                                const TDesC& aUrl, const TDesC& aName, const TDesC& aValue);
+        void SetAutoFormFillEnabled( TUint aAutoFormFillSetting ) { iAutoFormFillSetting = aAutoFormFillSetting; }
+        TUint AutoFormFillEnabled() const { return iAutoFormFillSetting; }
+
+        /**
+        * Update password field when login has been entered
+        */
+        void ResetPasswordL(CWebKitBridge& aWebKitBridge, 
+                        const TDesC& aUrl, const TDesC& aName, const TDesC& aValue);
 
         /**
         * Destructor
         */
-        ~CFormDataManager();
+        virtual ~CFormDataManager();
         
 
@@ -141 +144 @@
         * By default Symbian 2nd phase constructor is private.
         */
-        void ConstructL(CWebKitControl* aSettingsControler, MBrCtlDialogsProvider* aDialogProvider);
+        void ConstructL(MBrCtlDialogsProvider* aDialogProvider);
 
 
-                /**
-                *  Default constructor
-                */
-                CFormDataManager();
-                
-                /**
-                * return true if any field is a password field
-                */
-                TBool HasPassword(const CArrayPtrFlat<CWebCoreFormDataElement>& aFormData);
+        /**
+        *  Default constructor
+        */
+        CFormDataManager();
+        
+        /**
+        * return true if any field is a password field
+        */
+        TBool HasPassword(const CArrayPtrFlat<CWebCoreFormDataElement>& aFormData);
 
-                /**
-                * Return Browser setting
-&n