Blink handle selection handle visibility

third_party/WebKit/Source/core/editing/VisibleSelection.h

 /*
  * Copyright (C) 2004 Apple Computer, 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 47 matching lines @@
   VisibleSelectionTemplate(const VisibleSelectionTemplate&);
   VisibleSelectionTemplate& operator=(const VisibleSelectionTemplate&);
 
   // Note: |create()| should be used only by |createVisibleSelection| and
   // |selectionFromContentsOfNode|.
   // TODO(xiaochengh): Use enum class instead of boolean parameter.
   static VisibleSelectionTemplate create(
       const PositionTemplate<Strategy>& base,
       const PositionTemplate<Strategy>& extent,
       TextAffinity,
-      bool isDirectional);
+      bool isDirectional,
+      bool isHandleVisible);

[yosin_UTC9, 2016/10/07 05:17:59]

Please move |isHandleVisible| to |FrameSelection|. |VisibleSelection| is a basic
data structure and read as |VisibleRange|.
Also as nature of |isHandleVisible|, it is only related to the selection what
user sees, so |FrameSelection| is the right place.

[amaralp, 2016/10/14 00:53:07]

Moved.

 
   static VisibleSelectionTemplate selectionFromContentsOfNode(Node*);
 
   SelectionType getSelectionType() const { return m_selectionType; }
 
+  void setIsHandleVisible(bool isHandleVisible) {
+    m_isHandleVisible = isHandleVisible;
+  }
+  bool isHandleVisible() const { return m_isHandleVisible; }
+
   void setAffinity(TextAffinity affinity) { m_affinity = affinity; }
   TextAffinity affinity() const { return m_affinity; }
 
   void setBase(const PositionTemplate<Strategy>&);
   void setBase(const VisiblePositionTemplate<Strategy>&);
   void setExtent(const PositionTemplate<Strategy>&);
   void setExtent(const VisiblePositionTemplate<Strategy>&);
 
   PositionTemplate<Strategy> base() const { return m_base; }
   PositionTemplate<Strategy> extent() const { return m_extent; }
@@ skipping 85 matching lines @@
   void showTreeForThis() const;
 #endif
   static void PrintTo(const VisibleSelectionTemplate&, std::ostream*);
 
  private:
   friend class SelectionAdjuster;
 
   VisibleSelectionTemplate(const PositionTemplate<Strategy>& base,
                            const PositionTemplate<Strategy>& extent,
                            TextAffinity,
-                           bool isDirectional);
+                           bool isDirectional,
+                           bool isHandleVisible);
 
   void validate(TextGranularity = CharacterGranularity);
 
   // Support methods for validate()
   void setBaseAndExtentToDeepEquivalents();
   void adjustSelectionToAvoidCrossingShadowBoundaries();
   void adjustSelectionToAvoidCrossingEditingBoundaries();
   void setEndRespectingGranularity(TextGranularity);
   void setStartRespectingGranularity(TextGranularity);
   void updateSelectionType();
@@ skipping 20 matching lines @@
   // Non-directional ignores m_baseIsFirst and selection always extends on shift
   // + arrow key.
   bool m_isDirectional : 1;
 
   TextGranularity m_granularity;
   // |updateIfNeeded()| uses |m_hasTrailingWhitespace| for word granularity.
   // |m_hasTrailingWhitespace| is set by |appendTrailingWhitespace()|.
   // TODO(yosin): Once we unify start/end and base/extent, we should get rid
   // of |m_hasTrailingWhitespace|.
   bool m_hasTrailingWhitespace : 1;
+  bool m_isHandleVisible : 1;
 };
 
 extern template class CORE_EXTERN_TEMPLATE_EXPORT
     VisibleSelectionTemplate<EditingStrategy>;
 extern template class CORE_EXTERN_TEMPLATE_EXPORT
     VisibleSelectionTemplate<EditingInFlatTreeStrategy>;
 
 using VisibleSelection = VisibleSelectionTemplate<EditingStrategy>;
 using VisibleSelectionInFlatTree =
     VisibleSelectionTemplate<EditingInFlatTreeStrategy>;
 
 // TODO(xiaochengh): Introduce builder class to get rid of these overloads.
-CORE_EXPORT VisibleSelection createVisibleSelection(const Position&,
-                                                    TextAffinity,
-                                                    bool isDirectional = false);
+CORE_EXPORT VisibleSelection
+createVisibleSelection(const Position&,
+                       TextAffinity,
+                       bool isDirectional = false,
+                       bool isHandleVisible = false);
 CORE_EXPORT VisibleSelection
 createVisibleSelection(const Position& base,
                        const Position& extent,
                        TextAffinity = SelDefaultAffinity,
-                       bool isDirectional = false);
+                       bool isDirectional = false,
+                       bool isHandleVisible = false);
 CORE_EXPORT VisibleSelection
 createVisibleSelection(const EphemeralRange&,
                        TextAffinity = SelDefaultAffinity,
-                       bool isDirectional = false);
-CORE_EXPORT VisibleSelection createVisibleSelection(const VisiblePosition&,
-                                                    bool isDirectional = false);
-CORE_EXPORT VisibleSelection createVisibleSelection(const VisiblePosition&,
-                                                    const VisiblePosition&,
-                                                    bool isDirectional = false);
-CORE_EXPORT VisibleSelection createVisibleSelection(const PositionWithAffinity&,
-                                                    bool isDirectional = false);
+                       bool isDirectional = false,
+                       bool isHandleVisible = false);
+CORE_EXPORT VisibleSelection
+createVisibleSelection(const VisiblePosition&,
+                       bool isDirectional = false,
+                       bool isHandleVisible = false);
+CORE_EXPORT VisibleSelection
+createVisibleSelection(const VisiblePosition&,
+                       const VisiblePosition&,
+                       bool isDirectional = false,
+                       bool isHandleVisible = false);
+CORE_EXPORT VisibleSelection
+createVisibleSelection(const PositionWithAffinity&,
+                       bool isDirectional = false,
+                       bool isHandleVisible = false);
 
 CORE_EXPORT VisibleSelectionInFlatTree
 createVisibleSelection(const PositionInFlatTree&,
                        TextAffinity,
-                       bool isDirectional = false);
+                       bool isDirectional = false,
+                       bool isHandleVisible = false);
 CORE_EXPORT VisibleSelectionInFlatTree
 createVisibleSelection(const PositionInFlatTree& base,
                        const PositionInFlatTree& extent,
                        TextAffinity = SelDefaultAffinity,
-                       bool isDirectional = false);
+                       bool isDirectional = false,
+                       bool isHandleVisible = false);
 CORE_EXPORT VisibleSelectionInFlatTree
 createVisibleSelection(const EphemeralRangeInFlatTree&,
                        TextAffinity = SelDefaultAffinity,
-                       bool isDirectional = false);
+                       bool isDirectional = false,
+                       bool isHandleVisible = false);
 CORE_EXPORT VisibleSelectionInFlatTree
 createVisibleSelection(const VisiblePositionInFlatTree&,
-                       bool isDirectional = false);
+                       bool isDirectional = false,
+                       bool isHandleVisible = false);
 CORE_EXPORT VisibleSelectionInFlatTree
 createVisibleSelection(const VisiblePositionInFlatTree&,
                        const VisiblePositionInFlatTree&,
-                       bool isDirectional = false);
+                       bool isDirectional = false,
+                       bool isHandleVisible = false);
 CORE_EXPORT VisibleSelectionInFlatTree
 createVisibleSelection(const PositionInFlatTreeWithAffinity&,
-                       bool isDirectional = false);
+                       bool isDirectional = false,
+                       bool isHandleVisible = false);
 
 // Callers of these functions should ensure clean layout by themselves and then
 // switch to the proper versions (to be introduced).
 CORE_EXPORT VisibleSelection
 createVisibleSelectionDeprecated(const Position&,
                                  TextAffinity,
-                                 bool isDirectional = false);
+                                 bool isDirectional = false,
+                                 bool isHandleVisible = false);
 CORE_EXPORT VisibleSelection
 createVisibleSelectionDeprecated(const Position& base,
                                  const Position& extent,
                                  TextAffinity = SelDefaultAffinity,
-                                 bool isDirectional = false);
+                                 bool isDirectional = false,
+                                 bool isHandleVisible = false);
 CORE_EXPORT VisibleSelection
 createVisibleSelectionDeprecated(const EphemeralRange&,
                                  TextAffinity = SelDefaultAffinity,
-                                 bool isDirectional = false);
+                                 bool isDirectional = false,
+                                 bool isHandleVisible = false);
 CORE_EXPORT VisibleSelection
 createVisibleSelectionDeprecated(const VisiblePosition&,
-                                 bool isDirectional = false);
+                                 bool isDirectional = false,
+                                 bool isHandleVisible = false);
 CORE_EXPORT VisibleSelection
 createVisibleSelectionDeprecated(const VisiblePosition&,
                                  const VisiblePosition&,
-                                 bool isDirectional = false);
+                                 bool isDirectional = false,
+                                 bool isHandleVisible = false);
 CORE_EXPORT VisibleSelection
 createVisibleSelectionDeprecated(const PositionWithAffinity&,
-                                 bool isDirectional = false);
+                                 bool isDirectional = false,
+                                 bool isHandleVisible = false);
 
 CORE_EXPORT VisibleSelectionInFlatTree
 createVisibleSelectionDeprecated(const PositionInFlatTree&,
                                  TextAffinity,
-                                 bool isDirectional = false);
+                                 bool isDirectional = false,
+                                 bool isHandleVisible = false);
 CORE_EXPORT VisibleSelectionInFlatTree
 createVisibleSelectionDeprecated(const PositionInFlatTree& base,
                                  const PositionInFlatTree& extent,
                                  TextAffinity = SelDefaultAffinity,
-                                 bool isDirectional = false);
+                                 bool isDirectional = false,
+                                 bool isHandleVisible = false);
 CORE_EXPORT VisibleSelectionInFlatTree
 createVisibleSelectionDeprecated(const EphemeralRangeInFlatTree&,
                                  TextAffinity = SelDefaultAffinity,
-                                 bool isDirectional = false);
+                                 bool isDirectional = false,
+                                 bool isHandleVisible = false);
 CORE_EXPORT VisibleSelectionInFlatTree
 createVisibleSelectionDeprecated(const VisiblePositionInFlatTree&,
-                                 bool isDirectional = false);
+                                 bool isDirectional = false,
+                                 bool isHandleVisible = false);
 CORE_EXPORT VisibleSelectionInFlatTree
 createVisibleSelectionDeprecated(const VisiblePositionInFlatTree&,
                                  const VisiblePositionInFlatTree&,
-                                 bool isDirectional = false);
+                                 bool isDirectional = false,
+                                 bool isHandleVisible = false);
 CORE_EXPORT VisibleSelectionInFlatTree
 createVisibleSelectionDeprecated(const PositionInFlatTreeWithAffinity&,
-                                 bool isDirectional = false);
+                                 bool isDirectional = false,
+                                 bool isHandleVisible = false);
 
 // We don't yet support multi-range selections, so we only ever have one range
 // to return.
 CORE_EXPORT EphemeralRange firstEphemeralRangeOf(const VisibleSelection&);
 
 // TODO(sof): move more firstRangeOf() uses to be over EphemeralRange instead.
 CORE_EXPORT Range* firstRangeOf(const VisibleSelection&);
 
 CORE_EXPORT std::ostream& operator<<(std::ostream&, const VisibleSelection&);
 CORE_EXPORT std::ostream& operator<<(std::ostream&,
                                      const VisibleSelectionInFlatTree&);
 
 }  // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::VisibleSelection&);
 void showTree(const blink::VisibleSelection*);
 void showTree(const blink::VisibleSelectionInFlatTree&);
 void showTree(const blink::VisibleSelectionInFlatTree*);
 #endif
 
 #endif  // VisibleSelection_h