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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit e443a39822c57b649597fa57a3d4d85e88e6be80
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 6 10:31:06 2003 +0000

    	Fix for crash on an XHTML frameset page.  It was assuming
    	that all docs were HTML. The bug # is 3277973.
    
            Reviewed by john
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::updatePolicyBaseURL):
            (KWQKHTMLPart::setPolicyBaseURL):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4491 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 92b2719..1d05c53 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-06-05  David Hyatt  <hyatt at apple.com>
 
+	Fix for crash on an XHTML frameset page.  It was assuming
+	that all docs were HTML. The bug # is 3277973.
+	
+        Reviewed by john
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::updatePolicyBaseURL):
+        (KWQKHTMLPart::setPolicyBaseURL):
+
+2003-06-05  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3281030, stylesheets can't be enabled properly via
 	script.  Test case from Dirk.  The fix is to make the setting
 	of the state happen independently of the attribute setting.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 92b2719..1d05c53 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-06-05  David Hyatt  <hyatt at apple.com>
 
+	Fix for crash on an XHTML frameset page.  It was assuming
+	that all docs were HTML. The bug # is 3277973.
+	
+        Reviewed by john
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::updatePolicyBaseURL):
+        (KWQKHTMLPart::setPolicyBaseURL):
+
+2003-06-05  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3281030, stylesheets can't be enabled properly via
 	script.  Test case from Dirk.  The fix is to make the setting
 	of the state happen independently of the attribute setting.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 3935127..abb8eed 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1099,7 +1099,8 @@ QPtrList<KWQKHTMLPart> &KWQKHTMLPart::mutableInstances()
 
 void KWQKHTMLPart::updatePolicyBaseURL()
 {
-    if (parentPart()) {
+    // FIXME: docImpl() returns null for everything other than HTML documents; is this causing problems? -dwh
+    if (parentPart() && parentPart()->docImpl()) {
         setPolicyBaseURL(parentPart()->docImpl()->policyBaseURL());
     } else {
         setPolicyBaseURL(m_url.url());
@@ -1108,7 +1109,7 @@ void KWQKHTMLPart::updatePolicyBaseURL()
 
 void KWQKHTMLPart::setPolicyBaseURL(const DOMString &s)
 {
-    // XML documents will cause this to return null.  docImpl() is
+    // FIXME: XML documents will cause this to return null.  docImpl() is
     // an HTMLdocument only. -dwh
     if (docImpl())
         docImpl()->setPolicyBaseURL(s);

-- 
WebKit Debian packaging