Changeset 19406 for S60/trunk/WebCore

Timestamp:

02/05/07 09:24:12 (2 years ago)

Author:

brmorris

Message:

bujtas, merged of r19405 to s60/trunk by mbradley, 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

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/WebCoreBridge.cpp (modified) (2 diffs)
• bridge/WebCoreImageRendererFactory.h (modified) (2 diffs)
• khtml/khtml_part.cpp (modified) (1 diff)
• khtml/xml/dom_docimpl.cpp (modified) (1 diff)
• khtml/xml/dom_docimpl.h (modified) (1 diff)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+bujtas, merged of r19405 to s60/trunk by mbradley, 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:
+
 bujtas, Reviewed by yongjun.
         DESC: browser crashes on www.tays.fi. when multiple layers are referring to the same background image, the render_object does not do proper deref on the image.

S60/trunk/WebCore/bridge/WebCoreBridge.cpp

@@ -83 +83 @@
 
 #include "WebCoreImageRenderer.h"
+#include "WebCoreImageRendererFactory.h"
 //#include "WebCoreTextRendererFactory.h"
 //#include "WebCoreViewFactory.h"
@@ -870 +871 @@
         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/trunk/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/trunk/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/trunk/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/trunk/WebCore/khtml/xml/dom_docimpl.h

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