Plumb selection bounds as a single unit

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 26 matching lines @@
 #include "core/editing/FrameSelection.h"
 #include "core/editing/RenderedPosition.h"
 #include "core/events/OverflowEvent.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ResourceLoadPriorityOptimizer.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLFrameElement.h"
 #include "core/html/HTMLPlugInElement.h"
+#include "core/html/HTMLTextFormControlElement.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "core/layout/LayoutAnalyzer.h"
 #include "core/layout/LayoutCounter.h"
 #include "core/layout/LayoutEmbeddedObject.h"
 #include "core/layout/LayoutListBox.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/LayoutScrollbar.h"
 #include "core/layout/LayoutScrollbarPart.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/TextAutosizer.h"
 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h"
-#include "core/layout/compositing/CompositedSelectionBound.h"
+#include "core/layout/compositing/CompositedSelection.h"
 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
 #include "core/style/ComputedStyle.h"
 #include "core/layout/svg/LayoutSVGRoot.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/EventHandler.h"
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
@@ skipping 1606 matching lines @@
     // If there fixed position elements, scrolling may cause compositing layers to change.
     // Update widget and layer positions after scrolling, but only if we're not inside of
     // layout.
     if (!m_nestedLayoutCount) {
         updateWidgetPositions();
         if (LayoutView* layoutView = this->layoutView())
             layoutView->layer()->setNeedsCompositingInputsUpdate();
     }
 }
 
-bool FrameView::computeCompositedSelectionBounds(LocalFrame& frame, CompositedSelectionBound& start, CompositedSelectionBound& end)
+bool FrameView::computeCompositedSelection(LocalFrame& frame, CompositedSelection& selection)
 {
-    const VisibleSelection &selection = frame.selection().selection();
-    if (!selection.isCaretOrRange())
+    const VisibleSelection& visibleSelection = frame.selection().selection();
+    if (!visibleSelection.isCaretOrRange())
         return false;
 
-    VisiblePosition visibleStart(selection.visibleStart());
-    VisiblePosition visibleEnd(selection.visibleEnd());
+    VisiblePosition visibleStart(visibleSelection.visibleStart());
+    VisiblePosition visibleEnd(visibleSelection.visibleEnd());
 
     RenderedPosition renderedStart(visibleStart);
     RenderedPosition renderedEnd(visibleEnd);
 
-    renderedStart.positionInGraphicsLayerBacking(start);
-    if (!start.layer)
+    renderedStart.positionInGraphicsLayerBacking(selection.start);
+    if (!selection.start.layer)
         return false;
 
-    renderedEnd.positionInGraphicsLayerBacking(end);
-    if (!end.layer)
+    renderedEnd.positionInGraphicsLayerBacking(selection.end);
+    if (!selection.end.layer)
         return false;
 
-    if (selection.isCaret()) {
-        start.type = end.type = CompositedSelectionBound::Caret;
-        return true;
+    selection.type = visibleSelection.selectionType();
+    selection.isEditable = visibleSelection.isContentEditable();
+    if (selection.isEditable) {
+        if (HTMLTextFormControlElement* enclosingTextFormControlElement = enclosingTextFormControl(visibleSelection.rootEditableElement()))
+            selection.isEmptyTextFormControl = enclosingTextFormControlElement->value().isEmpty();
     }
+    selection.start.isTextDirectionRTL = visibleStart.deepEquivalent().primaryDirection() == RTL;
+    selection.end.isTextDirectionRTL = visibleEnd.deepEquivalent().primaryDirection() == RTL;
 
-    TextDirection startDir = visibleStart.deepEquivalent().primaryDirection();
-    TextDirection endDir = visibleEnd.deepEquivalent().primaryDirection();
-    start.type = startDir == RTL ? CompositedSelectionBound::SelectionRight : CompositedSelectionBound::SelectionLeft;
-    end.type = endDir == RTL ? CompositedSelectionBound::SelectionLeft : CompositedSelectionBound::SelectionRight;
     return true;
 }
 
-void FrameView::updateCompositedSelectionBoundsIfNeeded()
+void FrameView::updateCompositedSelectionIfNeeded()
 {
     if (!RuntimeEnabledFeatures::compositedSelectionUpdateEnabled())
         return;
 
     Page* page = frame().page();
     ASSERT(page);
 
-    CompositedSelectionBound start, end;
+    CompositedSelection selection;
     LocalFrame* frame = toLocalFrame(page->focusController().focusedOrMainFrame());
-    if (!frame || !computeCompositedSelectionBounds(*frame, start, end)) {
-        page->chrome().client().clearCompositedSelectionBounds();
+    if (!frame || !computeCompositedSelection(*frame, selection)) {
+        page->chrome().client().clearCompositedSelection();
         return;
     }
 
-    page->chrome().client().updateCompositedSelectionBounds(start, end);
+    page->chrome().client().updateCompositedSelection(selection);
 }
 
 HostWindow* FrameView::hostWindow() const
 {
     Page* page = frame().page();
     if (!page)
         return nullptr;
     return &page->chrome();
 }
 
@@ skipping 837 matching lines @@
 
     LayoutView* view = layoutView();
     if (view) {
         TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateLayerTree", "data", InspectorUpdateLayerTreeEvent::data(m_frame.get()));
 
         view->compositor()->updateIfNeededRecursive();
 
         if (view->compositor()->inCompositingMode() && m_frame->isLocalRoot())
             scrollingCoordinator()->updateAfterCompositingChangeIfNeeded();
 
-        updateCompositedSelectionBoundsIfNeeded();
+        updateCompositedSelectionIfNeeded();
 
         scrollContentsIfNeededRecursive();
 
         invalidateTreeIfNeededRecursive();
 
         ASSERT(!view->hasPendingSelection());
     }
 
     ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
 }
@@ skipping 1500 matching lines @@
 {
     Settings* settings = frame().settings();
     if (!settings || !settings->rootLayerScrolls())
         return this;
 
     LayoutView* layoutView = this->layoutView();
     return layoutView ? layoutView->scrollableArea() : nullptr;
 }
 
 } // namespace blink