[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:26:30 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit fa000d605934e62814baabde80639c601e49cd56
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 28 11:15:07 2003 +0000
WebKit:
Reviewed by Richard.
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge window]): Avoid calling removed call.
* WebView.subproj/WebView.m: Remove override of window method.
* WebView.subproj/WebWindowOperationsDelegate.h:
Adjust for new API.
WebBrowser:
Reviewed by Richard.
Minimal implementation of new window operations delegate API.
* BrowserWebController.m:
(-[BrowserWebController closeWindow]):
(-[BrowserWebController focusWindow]):
(-[BrowserWebController unfocusWindow]):
(-[BrowserWebController firstResponderInWindow]):
(-[BrowserWebController makeFirstResponderInWindow:]):
(-[BrowserWebController isResizable]):
(-[BrowserWebController setResizbale:]):
(-[BrowserWebController setFrame:]):
(-[BrowserWebController frame]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3715 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 59d8800..7d100d4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-02-27 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Richard.
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge window]): Avoid calling removed call.
+ * WebView.subproj/WebView.m: Remove override of window method.
+ * WebView.subproj/WebWindowOperationsDelegate.h:
+ Adjust for new API.
+
=== Safari-64 ===
=== Safari-63 ===
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 6a042e5..d068084 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -165,7 +165,7 @@
- (NSWindow *)window
{
ASSERT(frame != nil);
- return [[[frame controller] windowOperationsDelegate] window];
+ return [[frame webView] window];
}
- (WebDataSource *)dataSource
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index e05bc0c..691a050 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -181,17 +181,6 @@ enum {
[super setFrameSize:size];
}
-- (NSWindow *)window
-{
- NSWindow *window = [super window];
-
- if (window == nil) {
- window = [[[self controller] windowOperationsDelegate] window];
- }
-
- return window;
-}
-
- (void)keyDown:(NSEvent *)event
{
NSString *characters = [event characters];
diff --git a/WebKit/WebView.subproj/WebUIDelegate.h b/WebKit/WebView.subproj/WebUIDelegate.h
index 2e0b1db..4e58bb0 100644
--- a/WebKit/WebView.subproj/WebUIDelegate.h
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -47,6 +47,56 @@
- (void)showWindowBehindFrontmost;
/*!
+ @method closeWindow
+ @abstract Close the current window.
+ @discussion Clients showing multiple views in one window may
+ choose to close only the one corresponding to this
+ controller. Other clients may choose to ignore this method
+ entirely.
+*/
+- (void)closeWindow;
+
+/*!
+ @method focusWindow
+ @abstract Focus the current window (i.e. makeKeyAndOrderFront:).
+ @discussion Clients showing multiple views in one window may want to
+ also do something to focus the one corresponding to this controller.
+*/
+- (void)focusWindow;
+
+/*!
+ @method unfocusWindow
+ @abstract Unfocus the current window.
+ @discussion Clients showing multiple views in one window may want to
+ also do something to unfocus the one corresponding to this controller.
+*/
+- (void)unfocusWindow;
+
+/*!
+ @method firstResponderInWindow
+ @abstract Get the first responder for this window.
+ @discussion This method should return the focused control in the
+ controller's view, if any. If the view is out of the window
+ hierarchy, this might return something than calling firstResponder
+ on the real NSWindow would. It's OK to return either nil or the
+ real first responder if some control not in the window has focus.
+*/
+- (NSResponder *)firstResponderInWindow;
+
+/*!
+ @method makeFirstResponderInWindow:
+ @abstract Set the first responder for this window.
+ @param responder The responder to make first (will always be a view)
+ @discussion responder will always be a view that is in the view
+ subhierarchy of the top-level web view for this controller. If the
+ controller's top level view is currently out of the view
+ hierarchy, it may be desirable to save the first responder
+ elsewhere, or possibly ignore this call.
+*/
+- (void)makeFirstResponderInWindow:(NSResponder *)responder;
+
+
+/*!
@method setStatusText:
@abstract Set the window's status display, if any, to the specified string.
@param text The status text to set
@@ -108,6 +158,26 @@
- (void)setStatusBarVisible:(BOOL)visible;
/*!
+ @method isResizable
+ @abstract Determine whether the window is resizable or not.
+ @result YES if resizable, NO if not.
+ @discussion If there are multiple views in the same window, they
+ have have their own separate resize controls and this may need to
+ be handled specially.
+*/
+- (BOOL)isResizable;
+
+/*!
+ @method setResizable:
+ @abstract Set the window to resizable or not
+ @param resizable YES if the window should be made resizable, NO if not.
+ @discussion If there are multiple views in the same window, they
+ have have their own separate resize controls and this may need to
+ be handled specially.
+*/
+- (void)setResizbale:(BOOL)resizable;
+
+/*!
@method setFrame:
@abstract Set the window's frame rect
@param frame The new window frame size
@@ -116,12 +186,12 @@
things on programmatic move/resize, like avoiding autosaving of the size.
*/
- (void)setFrame:(NSRect)frame;
-
+
/*!
- @method window
- @abstract Get the NSWindow that contains the top-level view of the WebController
- @result The NSWindow corresponding to this WebController
+ @method frame
+ @abstract REturn the window's frame rect
+ @discussion
*/
-- (NSWindow *)window;
-
+- (NSRect)frame;
+
@end
diff --git a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
index 2e0b1db..4e58bb0 100644
--- a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
+++ b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
@@ -47,6 +47,56 @@
- (void)showWindowBehindFrontmost;
/*!
+ @method closeWindow
+ @abstract Close the current window.
+ @discussion Clients showing multiple views in one window may
+ choose to close only the one corresponding to this
+ controller. Other clients may choose to ignore this method
+ entirely.
+*/
+- (void)closeWindow;
+
+/*!
+ @method focusWindow
+ @abstract Focus the current window (i.e. makeKeyAndOrderFront:).
+ @discussion Clients showing multiple views in one window may want to
+ also do something to focus the one corresponding to this controller.
+*/
+- (void)focusWindow;
+
+/*!
+ @method unfocusWindow
+ @abstract Unfocus the current window.
+ @discussion Clients showing multiple views in one window may want to
+ also do something to unfocus the one corresponding to this controller.
+*/
+- (void)unfocusWindow;
+
+/*!
+ @method firstResponderInWindow
+ @abstract Get the first responder for this window.
+ @discussion This method should return the focused control in the
+ controller's view, if any. If the view is out of the window
+ hierarchy, this might return something than calling firstResponder
+ on the real NSWindow would. It's OK to return either nil or the
+ real first responder if some control not in the window has focus.
+*/
+- (NSResponder *)firstResponderInWindow;
+
+/*!
+ @method makeFirstResponderInWindow:
+ @abstract Set the first responder for this window.
+ @param responder The responder to make first (will always be a view)
+ @discussion responder will always be a view that is in the view
+ subhierarchy of the top-level web view for this controller. If the
+ controller's top level view is currently out of the view
+ hierarchy, it may be desirable to save the first responder
+ elsewhere, or possibly ignore this call.
+*/
+- (void)makeFirstResponderInWindow:(NSResponder *)responder;
+
+
+/*!
@method setStatusText:
@abstract Set the window's status display, if any, to the specified string.
@param text The status text to set
@@ -108,6 +158,26 @@
- (void)setStatusBarVisible:(BOOL)visible;
/*!
+ @method isResizable
+ @abstract Determine whether the window is resizable or not.
+ @result YES if resizable, NO if not.
+ @discussion If there are multiple views in the same window, they
+ have have their own separate resize controls and this may need to
+ be handled specially.
+*/
+- (BOOL)isResizable;
+
+/*!
+ @method setResizable:
+ @abstract Set the window to resizable or not
+ @param resizable YES if the window should be made resizable, NO if not.
+ @discussion If there are multiple views in the same window, they
+ have have their own separate resize controls and this may need to
+ be handled specially.
+*/
+- (void)setResizbale:(BOOL)resizable;
+
+/*!
@method setFrame:
@abstract Set the window's frame rect
@param frame The new window frame size
@@ -116,12 +186,12 @@
things on programmatic move/resize, like avoiding autosaving of the size.
*/
- (void)setFrame:(NSRect)frame;
-
+
/*!
- @method window
- @abstract Get the NSWindow that contains the top-level view of the WebController
- @result The NSWindow corresponding to this WebController
+ @method frame
+ @abstract REturn the window's frame rect
+ @discussion
*/
-- (NSWindow *)window;
-
+- (NSRect)frame;
+
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list