Commit 7a2ee7a1 authored by sullivan's avatar sullivan

Reviewed by Justin Garcia.

        Mail (running on tip of tree WebKit) was running into an assertion I recently added.
        The assertion is actually correct, catching an old bug in this code.

        * WebView.subproj/WebView.m:
        (-[WebView selectedFrame]):
        if the first responder is a WebFrameView, then we've found the WebFrameView we're
        looking for, and we shouldn't look at its superviews.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@9873 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a3606b3b
2005-07-22 John Sullivan <sullivan@apple.com>
Reviewed by Justin Garcia.
Mail (running on tip of tree WebKit) was running into an assertion I recently added.
The assertion is actually correct, catching an old bug in this code.
* WebView.subproj/WebView.m:
(-[WebView selectedFrame]):
if the first responder is a WebFrameView, then we've found the WebFrameView we're
looking for, and we shouldn't look at its superviews.
2005-07-22 John Sullivan <sullivan@apple.com>
Reviewed by Chris Blumenberg.
......@@ -2548,7 +2548,9 @@ - (WebFrame *)selectedFrame
// where the focused frame doesn't actually contain a selection.
NSResponder *resp = [[self window] firstResponder];
if (resp && [resp isKindOfClass:[NSView class]] && [(NSView *)resp isDescendantOf:self]) {
WebFrameView *frameView = (WebFrameView *)[(NSView *)resp _web_superviewOfClass:[WebFrameView class]];
WebFrameView *frameView = [resp isKindOfClass:[WebFrameView class]]
? (WebFrameView *)resp
: (WebFrameView *)[(NSView *)resp _web_superviewOfClass:[WebFrameView class]];
ASSERT(frameView != nil);
#ifndef NDEBUG
WebFrame *frameWithSelection = [self _findSelectedFrame];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment