Make FormatBlockCommand::elementForFormatBlockCommand() to take EphemeralRange

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

 /*
  * Copyright (C) 2006 Apple Computer, 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
@@ skipping 121 matching lines @@
         toHTMLElement(nodeAfterInsertionPosition)->getAttribute(styleAttr));
 
   document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   if (wasEndOfParagraph &&
       !isEndOfParagraph(createVisiblePosition(lastParagraphInBlockNode)) &&
       !isStartOfParagraph(createVisiblePosition(lastParagraphInBlockNode)))
     insertBlockPlaceholder(lastParagraphInBlockNode, editingState);
 }
 
-Element* FormatBlockCommand::elementForFormatBlockCommand(Range* range) {
-  if (!range)
-    return 0;
-
-  Node* commonAncestor = range->commonAncestorContainer();
+Element* FormatBlockCommand::elementForFormatBlockCommand(
+    const EphemeralRange& range) {

[yoichio, 2017/03/02 09:21:36]

How about passing |selection| directly from caller and using
 selection.start/end().computeContainerNode() ?

[yosin_UTC9, 2017/03/02 10:05:43]

No, we don't want to increase usage of |VisibleSelection|.

+  Node* commonAncestor = Range::commonAncestorContainer(

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

How about waiting until https://codereview.chromium.org/2725603002 lands, and
then we can call |range.commonAncestorContainer()| directly?

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

Done.

+      range.startPosition().computeContainerNode(),
+      range.endPosition().computeContainerNode());
   while (commonAncestor && !isElementForFormatBlock(commonAncestor))
     commonAncestor = commonAncestor->parentNode();
 
   if (!commonAncestor)
     return 0;
 
-  Element* element = rootEditableElement(*range->startContainer());
+  Element* element =
+      rootEditableElement(*range.startPosition().computeContainerNode());
   if (!element || commonAncestor->contains(element))
     return 0;
 
   return commonAncestor->isElementNode() ? toElement(commonAncestor) : 0;
 }
 
 bool isElementForFormatBlock(const QualifiedName& tagName) {
   DEFINE_STATIC_LOCAL(
       HashSet<QualifiedName>, blockTags,
       ({
@@ skipping 18 matching lines @@
     if (isEnclosingBlock(&runner))
       lastBlock = &runner;
     if (isHTMLListElement(&runner))
       return hasEditableStyle(*runner.parentNode()) ? runner.parentNode()
                                                     : &runner;
   }
   return lastBlock;
 }
 
 }  // namespace blink