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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 60f9f0eb590bf8c4c159426d438dc2e13dbcc4ab
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 14 23:08:08 2003 +0000

            Reviewed by NOBODY (OOPS!).
    
    	- fixed 3190846 - REGRESSION: can't use Fidelity NetBenefits account
    
            * khtml/html/html_baseimpl.cpp:
            (HTMLFrameElementImpl::updateForNewURL): Treat javascript: URLs as
    	about:blank for now.
            (HTMLFrameElementImpl::attach): Likewise.
            * khtml/khtml_part.cpp:
            (KHTMLPart::processObjectRequest): Make sure to send completed() signal
    	after signals are connectd in synchronous load case.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3835 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 451918e..9c46a35 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-03-14  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+	- fixed 3190846 - REGRESSION: can't use Fidelity NetBenefits account
+	
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLFrameElementImpl::updateForNewURL): Treat javascript: URLs as
+	about:blank for now.
+        (HTMLFrameElementImpl::attach): Likewise.
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::processObjectRequest): Make sure to send completed() signal
+	after signals are connectd in synchronous load case.
+
 2003-03-13  David Hyatt  <hyatt at apple.com>
 
 	Fix for ew.com, hrweb and arstechnica forums.  A <br> should
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 451918e..9c46a35 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-03-14  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+	- fixed 3190846 - REGRESSION: can't use Fidelity NetBenefits account
+	
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLFrameElementImpl::updateForNewURL): Treat javascript: URLs as
+	about:blank for now.
+        (HTMLFrameElementImpl::attach): Likewise.
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::processObjectRequest): Make sure to send completed() signal
+	after signals are connectd in synchronous load case.
+
 2003-03-13  David Hyatt  <hyatt at apple.com>
 
 	Fix for ew.com, hrweb and arstechnica forums.  A <br> should
diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/khtml/html/html_baseimpl.cpp
index d28211c..4fb9987 100644
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/khtml/html/html_baseimpl.cpp
@@ -283,8 +283,17 @@ void HTMLFrameElementImpl::updateForNewURL()
     // Load the frame contents.
     KHTMLPart *part = w->part();
     KHTMLPart *framePart = part->findFrame(name.string());
+    KURL kurl = getDocument()->completeURL(url.string());
+
+    // Temporarily treat javascript: URLs as about:blank, until we can
+    // properly support them as frame sources.
+    if (kurl.protocol() == "javascript") {
+	url = "about:blank";
+	kurl = "about:blank";
+    }
+
     if (framePart) {
-        framePart->openURL(getDocument()->completeURL(url.string()));
+        framePart->openURL(kurl);
     } else {
         part->requestFrame(static_cast<RenderFrame *>(m_render), url.string(), name.string());
     }
@@ -389,6 +398,13 @@ void HTMLFrameElementImpl::attach()
 
     w->part()->incrementFrameCount();
 
+    // Temporarily treat javascript: URLs as about:blank, until we can
+    // properly support them as frame sources.
+    KURL kurl = getDocument()->completeURL(url.string());
+    if (kurl.protocol() == "javascript") {
+	url = "about:blank";
+    }
+
     // we need a unique name for every frame in the frameset. Hope that's unique enough.
     if(name.isEmpty() || w->part()->frameExists( name.string() ) )
       name = DOMString(w->part()->requestFrameName());
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 1efdaa8..63a6713 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -3016,7 +3016,15 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
   if ( child->m_extension )
     child->m_extension->setURLArgs( child->m_args );
 
-#if !APPLE_CHANGES
+#if APPLE_CHANGES
+    // In these cases, the synchronous load would have finished
+    // before we could connect the signals, so make sure to send the
+    // completed() signal for the child by hand:
+    if (url.isEmpty() || url.url() == "about:blank") {
+      KParts::ReadOnlyPart *part = child->m_part;
+      static_cast<KHTMLPart *>(part)->completed();
+    }
+#else
   if(url.protocol() == "javascript" || url.url() == "about:blank") {
       if (!child->m_part->inherits("KHTMLPart"))
           return false;

-- 
WebKit Debian packaging