[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:09:37 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b6ca4253b3297fc3b85ecc6fc34d3cf410eac1a6
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 6 01:47:58 2003 +0000
- fixed <rdar://problem/3469791>: Bigger/Smaller commands are
disabled for HTML Mail in separate window (w/WebKit-111)
Reviewed by Darin.
* WebView.subproj/WebFrameView.m:
(-[WebFrameView acceptsFirstResponder]):
always be willing to become first responder, even if no page
has yet been loaded.
(-[WebFrameView becomeFirstResponder]):
if no page has yet been loaded (so our scrollview refuses
first responder-ness), don't do any special becoming-first-
responder shenanigans.
Also removed obsolete overrides for nextKeyView, nextValidKeyView,
previousKeyView, and previousValidKeyView that are no longer
required now that we handle the key loop more like NSScrollView.
* WebView.subproj/WebFrameViewPrivate.h:
removed now-unused ivar inNextValidKeyView
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5398 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8520128..3f2741d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,26 @@
+2003-11-05 John Sullivan <sullivan at apple.com>
+
+ - fixed <rdar://problem/3469791>: Bigger/Smaller commands are
+ disabled for HTML Mail in separate window (w/WebKit-111)
+
+ Reviewed by Darin.
+
+ * WebView.subproj/WebFrameView.m:
+ (-[WebFrameView acceptsFirstResponder]):
+ always be willing to become first responder, even if no page
+ has yet been loaded.
+ (-[WebFrameView becomeFirstResponder]):
+ if no page has yet been loaded (so our scrollview refuses
+ first responder-ness), don't do any special becoming-first-
+ responder shenanigans.
+
+ Also removed obsolete overrides for nextKeyView, nextValidKeyView,
+ previousKeyView, and previousValidKeyView that are no longer
+ required now that we handle the key loop more like NSScrollView.
+
+ * WebView.subproj/WebFrameViewPrivate.h:
+ removed now-unused ivar inNextValidKeyView
+
2003-11-05 Richard Williamson <rjw at apple.com>
Fixed 3029966. Animated backgrounds specified in <BODY> don't animate
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index c5b33fb..c1798c0 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -467,31 +467,33 @@ static NSMutableDictionary *viewTypes;
- (BOOL)acceptsFirstResponder
{
- return [[self _scrollView] acceptsFirstResponder];
+ // We always accept first responder; this matches OS X 10.2 WebKit
+ // behavior (see 3469791).
+ return YES;
}
- (BOOL)becomeFirstResponder
{
// This works together with setNextKeyView to splice the WebFrameView into
// the key loop similar to the way NSScrollView does this. Note that
- // WebView has very similar code.
- NSWindow *window = [self window];
- if ([window keyViewSelectionDirection] == NSSelectingPrevious) {
- NSView *previousValidKeyView = [self previousValidKeyView];
- if ((previousValidKeyView != self) && (previousValidKeyView != [self _scrollView])) {
- [window makeFirstResponder:previousValidKeyView];
- return YES;
+ // WebView has similar code.
+
+ // If the scrollView won't accept first-responderness now, then we just become
+ // the first responder ourself like a normal view. This lets us be the first
+ // responder in cases where no page has yet been loaded (see 3469791).
+ if ([[self _scrollView] acceptsFirstResponder]) {
+ NSWindow *window = [self window];
+ if ([window keyViewSelectionDirection] == NSSelectingPrevious) {
+ NSView *previousValidKeyView = [self previousValidKeyView];
+ if ((previousValidKeyView != self) && (previousValidKeyView != [self _scrollView])) {
+ [window makeFirstResponder:previousValidKeyView];
+ }
} else {
- return NO;
+ [window makeFirstResponder:[self _scrollView]];
}
- }
+ }
- if ([[self _scrollView] acceptsFirstResponder]) {
- [window makeFirstResponder:[self _scrollView]];
- return YES;
- } else {
- return NO;
- }
+ return YES;
}
- (void)setNextKeyView:(NSView *)aView
@@ -702,44 +704,4 @@ static NSMutableDictionary *viewTypes;
}
}
-- (NSView *)nextKeyView
-{
- if (_private != nil && _private->inNextValidKeyView) {
- WebFrame *webFrame = [self webFrame];
- WebView *webView = [[self webFrame] webView];
- if (webFrame == [webView mainFrame]) {
- return [webView nextKeyView];
- }
- }
- return [super nextKeyView];
-}
-
-- (NSView *)previousKeyView
-{
- if (_private != nil && _private->inNextValidKeyView) {
- WebFrame *webFrame = [self webFrame];
- WebView *webView = [[self webFrame] webView];
- if (webFrame == [webView mainFrame]) {
- return [webView previousKeyView];
- }
- }
- return [super previousKeyView];
-}
-
-- (NSView *)nextValidKeyView
-{
- _private->inNextValidKeyView = YES;
- NSView *view = [super nextValidKeyView];
- _private->inNextValidKeyView = NO;
- return view;
-}
-
-- (NSView *)previousValidKeyView
-{
- _private->inNextValidKeyView = YES;
- NSView *view = [super previousValidKeyView];
- _private->inNextValidKeyView = NO;
- return view;
-}
-
@end
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index c2a4acd..7084bbe 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -21,7 +21,6 @@
NSArray *draggingTypes;
- BOOL inNextValidKeyView;
BOOL hasBorder;
}
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index c2a4acd..7084bbe 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -21,7 +21,6 @@
NSArray *draggingTypes;
- BOOL inNextValidKeyView;
BOOL hasBorder;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list