| 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..79e69f8e7a1852c4a0f7d7e8619f4c84861e7833 100644
|
| --- a/third_party/WebKit/Source/core/events/InputEvent.cpp
|
| +++ b/third_party/WebKit/Source/core/events/InputEvent.cpp
|
| @@ -93,8 +93,10 @@ 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())
|
| + return;
|
| + for (const auto& range : initializer.targetRanges())
|
| + m_ranges.push_back(range->toRange());
|
| }
|
|
|
| /* static */
|
| @@ -102,7 +104,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 +116,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 +126,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 +135,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 +144,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 +156,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 +168,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));
|
| return staticRanges;
|
| }
|
|
|
|
|