[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:30:23 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3eb90762e0fab64f57a93b63382a2e867a166a1c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 19 09:06:48 2003 +0000
WebCore:
Reviewed by Trey.
- fixed 3146407 - bring the window with the targeted frame to the front
* kwq/KWQKHTMLPartBrowserExtension.mm:
(KHTMLPartBrowserExtension::createNewWindow): If we use an existing frame,
focus it.
* kwq/WebCoreBridge.h: Prototype focusWindow method.
WebKit:
Reviewed by Trey.
- fixed 3127431 - bring the window with the named frame to the front
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge focusWindow]): Tell the window operations delegate to focus.
(-[WebBridge loadURL:referrer:reload:target:triggeringEvent:form:formValues:]):
If this navigation is meant for a different frame, focus its window.
(-[WebBridge postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
Likewise.
WebBrowser:
Reviewed by Trey.
- fixed 3127431 - bring the window with the named frame to the front
- set main frame name properly for targeted links opened in tabs
* BrowserDocument.h:
* BrowserDocument.m:
(-[BrowserDocument createWebControllerWithFrameName:]): New method.
(-[BrowserDocument createWebController]): Reimplement in terms of above.
* BrowserDocumentController.m:
(-[BrowserDocumentController _goToEachRequest:windowPolicy:frameName:]): Pass
main frame name for tabs too.
* BrowserWebController.m:
(-[BrowserWebController windowController]): Move to higher in the file.
(-[BrowserWebController webViewFocusWindow:]): Switch tabs too.
* BrowserWindowController.h:
* BrowserWindowController.m:
(-[BrowserWindowController createTabWithFrameName:andShow:]): Added
frameName parameter.
(-[BrowserWindowController createTabWithFrameName:]): New method.
(-[BrowserWindowController createInactiveTabWithFrameName:]): New method.
(-[BrowserWindowController createTab]): Pass nil frame name.
(-[BrowserWindowController createInactiveTab]): Likewise.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3864 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f4b07eb..c905563 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-03-18 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Trey.
+
+ - fixed 3146407 - bring the window with the targeted frame to the front
+
+ * kwq/KWQKHTMLPartBrowserExtension.mm:
+ (KHTMLPartBrowserExtension::createNewWindow): If we use an existing frame,
+ focus it.
+ * kwq/WebCoreBridge.h: Prototype focusWindow method.
+
2003-03-17 Trey Matteson <trey at apple.com>
Support for password saving in forms. Added elementIsPassword:,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f4b07eb..c905563 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-03-18 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Trey.
+
+ - fixed 3146407 - bring the window with the targeted frame to the front
+
+ * kwq/KWQKHTMLPartBrowserExtension.mm:
+ (KHTMLPartBrowserExtension::createNewWindow): If we use an existing frame,
+ focus it.
+ * kwq/WebCoreBridge.h: Prototype focusWindow method.
+
2003-03-17 Trey Matteson <trey at apple.com>
Support for password saving in forms. Added elementIsPassword:,
diff --git a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
index 699824c..30a95eb 100644
--- a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
+++ b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
@@ -88,6 +88,7 @@ void KHTMLPartBrowserExtension::createNewWindow(const KURL &url,
if (!url.isEmpty()) {
[bridge loadURL:url.url().getNSString() referrer:[_part->bridge() referrer] reload:urlArgs.reload target:nil triggeringEvent:nil form:nil formValues:nil];
}
+ [bridge focusWindow];
*partResult = [bridge part];
return;
}
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 0f756bd..98cc444 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -253,6 +253,7 @@ enum FrameBorderStyle {
- (void)reportClientRedirectToURL:(NSString *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date lockHistory:(BOOL)lockHistory;
- (void)reportClientRedirectCancelled;
+- (void)focusWindow;
- (void)unfocusWindow;
- (NSView *)nextKeyViewOutsideWebFrameViews;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cc3a95a..630922f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-03-18 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Trey.
+
+ - fixed 3127431 - bring the window with the named frame to the front
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge focusWindow]): Tell the window operations delegate to focus.
+ (-[WebBridge loadURL:referrer:reload:target:triggeringEvent:form:formValues:]):
+ If this navigation is meant for a different frame, focus its window.
+ (-[WebBridge postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
+ Likewise.
+
2003-03-18 Trey Matteson <trey at apple.com>
3077223 full keyboard UI navigation fails in authentication sheet
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 6ae46fa..51305ca 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -328,6 +328,11 @@
}
}
+- (void)focusWindow
+{
+ [[[frame webView] _windowOperationsDelegateForwarder] webViewFocusWindow:[frame webView]];
+}
+
- (void)unfocusWindow
{
if ([[self window] isKeyWindow] || [[[self window] attachedSheet] isKeyWindow]) {
@@ -351,7 +356,13 @@
target = nil;
}
+ WebFrame *targetFrame = [frame findFrameNamed:target];
+
[frame _loadURL:[NSURL _web_URLWithString:URL] referrer:referrer loadType:(reload ? WebFrameLoadTypeReload : WebFrameLoadTypeStandard) target:target triggeringEvent:event form:form formValues:values];
+
+ if (targetFrame != nil && frame != targetFrame) {
+ [[targetFrame _bridge] focusWindow];
+ }
}
- (void)postWithURL:(NSString *)URL referrer:(NSString *)referrer target:(NSString *)target data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event form:(id <WebDOMElement>)form formValues:(NSDictionary *)values
@@ -360,7 +371,13 @@
target = nil;
}
+ WebFrame *targetFrame = [frame findFrameNamed:target];
+
[frame _postWithURL:[NSURL _web_URLWithString:URL] referrer:(NSString *)referrer target:target data:data contentType:contentType triggeringEvent:event form:form formValues:values];
+
+ if (targetFrame != nil && frame != targetFrame) {
+ [[targetFrame _bridge] focusWindow];
+ }
}
- (NSString *)generateFrameName
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list