Changeset 20587 for S60/trunk/WebCore

Timestamp:

03/29/07 13:36:11 (22 months ago)

Author:

yongjzha

Message:

yongjzha <yongjun.zhang@nokia.com>

Reviewed by Zalan <zbujtas@gmail.com>
DESC: refreshing crashes the browser on some sites (kauppalehti.fi, hs.fi)

fix: stop the tokenizer timer when switching to final document from preview document.

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

• khtml/html/htmltokenizer.cpp: (khtml::):
• khtml/html/htmltokenizer.h:
• khtml/khtml_part.cpp: (KHTMLPart::switchToDocWithPendingSrc):

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/html/htmltokenizer.cpp (modified) (1 diff)
• khtml/html/htmltokenizer.h (modified) (1 diff)
• khtml/khtml_part.cpp (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+yongjzha  <yongjun.zhang@nokia.com>
+
+        Reviewed by Zalan <zbujtas@gmail.com>
+        DESC: refreshing crashes the browser on some sites (kauppalehti.fi, hs.fi)
+              fix: stop the tokenizer timer when switching to final document from preview document.
+
+        http://bugs.webkit.org/show_bug.cgi?id=13219
+
+
+        * khtml/html/htmltokenizer.cpp:
+        (khtml::):
+        * khtml/html/htmltokenizer.h:
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::switchToDocWithPendingSrc):
+
 bujtas  <zbujtas@gmail.com>
 

S60/trunk/WebCore/khtml/html/htmltokenizer.cpp

@@ -1978 +1978 @@
 }
 
+
+#if NOKIA_CHANGES
+// fix mysterious crash after switching to final documents.
+void HTMLTokenizer::stopFutureParsing()
+{
+    if (timerId) {
+        killTimer(timerId);
+        timerId = 0;
+        end();
+    }
+}
+#endif
+
 void HTMLTokenizer::end()
 {

S60/trunk/WebCore/khtml/html/htmltokenizer.h

@@ -140 +140 @@
     bool isExecutingDocumentWrite() { return executingDocumentWrite; }
     bool isExecutingExternalScript() { return executingExternalScript; }
+    void stopFutureParsing();
 #endif
 

S60/trunk/WebCore/khtml/khtml_part.cpp

@@ -63 +63 @@
 #include "xml/dom2_rangeimpl.h"
 #include "xml/xml_tokenizer.h"
+#include "html/HTMLTokenizer.h"
 
 using namespace DOM;
@@ -6164 +6165 @@
 void KHTMLPart::switchToDocWithPendingSrc()
 {
-        d->m_doc->finishParsing();
         DocumentImpl* oldDoc = d->m_doc;
+        if( oldDoc ) {
+            oldDoc->finishParsing();
+            if (oldDoc->tokenizer()) {
+                static_cast<khtml::HTMLTokenizer*>(oldDoc->tokenizer())->stopFutureParsing();
+            }
+        }
 
         // create the real display doc