[InputEvent] Change |InputEventInit::sequence<Range> ranges| to |sequence<StaticRange> targetRanges|

third_party/WebKit/Source/core/events/InputEvent.cpp

Index: third_party/WebKit/Source/core/events/InputEvent.cpp
diff --git a/third_party/WebKit/Source/core/events/InputEvent.cpp b/third_party/WebKit/Source/core/events/InputEvent.cpp
index fec9334fad3e0526d8c20d5d791fa3d43e4592d7..5baa48237a192e6a23f35ca57035be611b7f18d6 100644
--- a/third_party/WebKit/Source/core/events/InputEvent.cpp
+++ b/third_party/WebKit/Source/core/events/InputEvent.cpp
@@ -93,8 +93,11 @@ InputEvent::InputEvent(const AtomicString& type,
     m_dataTransfer = initializer.dataTransfer();
   if (initializer.hasIsComposing())
     m_isComposing = initializer.isComposing();
-  if (initializer.hasRanges())
-    m_ranges = initializer.ranges();
+  if (initializer.hasTargetRanges()) {

[yosin_UTC9, 2017/02/24 06:37:14]

Prefer early return style.

if (!initializer.hasTargetRanges())
  return;

[chongz, 2017/02/24 21:19:15]

Done.

+    m_ranges.clear();

[yosin_UTC9, 2017/02/24 06:37:14]

It seems noboday add elements to |m_ranges| since this function is constructor.

[chongz, 2017/02/24 21:19:15]

Removed.

+    for (const auto& range : initializer.targetRanges())

[yosin_UTC9, 2017/02/24 06:37:14]

Can we do |m_ranges = initializer.targetRanges()|?

[chongz, 2017/02/24 21:19:15]

|initializer.targetRanges()| is of type |HeapVector<Member<StaticRange>>|, and
|m_ranges| is of type |HeapVector<Member<Range>>|.

I'm not sure but do we have some magic conversion utilities for vectors?

[yosin_UTC9, 2017/02/27 10:31:46]

No.

+      m_ranges.push_back(range->toRange());

[yosin_UTC9, 2017/02/24 06:37:14]

nit: s/push_back/emplace_back/

+  }
 }
 
 /* static */
@@ -102,7 +105,7 @@ InputEvent* InputEvent::createBeforeInput(InputType inputType,
                                           const String& data,
                                           EventCancelable cancelable,
                                           EventIsComposing isComposing,
-                                          const RangeVector* ranges) {
+                                          const StaticRangeVector* ranges) {
   InputEventInit inputEventInit;
 
   inputEventInit.setBubbles(true);
@@ -114,7 +117,7 @@ InputEvent* InputEvent::createBeforeInput(InputType inputType,
   inputEventInit.setData(data);
   inputEventInit.setIsComposing(isComposing == IsComposing);
   if (ranges)
-    inputEventInit.setRanges(*ranges);
+    inputEventInit.setTargetRanges(*ranges);
   inputEventInit.setComposed(true);
   return InputEvent::create(EventTypeNames::beforeinput, inputEventInit);
 }
@@ -124,7 +127,7 @@ InputEvent* InputEvent::createBeforeInput(InputType inputType,
                                           DataTransfer* dataTransfer,
                                           EventCancelable cancelable,
                                           EventIsComposing isComposing,
-                                          const RangeVector* ranges) {
+                                          const StaticRangeVector* ranges) {
   InputEventInit inputEventInit;
 
   inputEventInit.setBubbles(true);
@@ -133,7 +136,7 @@ InputEvent* InputEvent::createBeforeInput(InputType inputType,
   inputEventInit.setDataTransfer(dataTransfer);
   inputEventInit.setIsComposing(isComposing == IsComposing);
   if (ranges)
-    inputEventInit.setRanges(*ranges);
+    inputEventInit.setTargetRanges(*ranges);
   inputEventInit.setComposed(true);
   return InputEvent::create(EventTypeNames::beforeinput, inputEventInit);
 }
@@ -142,7 +145,7 @@ InputEvent* InputEvent::createBeforeInput(InputType inputType,
 InputEvent* InputEvent::createInput(InputType inputType,
                                     const String& data,
                                     EventIsComposing isComposing,
-                                    const RangeVector* ranges) {
+                                    const StaticRangeVector* ranges) {
   InputEventInit inputEventInit;
 
   inputEventInit.setBubbles(true);
@@ -154,7 +157,7 @@ InputEvent* InputEvent::createInput(InputType inputType,
   inputEventInit.setData(data);
   inputEventInit.setIsComposing(isComposing == IsComposing);
   if (ranges)
-    inputEventInit.setRanges(*ranges);
+    inputEventInit.setTargetRanges(*ranges);
   inputEventInit.setComposed(true);
   return InputEvent::create(EventTypeNames::input, inputEventInit);
 }
@@ -166,9 +169,7 @@ String InputEvent::inputType() const {
 StaticRangeVector InputEvent::getTargetRanges() const {
   StaticRangeVector staticRanges;
   for (const auto& range : m_ranges)
-    staticRanges.push_back(StaticRange::create(
-        range->ownerDocument(), range->startContainer(), range->startOffset(),
-        range->endContainer(), range->endOffset()));
+    staticRanges.push_back(StaticRange::create(range));

[yosin_UTC9, 2017/02/24 06:37:14]

nit: s/push_back/emplace_back/

   return staticRanges;
 }