Make FormatBlockCommand::elementForFormatBlockCommand() to take EphemeralRange

third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Igalia S.L.
  *
  * 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.
@@ skipping 2058 matching lines @@
 static String valueForeColor(LocalFrame& frame, Event*) {
   return valueStyle(frame, CSSPropertyColor);
 }
 
 static String valueFormatBlock(LocalFrame& frame, Event*) {
   const VisibleSelection& selection =
       frame.selection().computeVisibleSelectionInDOMTreeDeprecated();
   if (!selection.isNonOrphanedCaretOrRange() || !selection.isContentEditable())
     return "";
   Element* formatBlockElement =
-      FormatBlockCommand::elementForFormatBlockCommand(firstRangeOf(selection));

[Xiaocheng, 2017/03/02 20:21:05]

This patch has conflict with https://codereview.chromium.org/2724333002.

Could you make this patch a dependant of that one?

[yosin_UTC9, 2017/03/09 05:18:40]

The patch is committed. There is no conflict anymore.

+      FormatBlockCommand::elementForFormatBlockCommand(
+          firstEphemeralRangeOf(selection));
   if (!formatBlockElement)
     return "";
   return formatBlockElement->localName();
 }
 
 // Map of functions
 
 static const EditorInternalCommand* internalCommand(const String& commandName) {
   static const EditorInternalCommand kEditorCommands[] = {
       // Lists all commands in blink::WebEditingCommandType.
@@ skipping 661 matching lines @@
           *m_frame, DirectionBackward, WordGranularity);
     case WebEditingCommandType::DeleteWordForward:
       return RangesFromCurrentSelectionOrExtendCaret(*m_frame, DirectionForward,
                                                      WordGranularity);
     default:
       return targetRangesForInputEvent(*target);
   }
 }
 
 }  // namespace blink