Revert of Reformat comments in core/layout up until LayoutBox

third_party/WebKit/Source/core/layout/CounterNode.cpp

 /*
  * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 24 matching lines @@
       m_countInParent(0),
       m_owner(o),
       m_rootLayoutObject(nullptr),
       m_parent(nullptr),
       m_previousSibling(nullptr),
       m_nextSibling(nullptr),
       m_firstChild(nullptr),
       m_lastChild(nullptr) {}
 
 CounterNode::~CounterNode() {
-  // Ideally this would be an assert and this would never be reached. In reality
-  // this happens a lot so we need to handle these cases. The node is still
-  // connected to the tree so we need to detach it.
+  // Ideally this would be an assert and this would never be reached. In reality this happens a lot
+  // so we need to handle these cases. The node is still connected to the tree so we need to detach it.
   if (m_parent || m_previousSibling || m_nextSibling || m_firstChild ||
       m_lastChild) {
     CounterNode* oldParent = nullptr;
     CounterNode* oldPreviousSibling = nullptr;
-    // Instead of calling removeChild() we do this safely as the tree is likely
-    // broken if we get here.
+    // Instead of calling removeChild() we do this safely as the tree is likely broken if we get here.
     if (m_parent) {
       if (m_parent->m_firstChild == this)
         m_parent->m_firstChild = m_nextSibling;
       if (m_parent->m_lastChild == this)
         m_parent->m_lastChild = m_previousSibling;
       oldParent = m_parent;
       m_parent = nullptr;
     }
     if (m_previousSibling) {
       if (m_previousSibling->m_nextSibling == this)
@@ skipping 133 matching lines @@
       value->m_nextForSameCounter = nullptr;
       value->m_counterNode = nullptr;
       return;
     }
     previous = iterator;
   }
   ASSERT_NOT_REACHED();
 }
 
 void CounterNode::resetLayoutObjects() {
-  while (m_rootLayoutObject) {
-    // This makes m_rootLayoutObject point to the next layoutObject if any since
-    // it disconnects the m_rootLayoutObject from this.
-    m_rootLayoutObject->invalidate();
-  }
+  while (m_rootLayoutObject)
+    m_rootLayoutObject
+        ->invalidate();  // This makes m_rootLayoutObject point to the next layoutObject if any since it disconnects the m_rootLayoutObject from this.
 }
 
 void CounterNode::resetThisAndDescendantsLayoutObjects() {
   CounterNode* node = this;
   do {
     node->resetLayoutObjects();
     node = node->nextInPreOrder(this);
   } while (node);
 }
 
 void CounterNode::recount() {
   for (CounterNode* node = this; node; node = node->m_nextSibling) {
     int oldCount = node->m_countInParent;
     int newCount = node->computeCountInParent();
     if (oldCount == newCount)
       break;
     node->m_countInParent = newCount;
     node->resetThisAndDescendantsLayoutObjects();
   }
 }
 
 void CounterNode::insertAfter(CounterNode* newChild,
                               CounterNode* refChild,
                               const AtomicString& identifier) {
   ASSERT(newChild);
   ASSERT(!newChild->m_parent);
   ASSERT(!newChild->m_previousSibling);
   ASSERT(!newChild->m_nextSibling);
-  // If the refChild is not our child we can not complete the request. This
-  // hardens against bugs in LayoutCounter.
-  // When layoutObjects are reparented it may request that we insert counter
-  // nodes improperly.
+  // If the refChild is not our child we can not complete the request. This hardens against bugs in LayoutCounter.
+  // When layoutObjects are reparented it may request that we insert counter nodes improperly.
   if (refChild && refChild->m_parent != this)
     return;
 
   if (newChild->m_hasResetType) {
     while (m_lastChild != refChild)
       LayoutCounter::destroyCounterNode(m_lastChild->owner(), identifier);
   }
 
   CounterNode* next;
 
@@ skipping 18 matching lines @@
   }
 
   if (!newChild->m_firstChild || newChild->m_hasResetType) {
     newChild->m_countInParent = newChild->computeCountInParent();
     newChild->resetThisAndDescendantsLayoutObjects();
     if (next)
       next->recount();
     return;
   }
 
-  // The code below handles the case when a formerly root increment counter is
-  // loosing its root position and therefore its children become next siblings.
+  // The code below handles the case when a formerly root increment counter is loosing its root position
+  // and therefore its children become next siblings.
   CounterNode* last = newChild->m_lastChild;
   CounterNode* first = newChild->m_firstChild;
 
   if (first) {
     ASSERT(last);
     newChild->m_nextSibling = first;
     if (m_lastChild == newChild)
       m_lastChild = last;
 
     first->m_previousSibling = newChild;
 
-    // The case when the original next sibling of the inserted node becomes a
-    // child of one of the former children of the inserted node is not handled
-    // as it is believed to be impossible since:
-    // 1. if the increment counter node lost it's root position as a result of
-    //    another counter node being created, it will be inserted as the last
-    //    child so next is null.
-    // 2. if the increment counter node lost it's root position as a result of a
-    //    layoutObject being inserted into the document's layout tree, all its
-    //    former children counters are attached to children of the inserted
-    //    layoutObject and hence cannot be in scope for counter nodes attached
-    // to layoutObjects that were already in the document's layout tree.
+    // The case when the original next sibling of the inserted node becomes a child of
+    // one of the former children of the inserted node is not handled as it is believed
+    // to be impossible since:
+    // 1. if the increment counter node lost it's root position as a result of another
+    //    counter node being created, it will be inserted as the last child so next is null.
+    // 2. if the increment counter node lost it's root position as a result of a layoutObject being
+    //    inserted into the document's layout tree, all its former children counters are attached
+    //    to children of the inserted layoutObject and hence cannot be in scope for counter nodes
+    //    attached to layoutObjects that were already in the document's layout tree.
     last->m_nextSibling = next;
     if (next) {
       ASSERT(next->m_previousSibling == newChild);
       next->m_previousSibling = last;
     } else {
       m_lastChild = last;
     }
     for (next = first;; next = next->m_nextSibling) {
       next->m_parent = this;
       if (last == next)
@@ skipping 66 matching lines @@
 #ifndef NDEBUG
 
 void showCounterTree(const blink::CounterNode* counter) {
   if (counter)
     showTreeAndMark(counter);
   else
     fprintf(stderr, "Cannot showCounterTree for (nil).\n");
 }
 
 #endif