Revert of OOPIF: Enable TabAndMouseFocusNavigation.

third_party/WebKit/Source/core/page/FocusController.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nuanti Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 915 matching lines @@
   // If we are shifting focus from a child frame to its parent, the
   // child frame has no more focusable elements, and we should continue
   // looking for focusable elements in the parent, starting from the <iframe>
   // element of the child frame.
   Element* start = nullptr;
   if (from->tree().parent() == to) {
     DCHECK(from->owner()->isLocal());
     start = toHTMLFrameOwnerElement(from->owner());
   }
 
-  // If we're coming from a parent frame, we need to restart from the first or
-  // last focusable element.
-  bool initialFocus = to->tree().parent() == from;
-
-  return advanceFocusInDocumentOrder(to, start, type, initialFocus,
+  return advanceFocusInDocumentOrder(to, start, type, false,
                                      sourceCapabilities);
 }
 
 #if DCHECK_IS_ON()
 inline bool isNonFocusableShadowHost(const Element& element) {
   return isShadowHostWithoutCustomFocusLogic(element) && !element.isFocusable();
 }
 #endif
 
 bool FocusController::advanceFocusInDocumentOrder(
@@ skipping 44 matching lines @@
         *toLocalFrame(m_page->mainFrame())->document());
     element = findFocusableElementRecursively(type, scope);
     element =
         findFocusableElementDescendingDownIntoFrameDocument(type, element);
 
     if (!element)
       return false;
   }
 
   if (element == document->focusedElement()) {
-    // Focus is either coming from a remote frame or has wrapped around.
-    if (focusedFrame() != document->frame()) {
-      setFocusedFrame(document->frame());
-      dispatchFocusEvent(*document, *element);
-    }
+    // Focus wrapped around to the same element.
     return true;
   }
 
   if (element->isFrameOwnerElement() &&
       (!isHTMLPlugInElement(*element) || !element->isKeyboardFocusable())) {
     // We focus frames rather than frame owners.
     // FIXME: We should not focus frames that have no scrollbars, as focusing
     // them isn't useful to the user.
     HTMLFrameOwnerElement* owner = toHTMLFrameOwnerElement(element);
     if (!owner->contentFrame())
       return false;
 
     document->clearFocusedElement();
+    setFocusedFrame(owner->contentFrame());
 
-    // If contentFrame is remote, continue the search for focusable elements in
-    // that frame's process. The target contentFrame's process will grab focus
-    // from inside advanceFocusInDocumentOrder().
-    //
-    // clearFocusedElement() fires events that might detach the contentFrame,
-    // hence the need to null-check it again.
+    // If contentFrame is remote, continue the search for focusable
+    // elements in that frame's process.
+    // clearFocusedElement() fires events that might detach the
+    // contentFrame, hence the need to null-check it again.
     if (owner->contentFrame() && owner->contentFrame()->isRemoteFrame())
       toRemoteFrame(owner->contentFrame())->advanceFocus(type, frame);
-    else
-      setFocusedFrame(owner->contentFrame());
 
     return true;
   }
 
   DCHECK(element->isFocusable());
 
   // FIXME: It would be nice to just be able to call setFocusedElement(element)
   // here, but we can't do that because some elements (e.g. HTMLInputElement
   // and HTMLTextAreaElement) do extra work in their focus() methods.
   Document& newDocument = element->document();
@@ skipping 385 matching lines @@
     it->focusedFrameChanged();
 }
 
 DEFINE_TRACE(FocusController) {
   visitor->trace(m_page);
   visitor->trace(m_focusedFrame);
   visitor->trace(m_focusChangedObservers);
 }
 
 }  // namespace blink