[webkit-changes] cvs commit: WebKit/WebCoreSupport.subproj
WebBridge.m
Maciej
mjs at opensource.apple.com
Tue Dec 20 01:59:12 PST 2005
mjs 05/12/20 01:59:12
Modified: . ChangeLog
WebCoreSupport.subproj WebBridge.m
Log:
Not reviewed.
- revert accidental commit of this file.
Revision Changes Path
1.3413 +6 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3412
retrieving revision 1.3413
diff -u -r1.3412 -r1.3413
--- ChangeLog 20 Dec 2005 08:32:44 -0000 1.3412
+++ ChangeLog 20 Dec 2005 09:59:08 -0000 1.3413
@@ -1,3 +1,9 @@
+2005-12-20 Maciej Stachowiak <mjs at apple.com>
+
+ Not reviewed.
+
+ - revert accidental commit of this file.
+
2005-12-19 Maciej Stachowiak <mjs at apple.com>
Reviewed by Eric.
1.377 +7 -4 WebKit/WebCoreSupport.subproj/WebBridge.m
Index: WebBridge.m
===================================================================
RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebBridge.m,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- WebBridge.m 20 Dec 2005 08:32:54 -0000 1.376
+++ WebBridge.m 20 Dec 2005 09:59:11 -0000 1.377
@@ -349,7 +349,7 @@
{
WebView *parentWebView = [_frame webView];
- // We need to remove the main frame from WebFrameNaemespaces here, before it actually
+ // We need to remove the parent WebView from WebViewSets here, before it actually
// closes, to make sure that JavaScript code that executes before it closes
// can't find it. Otherwise, window.open will select a closed WebView instead of
// opening a new one <rdar://problem/3572585>.
@@ -361,8 +361,11 @@
// message by actually closing the WebView. Safari guarantees this behavior, but other apps might not.
// This approach is an inherent limitation of not making a close execute immediately
// after a call to window.close.
- [[parentWebView mainFrame] _setFrameNamespace:nil];
+
+ [WebFrameNamespaces removeWebView:parentWebView fromFrameNamespace:[parentWebView groupName]];
+
[parentWebView stopLoading:self];
+
[parentWebView performSelector:@selector(_closeWindow) withObject:nil afterDelay:0.0];
}
@@ -1715,9 +1718,9 @@
NSMutableArray *deferredWebViews = [NSMutableArray array];
NSString *setName = [webView groupName];
if (setName) {
- NSEnumerator *enumerator = [WebFrameNamespaces framesInNamespace:setName];
+ NSEnumerator *enumerator = [WebFrameNamespaces webViewsInFrameNamespace:setName];
WebView *otherWebView;
- while ((otherWebView = [[enumerator nextObject] webView]) != nil) {
+ while ((otherWebView = [enumerator nextObject]) != nil) {
if (otherWebView != webView && ![otherWebView defersCallbacks]) {
[otherWebView setDefersCallbacks:YES];
[deferredWebViews addObject:otherWebView];
More information about the webkit-changes
mailing list