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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit e1becf153994dd7ee38354831a6b4612112766de
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 1 00:11:53 2002 +0000

    Added document source.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@573 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e1d17f6..b30ea02 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,11 @@
 2002-01-30  Richard Williamson  <rjw at apple.com>
 
+	* WebView.subproj/WKDefaultWebController.mm: (-[WKDefaultWebController
+	createFrameNamed:for:inParent:]):
+	* WebView.subproj/WKWebDataSource.mm: (-[WKWebDataSource documentTextFromDOM]):
+
+2002-01-30  Richard Williamson  <rjw at apple.com>
+
     Cleaned up API w/ respect to frames.
     
 	* WebView.subproj/WKDefaultWebController.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e1d17f6..b30ea02 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-01-30  Richard Williamson  <rjw at apple.com>
 
+	* WebView.subproj/WKDefaultWebController.mm: (-[WKDefaultWebController
+	createFrameNamed:for:inParent:]):
+	* WebView.subproj/WKWebDataSource.mm: (-[WKWebDataSource documentTextFromDOM]):
+
+2002-01-30  Richard Williamson  <rjw at apple.com>
+
     Cleaned up API w/ respect to frames.
     
 	* WebView.subproj/WKDefaultWebController.h:
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index f04b6e8..2393fbd 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -150,9 +150,7 @@
     [childDataSource _setController: self];
 
     [childView dataSourceChanged];
-    
-    //[child startLoading: YES];
-    
+        
     return newFrame;
 }
 
diff --git a/WebKit/WebView.subproj/IFDefaultWebController.mm b/WebKit/WebView.subproj/IFDefaultWebController.mm
index f04b6e8..2393fbd 100644
--- a/WebKit/WebView.subproj/IFDefaultWebController.mm
+++ b/WebKit/WebView.subproj/IFDefaultWebController.mm
@@ -150,9 +150,7 @@
     [childDataSource _setController: self];
 
     [childView dataSourceChanged];
-    
-    //[child startLoading: YES];
-    
+        
     return newFrame;
 }
 
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 4733334..1cce802 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -227,8 +227,9 @@
 // Get the actual source of the docment.
 - (NSString *)documentText
 {
-    [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::documentText is not implemented"];
-    return nil;
+    KHTMLPart *part = [self _part];
+    
+    return QSTRING_TO_NSSTRING(part->documentSource());
 }
 
 
@@ -243,6 +244,9 @@
         if (doc != 0){
             QString str = doc->recursive_toHTML(1);
             string = QSTRING_TO_NSSTRING(str);
+            
+            // Ensure life of NSString to end of call frame.
+            [[string retain] autorelease];
         }
     }
     if (string == nil) {
diff --git a/WebKit/WebView.subproj/WKDefaultWebController.mm b/WebKit/WebView.subproj/WKDefaultWebController.mm
index f04b6e8..2393fbd 100644
--- a/WebKit/WebView.subproj/WKDefaultWebController.mm
+++ b/WebKit/WebView.subproj/WKDefaultWebController.mm
@@ -150,9 +150,7 @@
     [childDataSource _setController: self];
 
     [childView dataSourceChanged];
-    
-    //[child startLoading: YES];
-    
+        
     return newFrame;
 }
 
diff --git a/WebKit/WebView.subproj/WKWebDataSource.mm b/WebKit/WebView.subproj/WKWebDataSource.mm
index 4733334..1cce802 100644
--- a/WebKit/WebView.subproj/WKWebDataSource.mm
+++ b/WebKit/WebView.subproj/WKWebDataSource.mm
@@ -227,8 +227,9 @@
 // Get the actual source of the docment.
 - (NSString *)documentText
 {
-    [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::documentText is not implemented"];
-    return nil;
+    KHTMLPart *part = [self _part];
+    
+    return QSTRING_TO_NSSTRING(part->documentSource());
 }
 
 
@@ -243,6 +244,9 @@
         if (doc != 0){
             QString str = doc->recursive_toHTML(1);
             string = QSTRING_TO_NSSTRING(str);
+            
+            // Ensure life of NSString to end of call frame.
+            [[string retain] autorelease];
         }
     }
     if (string == nil) {
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 4733334..1cce802 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -227,8 +227,9 @@
 // Get the actual source of the docment.
 - (NSString *)documentText
 {
-    [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::documentText is not implemented"];
-    return nil;
+    KHTMLPart *part = [self _part];
+    
+    return QSTRING_TO_NSSTRING(part->documentSource());
 }
 
 
@@ -243,6 +244,9 @@
         if (doc != 0){
             QString str = doc->recursive_toHTML(1);
             string = QSTRING_TO_NSSTRING(str);
+            
+            // Ensure life of NSString to end of call frame.
+            [[string retain] autorelease];
         }
     }
     if (string == nil) {

-- 
WebKit Debian packaging