[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 c5377b691b6a4b11b853b17412ada5f5389f5655
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 23 00:40:32 2002 +0000

    	Get XML files closer.  An XML doc is at least made.  No
    	parsing works yet though.
    
            * kwq/KWQKHTMLPartImpl.mm:
            (KWQKHTMLPartImpl::setPolicyBaseURL):
            * kwq/WebCoreBridge.h:
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge setContentType:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2426 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 90ce5dd..d0e0941 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-10-22  David Hyatt  <hyatt at apple.com>
+
+	Get XML files closer.  An XML doc is at least made.  No
+	parsing works yet though.
+	
+        * kwq/KWQKHTMLPartImpl.mm:
+        (KWQKHTMLPartImpl::setPolicyBaseURL):
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge setContentType:]):
+
 2002-10-22  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3023814 - contexual menus and dragging doesn't work for some images
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 90ce5dd..d0e0941 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-10-22  David Hyatt  <hyatt at apple.com>
+
+	Get XML files closer.  An XML doc is at least made.  No
+	parsing works yet though.
+	
+        * kwq/KWQKHTMLPartImpl.mm:
+        (KWQKHTMLPartImpl::setPolicyBaseURL):
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge setContentType:]):
+
 2002-10-22  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3023814 - contexual menus and dragging doesn't work for some images
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 90ce5dd..d0e0941 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-10-22  David Hyatt  <hyatt at apple.com>
+
+	Get XML files closer.  An XML doc is at least made.  No
+	parsing works yet though.
+	
+        * kwq/KWQKHTMLPartImpl.mm:
+        (KWQKHTMLPartImpl::setPolicyBaseURL):
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge setContentType:]):
+
 2002-10-22  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3023814 - contexual menus and dragging doesn't work for some images
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index af174a6..bf86183 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -468,7 +468,10 @@ void KWQKHTMLPartImpl::updatePolicyBaseURL()
 
 void KWQKHTMLPartImpl::setPolicyBaseURL(const DOM::DOMString &s)
 {
-    part->docImpl()->setPolicyBaseURL(s);
+    // XML documents will cause this to return null.  docImpl() is
+    // an HTMLdocument only. -dwh
+    if (part->docImpl())
+        part->docImpl()->setPolicyBaseURL(s);
     ConstFrameIt end = d->m_frames.end();
     for (ConstFrameIt it = d->m_frames.begin(); it != end; ++it) {
         ReadOnlyPart *subpart = (*it).m_part;
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index af174a6..bf86183 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -468,7 +468,10 @@ void KWQKHTMLPartImpl::updatePolicyBaseURL()
 
 void KWQKHTMLPartImpl::setPolicyBaseURL(const DOM::DOMString &s)
 {
-    part->docImpl()->setPolicyBaseURL(s);
+    // XML documents will cause this to return null.  docImpl() is
+    // an HTMLdocument only. -dwh
+    if (part->docImpl())
+        part->docImpl()->setPolicyBaseURL(s);
     ConstFrameIt end = d->m_frames.end();
     for (ConstFrameIt it = d->m_frames.begin(); it != end; ++it) {
         ReadOnlyPart *subpart = (*it).m_part;
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index b7a168d..52e171b 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -103,6 +103,8 @@ enum FrameBorderStyle {
 - (void)restoreDocumentState;
 - (void)end;
 
+- (void)setContentType:(NSString*)contentType;
+
 - (NSURL *)URL;
 - (NSString *)referrer;
 
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index a7c913f..00f0676 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -763,6 +763,13 @@ static NSAttributedString *attributedString(DOM::NodeImpl *_startNode, int start
     return part->impl->selectionEndOffset();
 }
 
+- (void)setContentType:(NSString*)contentType
+{
+    KParts::URLArgs args( part->browserExtension()->urlArgs() );
+    args.serviceType = QString::fromNSString(contentType);
+    part->browserExtension()->setURLArgs(args);
+}
+
 - (void)setName:(NSString *)name
 {
     part->setName(QString::fromNSString(name));

-- 
WebKit Debian packaging