Fix InputConnection.deleteSurroundingText()

third_party/WebKit/Source/core/editing/InputMethodController.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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
@@ skipping 850 matching lines @@
   } while (frame().selection().start() == frame().selection().end() &&
            before <= static_cast<int>(selectionOffsets.start()));
   // TODO(chongz): Find a way to distinguish Forward and Backward.
   dispatchBeforeInputEditorCommand(
       m_frame->document()->focusedElement(),
       InputEvent::InputType::DeleteContentBackward,
       new RangeVector(1, m_frame->selection().firstRange()));
   TypingCommand::deleteSelection(*frame().document());
 }
 
+// TODO(yabinh): We should reduce the number of selectionchange events.
+void InputMethodController::deleteSurroundingText(int before, int after) {
+  if (!editor().canEdit())
+    return;
+  PlainTextRange selectionOffsets(getSelectionOffsets());

[yosin_UTC9, 2016/10/13 03:40:10]

s/PlainTextRange/const PlainTextRange/

[yabinh, 2016/10/13 05:08:23]

Done.

+  if (selectionOffsets.isNull())
+    return;
+  Element* rootEditableElement = frame().selection().rootEditableElement();

[yosin_UTC9, 2016/10/13 03:40:10]

s/Element*/Element* const/

[yabinh, 2016/10/13 05:08:23]

Done.

+  if (!rootEditableElement)
+    return;
+  int selectionStart = static_cast<int>(selectionOffsets.start());
+  int selectionEnd = static_cast<int>(selectionOffsets.end());
+
+  // Select the text to be deleted before selectionStart.
+  if (before > 0 && selectionStart > 0) {
+    // In case of exceeding the left boundary.
+    const int start = std::max(selectionStart - before, 0);
+
+    const EphemeralRange& range =
+        PlainTextRange(0, start).createRange(*rootEditableElement);
+    if (range.isNull())
+      return;
+    const Position& position = range.endPosition();
+
+    // Adjust the start of selection for multi-code text(a grapheme cluster
+    // contains more than one code point). TODO(yabinh): Adjustment should be
+    // based on code point instead of grapheme cluster.
+    const size_t diff = computeDistanceToLeftGraphemeBoundary(position);
+    const int adjustedStart = start - static_cast<int>(diff);
+
+    if (!setSelectionOffsets(PlainTextRange(adjustedStart, selectionStart)))
+      return;
+    TypingCommand::deleteSelection(*frame().document());
+
+    selectionEnd = selectionEnd - (selectionStart - adjustedStart);
+    selectionStart = adjustedStart;
+  }
+
+  // Select the text to be deleted after selectionEnd.
+  if (after > 0) {
+    // Adjust the deleted range in case of exceeding the right boundary.
+    PlainTextRange range(0, selectionEnd + after);

[yosin_UTC9, 2016/10/13 03:40:10]

s/PlainTextRange/const PlainTextRange/

[yabinh, 2016/10/13 05:08:23]

Done.

+    if (range.isNull())
+      return;
+    const EphemeralRange& validRange = range.createRange(*rootEditableElement);
+    if (validRange.isNull())
+      return;
+    const int end =
+        PlainTextRange::create(*rootEditableElement, validRange).end();
+    const Position& position = validRange.endPosition();
+
+    // Adjust the end of selection for multi-code text. TODO(yabinh): Adjustment
+    // should be based on code point instead of grapheme cluster.
+    const size_t diff = computeDistanceToRightGraphemeBoundary(position);
+    const int adjustedEnd = end + static_cast<int>(diff);
+

[yosin_UTC9, 2016/10/13 03:40:10]

nit: Remove an extra blank line

[yabinh, 2016/10/13 05:08:23]

Done.

+    if (!setSelectionOffsets(PlainTextRange(selectionEnd, adjustedEnd)))
+      return;
+    TypingCommand::deleteSelection(*frame().document());
+  }
+
+  setSelectionOffsets(PlainTextRange(selectionStart, selectionEnd));
+}
+
 DEFINE_TRACE(InputMethodController) {
   visitor->trace(m_frame);
   visitor->trace(m_compositionRange);
 }
 
 }  // namespace blink