Avoid style clobbering in setCompositionFromExistingText. (2nd land)

Source/core/editing/InputMethodController.h

 /*
  * Copyright (C) 2006, 2007, 2008 Apple 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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef InputMethodController_h
 #define InputMethodController_h
 
 #include "core/CoreExport.h"
+#include "core/dom/Range.h"
 #include "core/editing/CompositionUnderline.h"
 #include "core/editing/EphemeralRange.h"
 #include "core/editing/PlainTextRange.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class Editor;
 class LocalFrame;
@@ skipping 26 matching lines @@
     // Inserts the text that is being composed or specified non-empty text and
     // returns true.
     bool confirmCompositionOrInsertText(const String& text, ConfirmCompositionBehavior);
     // Deletes the existing composition text.
     void cancelComposition();
     void cancelCompositionIfSelectionIsInvalid();
     EphemeralRange compositionEphemeralRange() const;
     PassRefPtrWillBeRawPtr<Range> compositionRange() const;
 
     // getting international text input composition state (for use by InlineTextBox)
-    Text* compositionNode() const { return m_compositionNode.get(); }
-    unsigned compositionStart() const { return m_compositionStart; }
-    unsigned compositionEnd() const { return m_compositionEnd; }
-    bool compositionUsesCustomUnderlines() const { return !m_customCompositionUnderlines.isEmpty(); }
-    const Vector<CompositionUnderline>& customCompositionUnderlines() const { return m_customCompositionUnderlines; }
+    bool isCompositionNode(const Node*);
+    unsigned compositionStart() const { return m_compositionRange.get() ? m_compositionRange->startOffset() : 0; }
+    unsigned compositionEnd() const { return m_compositionRange.get() ? m_compositionRange->endOffset() : 0; }
+    bool compositionUsesCustomUnderlines() const { return !m_customCompositionUnderlines.empty(); }
+    // TODO: This method is called only by WebViewImpl::compositionUnderlines().

[yosin_UTC9, 2015/08/31 01:35:40]

nit: s/TODO/TODO(aelias)/

+    // WebViewImpl::compositionUnderlines() is called only by tests.
+    // Underlines are associated with a specific node, and composition
+    // region can cover multiple nodes now. This method does not really
+    // make sense since it does not specify a node explicitly. To be
+    // compatible with current tests this method just returns the underlines
+    // for the start node. This method and WebViewImpl::compositionUnderlines()
+    // should be removed once we re-write relevant tests.
+    const Vector<CompositionUnderline>& customCompositionUnderlines() const;
+    const Vector<CompositionUnderline>* customCompositionUnderlines(const Node*) const;
 
     void clear();
 
     PlainTextRange getSelectionOffsets() const;
     // Returns true if setting selection to specified offsets, otherwise false.
     bool setEditableSelectionOffsets(const PlainTextRange&);
     void extendSelectionAndDelete(int before, int after);
 
 private:
     class SelectionOffsetsScope {
         WTF_MAKE_NONCOPYABLE(SelectionOffsetsScope);
         STACK_ALLOCATED();
     public:
         explicit SelectionOffsetsScope(InputMethodController*);
         ~SelectionOffsetsScope();
     private:
         RawPtrWillBeMember<InputMethodController> m_inputMethodController;
         const PlainTextRange m_offsets;
     };
     friend class SelectionOffsetsScope;
 
     RawPtrWillBeMember<LocalFrame> m_frame;
-    RefPtrWillBeMember<Text> m_compositionNode;
-    // We don't use PlainTextRange which is immutable, for composition range.
-    unsigned m_compositionStart;
-    unsigned m_compositionEnd;
-    // startOffset and endOffset of CompositionUnderline are based on
-    // m_compositionNode.
-    Vector<CompositionUnderline> m_customCompositionUnderlines;
+    RefPtrWillBeMember<Range> m_compositionRange;
+    typedef std::map<const Node*, std::pair<RefPtrWillBeMember<Node>, Vector<CompositionUnderline>>> NodeUnderlinesMap;

[yosin_UTC9, 2015/08/31 01:35:40]

nit: We should use WTF::HashMap. Both, key(const Node*) and value 
|std::pair<...>| should be collectable.

[yosin_UTC9, 2015/08/31 01:35:40]

I think we should have struct with DEFINE_TRACE() instead of std::pair<>

+    mutable NodeUnderlinesMap m_customCompositionUnderlines;
+    bool m_isExistingText;
 
     explicit InputMethodController(LocalFrame&);
 
     Editor& editor() const;
     LocalFrame& frame() const
     {
         ASSERT(m_frame);
         return *m_frame;
     }
 
     bool insertTextForConfirmedComposition(const String& text);
     void selectComposition() const;
     enum FinishCompositionMode { ConfirmComposition, CancelComposition };
     // Returns true if composition exists.
     bool finishComposition(const String&, FinishCompositionMode);
     bool setSelectionOffsets(const PlainTextRange&);
 };
 
 } // namespace blink
 
 #endif // InputMethodController_h