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());
   }
 
-  return AdvanceFocusInDocumentOrder(to, start, type, false,
+  // If we're coming from a parent frame, we need to restart from the first or
+  // last focusable element.
+  bool initial_focus = to->Tree().Parent() == from;
+
+  return AdvanceFocusInDocumentOrder(to, start, type, initial_focus,
                                      source_capabilities);
 }
 
 #if DCHECK_IS_ON()
 inline bool IsNonFocusableShadowHost(const Element& element) {
   return IsShadowHostWithoutCustomFocusLogic(element) && !element.IsFocusable();
 }
 #endif
 
 bool FocusController::AdvanceFocusInDocumentOrder(
@@ skipping 44 matching lines @@
         *ToLocalFrame(page_->MainFrame())->GetDocument());
     element = FindFocusableElementRecursively(type, scope);
     element =
         FindFocusableElementDescendingDownIntoFrameDocument(type, element);
 
     if (!element)
       return false;
   }
 
   if (element == document->FocusedElement()) {
-    // Focus wrapped around to the same element.
+    // Focus is either coming from a remote frame or has wrapped around.
+    if (FocusedFrame() != document->GetFrame()) {
+      SetFocusedFrame(document->GetFrame());
+      DispatchFocusEvent(*document, *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.
-    // 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. 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 (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& new_document = element->GetDocument();
@@ skipping 363 matching lines @@
     it->FocusedFrameChanged();
 }
 
 DEFINE_TRACE(FocusController) {
   visitor->Trace(page_);
   visitor->Trace(focused_frame_);
   visitor->Trace(focus_changed_observers_);
 }
 
 }  // namespace blink