Reviewed by Darin.
authortomernic <tomernic@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Apr 2006 21:43:27 +0000 (21:43 +0000)
committertomernic <tomernic@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Apr 2006 21:43:27 +0000 (21:43 +0000)
        Part of <rdar://problem/4482530>

        * WebView/WebView.m:
        (-[WebView _focusedFrame]):
        Fixed up the logic here to take into account immediate subviews of WebView, which are not actually in a WebFrameView
        (they are peers to the main frame's WebFrameView).

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13841 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog
WebKit/WebView/WebView.m

index a2fca52f1bba8e7f873e2e46e45bfca326d854bc..7ced0a80815c19d500443580c78aea6e74a7c70a 100644 (file)
@@ -1,3 +1,14 @@
+2006-04-12  Tim Omernick  <timo@apple.com>
+
+        Reviewed by Darin.
+
+        Part of <rdar://problem/4482530>
+
+        * WebView/WebView.m:
+        (-[WebView _focusedFrame]):
+        Fixed up the logic here to take into account immediate subviews of WebView, which are not actually in a WebFrameView
+        (they are peers to the main frame's WebFrameView).
+
 2006-04-10  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Tim Omernick.
index e66054b09886adc64fdf5376dcf9e16316123e51..0a0155e8c625adb7b5cffa2b397c2f77cdeada25 100644 (file)
@@ -3080,7 +3080,7 @@ FOR_EACH_RESPONDER_SELECTOR(FORWARD)
 - (WebFrame *)_focusedFrame
 {
     NSResponder *resp = [[self window] firstResponder];
-    if (resp && [resp isKindOfClass:[NSView class]] && [(NSView *)resp isDescendantOf:self]) {
+    if (resp && [resp isKindOfClass:[NSView class]] && [(NSView *)resp isDescendantOf:[[self mainFrame] frameView]]) {
         WebFrameView *frameView = [resp isKindOfClass:[WebFrameView class]] 
         ? (WebFrameView *)resp 
         : (WebFrameView *)[(NSView *)resp _web_superviewOfClass:[WebFrameView class]];