Refactor composited selection code out of WebViewImpl.

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 1700 matching lines @@
         return;
 
     TRACE_EVENT0("blink", "FrameView::updateCompositedSelectionIfNeeded");
 
     Page* page = frame().page();
     ASSERT(page);
 
     CompositedSelection selection;
     LocalFrame* focusedFrame = page->focusController().focusedFrame();
     LocalFrame* localFrame = (focusedFrame && (focusedFrame->localFrameRoot() == m_frame->localFrameRoot())) ? focusedFrame : nullptr;
-    if (!localFrame || !computeCompositedSelection(*localFrame, selection)) {
-        page->chromeClient().clearCompositedSelection();
-        return;
+
+    if (localFrame && computeCompositedSelection(*localFrame, selection)) {
+        page->chromeClient().updateCompositedSelection(localFrame, selection);
+    } else {
+        if (localFrame) {
+            page->chromeClient().clearCompositedSelection(localFrame);
+        } else {
+            // Clearing the mainframe when there is no focused frame (and hence
+            // no localFrame) is legacy behaviour, and implemented here to
+            // satisfy ParameterizedWebFrameTest.CompositedSelectionBoundsCleared's
+            // first check that the composited selection has been cleared even
+            // though no frame has focus yet. If this is not desired, then the
+            // expectation needs to be removed from the test.
+            LocalFrame* mainLocalFrame = m_frame->localFrameRoot();
+            if (mainLocalFrame)
+                page->chromeClient().clearCompositedSelection(mainLocalFrame);

[bokan, 2016/08/11 14:40:09]

IMO, it's a little clearer if there's just one clearCompositedSelection call
below and you set localFrame based on the conditions, but this is fine if you
prefer it.

+        }
     }
-
-    page->chromeClient().updateCompositedSelection(selection);
 }
 
 HostWindow* FrameView::getHostWindow() const
 {
     Page* page = frame().page();
     if (!page)
         return nullptr;
     return &page->chromeClient();
 }
 
@@ skipping 2511 matching lines @@
 }
 
 bool FrameView::canThrottleRendering() const
 {
     if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
         return false;
     return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrottling);
 }
 
 } // namespace blink