[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 c6e0249ee7a7ca06e37a1f233b7bcb4390e45dea
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 17 23:44:14 2003 +0000

            Reviewed by Darin.
    
    	- fixed 3413713 - iframe forms posting fails without initial src attribute value
    
            * khtml/rendering/render_frames.cpp:
            (RenderPartObject::updateWidget): If the new part is for "about:blank",
    	set the document base URL to parent's base URL.
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::createEmptyDocument): If this part is an
    	iframe, set the document base URL to the parent's base URL.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5552 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index af6e299..52b8df7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-11-17  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3413713 - iframe forms posting fails without initial src attribute value
+
+        * khtml/rendering/render_frames.cpp:
+        (RenderPartObject::updateWidget): If the new part is for "about:blank",
+	set the document base URL to parent's base URL.
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::createEmptyDocument): If this part is an
+	iframe, set the document base URL to the parent's base URL.
+
 2003-11-17  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index 8011fa7..973e0c9 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -808,9 +808,15 @@ void RenderPartObject::updateWidget()
       HTMLIFrameElementImpl *o = static_cast<HTMLIFrameElementImpl *>(element());
       url = o->url.string();
       if (url.isEmpty())
-        url = "about:blank";
+	  url = "about:blank";
       KHTMLView *v = static_cast<KHTMLView *>(m_view);
-      v->part()->requestFrame( this, url, o->name.string(), QStringList(), true );
+      bool requestSucceeded = v->part()->requestFrame( this, url, o->name.string(), QStringList(), true );
+      if (requestSucceeded && url == "about:blank") {
+	  KHTMLPart *newPart = v->part()->findFrame( o->name.string() );
+	  if (newPart && newPart->xmlDocImpl()) {
+	      newPart->xmlDocImpl()->setBaseURL( v->part()->baseURL().url() );
+	  }
+      }
   }
 }
 
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index c5f1aa0..3e55763 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1483,6 +1483,11 @@ void KWQKHTMLPart::createEmptyDocument()
 	KWQ_BLOCK_EXCEPTIONS;
         [_bridge loadEmptyDocumentSynchronously];
 	KWQ_UNBLOCK_EXCEPTIONS;
+
+	if (parentPart() && (parentPart()->childFrame(this)->m_type == ChildFrame::IFrame ||
+			     parentPart()->childFrame(this)->m_type == ChildFrame::Object)) {
+	    d->m_doc->setBaseURL(parentPart()->d->m_doc->baseURL());
+	}
     }
 }
 

-- 
WebKit Debian packaging