Changeset 18614 in webkit

Timestamp:

Jan 4, 2007 11:44:46 PM (17 years ago)

Author:

aroben

Message:

WebCore:

Reviewed by Geoff, cheered by others.

Dead code elimination.

All layout tests pass.

• page/EventHandler.h:
• page/mac/EventHandlerMac.mm:
• page/mac/WebCoreFrameBridge.h:
• page/mac/WebCoreFrameBridge.mm:

WebKit:

Reviewed by Geoff, cheered by others.

Dead code elimination.

• WebView/WebHTMLView.m:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/EventHandler.h (modified) (3 diffs)
• WebCore/page/mac/EventHandlerMac.mm (modified) (1 diff)
• WebCore/page/mac/WebCoreFrameBridge.h (modified) (2 diffs)
• WebCore/page/mac/WebCoreFrameBridge.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebView/WebHTMLView.m (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-04  Adam Roben  <aroben@apple.com>
+
+        Reviewed by Geoff, cheered by others.
+
+        Dead code elimination.
+
+        All layout tests pass.
+
+        * page/EventHandler.h:
+        * page/mac/EventHandlerMac.mm:
+        * page/mac/WebCoreFrameBridge.h:
+        * page/mac/WebCoreFrameBridge.mm:
+
 2007-01-04  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/page/EventHandler.h

@@ -27 +27 @@
 #define EventHandler_h
 
-#include "FocusDirection.h"
 #include "PlatformMouseEvent.h"
 #include "ScrollTypes.h"
@@ -126 +125 @@
 
 #if PLATFORM(MAC)
-
-    NSView *nextKeyView(Node*, FocusDirection);
-    NSView *nextKeyViewInFrameHierarchy(Node*, FocusDirection);
-    static NSView *nextKeyView(Widget*, FocusDirection);
-
     PassRefPtr<KeyboardEvent> currentKeyboardEvent() const;
 
@@ -221 +215 @@
 
     NSView *mouseDownViewIfStillGood();
-    NSView *nextKeyViewInFrame(Node*, FocusDirection, bool* focusCallResultedInViewBeingCreated = 0);
 #endif
 

trunk/WebCore/page/mac/EventHandlerMac.mm

@@ -93 +93 @@
 
     return wheelEvent.isAccepted();
-}
-
-NSView* EventHandler::nextKeyViewInFrame(Node* n, FocusDirection direction, bool* focusCallResultedInViewBeingCreated)
-{
-    Document* doc = m_frame->document();
-    if (!doc)
-        return nil;
-
-    RefPtr<KeyboardEvent> event = currentKeyboardEvent();
-
-    RefPtr<Node> node = n;
-    for (;;) {
-        node = (direction == FocusDirectionForward)
-            ? doc->nextFocusableNode(node.get(), event.get())
-            : doc->previousFocusableNode(node.get(), event.get());
-        if (!node)
-            return nil;
-        
-        RenderObject* renderer = node->renderer();
-        
-        if (!renderer->isWidget()) {
-            static_cast<Element*>(node.get())->focus(); 
-            // The call to focus might have triggered event handlers that causes the 
-            // current renderer to be destroyed.
-            if (!(renderer = node->renderer()))
-                continue;
-                
-            // FIXME: When all input elements are native, we should investigate if this extra check is needed
-            if (!renderer->isWidget()) {
-                [Mac(m_frame)->bridge() willMakeFirstResponderForNodeFocus];
-                return [Mac(m_frame)->bridge() documentView];
-            }
-            if (focusCallResultedInViewBeingCreated)
-                *focusCallResultedInViewBeingCreated = true;
-        }
-
-        if (Widget* widget = static_cast<RenderWidget*>(renderer)->widget()) {
-            NSView* view;
-            if (widget->isFrameView())
-                view = static_cast<FrameView*>(widget)->frame()->eventHandler()->nextKeyViewInFrame(0, direction);
-            else
-                view = widget->getView();
-            if (view)
-                return view;
-        }
-    }
-}
-
-NSView *EventHandler::nextKeyViewInFrameHierarchy(Node* node, FocusDirection direction)
-{
-    bool focusCallResultedInViewBeingCreated = false;
-    NSView *next = nextKeyViewInFrame(node, direction, &focusCallResultedInViewBeingCreated);
-    if (!next)
-        if (Frame* parent = m_frame->tree()->parent())
-            next = parent->eventHandler()->nextKeyViewInFrameHierarchy(m_frame->ownerElement(), direction);
-    
-    // remove focus from currently focused node if we're giving focus to another view
-    // unless the other view was created as a result of calling focus in nextKeyViewWithFrame.
-    // FIXME: The focusCallResultedInViewBeingCreated calls can be removed when all input element types
-    // have been made native.
-    if (next && (next != [Mac(m_frame)->bridge() documentView] && !focusCallResultedInViewBeingCreated))
-        if (Document* doc = m_frame->document())
-            doc->setFocusedNode(0);
-
-    // The common case where a view was created is when an <input> element changed from native 
-    // to non-native. When this happens, HTMLGenericFormElement::attach() method will call setFocus()
-    // on the widget. For views with a field editor, setFocus() will set the active responder to be the field editor. 
-    // In this case, we want to return the field editor as the next key view. Otherwise, the focus will be lost
-    // and a blur message will be sent. 
-    // FIXME: This code can be removed when all input element types are native.
-    if (focusCallResultedInViewBeingCreated) {
-        if ([[next window] firstResponder] == [[next window] fieldEditor:NO forObject:next])
-            return [[next window] fieldEditor:NO forObject:next];
-    }
-    
-    return next;
-}
-
-NSView *EventHandler::nextKeyView(Node* node, FocusDirection direction)
-{
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-
-    NSView *next = nextKeyViewInFrameHierarchy(node, direction);
-    if (next)
-        return next;
-
-    // Look at views from the top level part up, looking for a next key view that we can use.
-    next = (direction == FocusDirectionForward)
-        ? [Mac(m_frame)->bridge() nextKeyViewOutsideWebFrameViews]
-        : [Mac(m_frame)->bridge() previousKeyViewOutsideWebFrameViews];
-    if (next)
-        return next;
-
-    END_BLOCK_OBJC_EXCEPTIONS;
-    
-    // If all else fails, make a loop by starting from 0.
-    return nextKeyViewInFrameHierarchy(0, direction);
-}
-
-NSView *EventHandler::nextKeyView(Widget* startingWidget, FocusDirection direction)
-{
-    WidgetClient* client = startingWidget->client();
-    if (!client)
-        return nil;
-    Element* element = client->element(startingWidget);
-    if (!element)
-        return nil;
-    Frame* frame = element->document()->frame();
-    if (!frame)
-        return nil;
-    return frame->eventHandler()->nextKeyView(element, direction);
 }
 

trunk/WebCore/page/mac/WebCoreFrameBridge.h

@@ -132 +132 @@
 - (NSArray*)computePageRectsWithPrintWidthScaleFactor:(float)printWidthScaleFactor printHeight:(float)printHeight;
 
-- (NSView *)nextKeyView;
-- (NSView *)previousKeyView;
-
-- (NSView *)nextKeyViewInsideWebFrameViews;
-- (NSView *)previousKeyViewInsideWebFrameViews;
-
 - (NSObject *)copyRenderTree:(id <WebCoreRenderTreeCopier>)copier;
 - (NSString *)renderTreeAsExternalRepresentation;
@@ -295 +289 @@
 - (void)formControlIsBecomingFirstResponder:(NSView *)formControl;
 - (void)formControlIsResigningFirstResponder:(NSView *)formControl;
-
-- (NSView *)nextKeyViewOutsideWebFrameViews;
-- (NSView *)previousKeyViewOutsideWebFrameViews;
 
 - (void)setNeedsReapplyStyles;

trunk/WebCore/page/mac/WebCoreFrameBridge.mm

@@ -727 +727 @@
 }
 
-- (NSView *)nextKeyView
-{
-    Document *doc = m_frame->document();
-    if (!doc)
-        return nil;
-    return m_frame->eventHandler()->nextKeyView(doc->focusedNode(), FocusDirectionForward);
-}
-
-- (NSView *)previousKeyView
-{
-    Document *doc = m_frame->document();
-    if (!doc)
-        return nil;
-    return m_frame->eventHandler()->nextKeyView(doc->focusedNode(), FocusDirectionBackward);
-}
-
-- (NSView *)nextKeyViewInsideWebFrameViews
-{
-    Document *doc = m_frame->document();
-    if (!doc)
-        return nil;
-    return m_frame->eventHandler()->nextKeyViewInFrameHierarchy(doc->focusedNode(), FocusDirectionForward);
-}
-
-- (NSView *)previousKeyViewInsideWebFrameViews
-{
-    Document *doc = m_frame->document();
-    if (!doc)
-        return nil;
-    return m_frame->eventHandler()->nextKeyViewInFrameHierarchy(doc->focusedNode(), FocusDirectionBackward);
-}
-
 - (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)string
 {

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-01-04  Adam Roben  <aroben@apple.com>
+
+        Reviewed by Geoff, cheered by others.
+
+        Dead code elimination.
+
+        * WebView/WebHTMLView.m:
+
 2007-01-04  Adam Roben  <aroben@apple.com>
 

trunk/WebKit/WebView/WebHTMLView.m

@@ -2998 +2998 @@
 }
 
-- (NSView *)previousValidKeyView
-{
-    NSView *view = nil;
-    if (![self isHiddenOrHasHiddenAncestor])
-        view = [[self _bridge] previousKeyViewInsideWebFrameViews];
-    if (view == nil)
-        view = [super previousValidKeyView];
-    return view;
-}
-
 - (BOOL)becomeFirstResponder
 {