[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:20:07 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 7cdb65dbf5196876f154580c15c9d50379970b69
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 19 21:25:31 2003 +0000

            Reviewed by Chris.
    
    	<rdar://problem/3512545>: reproducible assertion failure in KWQKHTMLPart::addData scrolling to anchor while page loads
    
    	* kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::scrollToAnchor): Don't pretend we finished loading,
    	because we don't actually make anchor scrolling stop the current
    	page load.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5836 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f77246d..7109a7b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-12-19  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Chris.
+
+	<rdar://problem/3512545>: reproducible assertion failure in KWQKHTMLPart::addData scrolling to anchor while page loads
+        
+	* kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::scrollToAnchor): Don't pretend we finished loading,
+	because we don't actually make anchor scrolling stop the current
+	page load.
+
 === Safari-119 ===
 
 2003-12-18  Richard Williamson   <rjw at apple.com>
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 731b15d..3ce1116 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1567,10 +1567,7 @@ void KWQKHTMLPart::scrollToAnchor(const KURL &URL)
     if (!gotoAnchor(URL.encodedHtmlRef()))
         gotoAnchor(URL.htmlRef());
 
-    d->m_bComplete = true;
-    d->m_doc->setParsing(false);
-
-    completed();
+    checkCompleted();
 }
 
 bool KWQKHTMLPart::closeURL()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list