Fix keyboard focus for OOPIF-<webview>.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2883 matching lines @@
 
 void WebViewImpl::focusDocumentView(WebFrame* frame)
 {
     // This is currently only used when replicating focus changes for
     // cross-process frames, and |notifyEmbedder| is disabled to avoid sending
     // duplicate frameFocused updates from FocusController to the browser
     // process, which already knows the latest focused frame.
     page()->focusController().focusDocumentView(frame->toImplBase()->frame(), false /* notifyEmbedder */);
 }
 
+void WebViewImpl::unfocusDocumentView(WebFrame* frame)
+{
+    if (page()->focusController().focusedFrame() == frame->toImplBase()->frame()) {

[avallee, 2016/05/24 20:07:08]

Had to bring this back. See reply to comment on previous patchset.

Does it make sense to unfocus for the whole page via a single frame? I've hit
the assert in several situations while testing.

+        page()->focusController().focusDocumentView(nullptr /* frame */, false /* notifyEmbedder */);
+    }
+}
+
 void WebViewImpl::setInitialFocus(bool reverse)
 {
     if (!m_page)
         return;
     Frame* frame = page()->focusController().focusedOrMainFrame();
     if (frame->isLocalFrame()) {
         if (Document* document = toLocalFrame(frame)->document())
             document->clearFocusedElement();
     }
     page()->focusController().setInitialFocus(reverse ? WebFocusTypeBackward : WebFocusTypeForward);
@@ skipping 1610 matching lines @@
 {
     // TODO(oshima): Investigate if this should return the ScreenInfo's scale factor rather than
     // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
     if (!page())
         return 1;
 
     return page()->deviceScaleFactor();
 }
 
 } // namespace blink