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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:06:30 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 50c3c979b3b933ec45f5ebffb0f0a64605770641
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 28 16:46:24 2003 +0000

            Reviewed by John.
    
            - fixed 3465063 -- REGRESSION (107-108): hang when fetching a page with an ad in a subframe (theage.com.au)
    
            * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::openURL): Follow the parent chain properly rather
            than repeatedly getting the part's own parent!
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5281 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3ef1968..a923fc5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-10-28  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed 3465063 -- REGRESSION (107-108): hang when fetching a page with an ad in a subframe (theage.com.au)
+
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::openURL): Follow the parent chain properly rather
+        than repeatedly getting the part's own parent!
+
 2003-10-27  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 4f8c506..665991e 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -204,11 +204,9 @@ bool KWQKHTMLPart::openURL(const KURL &url)
     bool onLoad = false;
     
     if (jScript() && jScript()->interpreter()) {
-        KHTMLPart *rootPart;
-        
-        rootPart = this;
+        KHTMLPart *rootPart = this;
         while (rootPart->parentPart() != 0)
-            rootPart = parentPart();
+            rootPart = rootPart->parentPart();
         KJS::ScriptInterpreter *interpreter = static_cast<KJS::ScriptInterpreter *>(KJSProxy::proxy(rootPart)->interpreter());
         DOM::Event *evt = interpreter->getCurrentEvent();
         

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list