Changeset 1911

Timestamp:

08/23/02 14:25:20 (6 years ago)

Author:

darin

Message:

WebKit:

• WebView.subproj/WebFrame.m: (-reset): Remove unneeded call to _reset.

• WebView.subproj/WebFramePrivate.m: (-_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: (-createDebugMenu): Add "Go to about:blank Soon menu item". (-goToAboutBlankSoon:): Implementation.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• ChangeLog-2002-12-03 (modified) (1 diff)
• WebView.subproj/WebFrame.m (modified) (1 diff)
• WebView.subproj/WebFramePrivate.m (modified) (2 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2002-08-23  Darin Adler  <darin@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@apple.com>
 

trunk/WebKit/ChangeLog-2002-12-03

@@ +1 @@
+2002-08-23  Darin Adler  <darin@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@apple.com>
 

trunk/WebKit/WebView.subproj/WebFrame.m

@@ -218 +218 @@
 {
     [_private setDataSource: nil];
-    if ([[self webView] isDocumentHTML]) {
-        WebHTMLView *htmlView = (WebHTMLView *)[[self webView] documentView];
-        [htmlView _reset];
-    }
     [_private setWebView: nil];
     

trunk/WebKit/WebView.subproj/WebFramePrivate.m

@@ -129 +129 @@
 - (void)_setDataSource: (WebDataSource *)ds
 {
+    if ([_private->dataSource isDocumentHTML] && ![ds isDocumentHTML]) {
+        [[self _bridge] removeFromFrame];
+    }
+
     [_private setDataSource: ds];
     [ds _setController: [self controller]];
@@ -409 +413 @@
 
                 if ([ds isDocumentHTML]) {
-                    [[ds _bridge] end];
+                    [[self _bridge] end];
                 }