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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 598f25f2ec52d61659797a87779ae44e21da3855
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 23 21:25:20 2002 +0000

    WebKit:
    
            * WebView.subproj/WebFrame.m: (-[WebFrame reset]): Remove unneeded call to _reset.
    
            * WebView.subproj/WebFramePrivate.m: (-[WebFrame _setDataSource:]): Add code that
    	removes the KHTML stuff from the frame when switching to another type of view.
    	It would be better to do this at some other level, but without this code, we end
    	up leaving the entire KHTMLView behind when we switch to a non-HTML page.
    
    WebBrowser:
    
    	Debugging tool to make it easy to reproduce problems like 3021018, where
    	a page transition happens while you are holding a menu down.
    
            * Debug/DebugUtilities.m:
            (-[DebugUtilities createDebugMenu]): Add "Go to about:blank Soon menu item".
            (-[BrowserDocument goToAboutBlankSoon:]): Implementation.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1911 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 306de9e..2c8732e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-23  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/WebFrame.m: (-[WebFrame reset]): Remove unneeded call to _reset.
+
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _setDataSource:]): Add code that
+	removes the KHTML stuff from the frame when switching to another type of view.
+	It would be better to do this at some other level, but without this code, we end
+	up leaving the entire KHTMLView behind when we switch to a non-HTML page.
+
 2002-08-22  Richard Williamson (Local)  <rjw at apple.com>
 
         Changed public string from #define to extern NSString.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 306de9e..2c8732e 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-08-23  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/WebFrame.m: (-[WebFrame reset]): Remove unneeded call to _reset.
+
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _setDataSource:]): Add code that
+	removes the KHTML stuff from the frame when switching to another type of view.
+	It would be better to do this at some other level, but without this code, we end
+	up leaving the entire KHTMLView behind when we switch to a non-HTML page.
+
 2002-08-22  Richard Williamson (Local)  <rjw at apple.com>
 
         Changed public string from #define to extern NSString.
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 2d352b0..366cab1 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -217,10 +217,6 @@
 - (void)reset
 {
     [_private setDataSource: nil];
-    if ([[self webView] isDocumentHTML]) {
-	WebHTMLView *htmlView = (WebHTMLView *)[[self webView] documentView];
-	[htmlView _reset];
-    }
     [_private setWebView: nil];
     
     [_private->scheduledLayoutTimer invalidate];
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index ec67ad5..148bfd3 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -128,6 +128,10 @@ static const char * const stateNames[] = {
 
 - (void)_setDataSource: (WebDataSource *)ds
 {
+    if ([_private->dataSource isDocumentHTML] && ![ds isDocumentHTML]) {
+        [[self _bridge] removeFromFrame];
+    }
+
     [_private setDataSource: ds];
     [ds _setController: [self controller]];
 }
@@ -408,7 +412,7 @@ static const char * const stateNames[] = {
 		// non-HTML content.
 
                 if ([ds isDocumentHTML]) {
-		    [[ds _bridge] end];
+		    [[self _bridge] end];
 		}
 
                 // Unfortunately we have to get our parent to adjust the frames in this

-- 
WebKit Debian packaging