Cleanup - Get rid of unnecessary local variables.

Source/core/editing/ApplyStyleCommand.cpp

 /*
  * Copyright (C) 2005, 2006, 2008, 2009 Apple 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 378 matching lines @@
             continue;
         }
         lastStyledNode = node;
 
         RefPtr<MutableStylePropertySet> inlineStyle = copyStyleOrCreateEmpty(element->inlineStyle());
         float currentFontSize = computedFontSize(node);
         float desiredFontSize = max(MinimumFontSize, startingFontSizes.get(node) + style->fontSizeDelta());
         RefPtr<CSSValue> value = inlineStyle->getPropertyCSSValue(CSSPropertyFontSize);
         if (value) {
             element->removeInlineStyleProperty(CSSPropertyFontSize);
-            currentFontSize = computedFontSize(node);

[vanihegde, 2014/01/06 09:01:37]

computedFontSize() is already done at line 394.

[ojan, 2014/01/06 18:55:41]

Doesn't the line above this invalidate the computedFontSize from before?

[vanihegde, 2014/01/07 08:30:46]

Yes, it does. Sorry I missed it!

         }
         if (currentFontSize != desiredFontSize) {
             inlineStyle->setProperty(CSSPropertyFontSize, cssValuePool().createValue(desiredFontSize, CSSPrimitiveValue::CSS_PX), false);
             setNodeAttribute(element.get(), styleAttr, AtomicString(inlineStyle->asText()));
         }
         if (inlineStyle->isEmpty()) {
             removeNodeAttribute(element.get(), styleAttr);
             if (isSpanWithoutAttributesOrUnstyledStyleSpan(element.get()))
                 unstyledSpans.append(element.release());
         }
@@ skipping 79 matching lines @@
     }
     return unsplitAncestor;
 }
 
 void ApplyStyleCommand::removeEmbeddingUpToEnclosingBlock(Node* node, Node* unsplitAncestor)
 {
     Node* block = enclosingBlock(node);
     if (!block)
         return;
 
-    Node* parent = 0;
-    for (Node* n = node->parentNode(); n != block && n != unsplitAncestor; n = parent) {
-        parent = n->parentNode();
+    for (Node* n = node->parentNode(); n != block && n != unsplitAncestor; n = n->parentNode()) {
         if (!n->isStyledElement())
             continue;
 
         Element* element = toElement(n);
         int unicodeBidi = getIdentifierValue(CSSComputedStyleDeclaration::create(element).get(), CSSPropertyUnicodeBidi);
         if (!unicodeBidi || unicodeBidi == CSSValueNormal)
             continue;
 
         // FIXME: This code should really consider the mapped attribute 'dir', the inline style declaration,
         // and all matching style rules in order to determine how to best set the unicode-bidi property to 'normal'.
@@ skipping 176 matching lines @@
     // if they want style applied to the empty line.
     if (start == end && start.deprecatedNode()->hasTagName(brTag))
         pastEndNode = NodeTraversal::next(*start.deprecatedNode());
 
     // Start from the highest fully selected ancestor so that we can modify the fully selected node.
     // e.g. When applying font-size: large on <font color="blue">hello</font>, we need to include the font element in our run
     // to generate <font color="blue" size="4">hello</font> instead of <font color="blue"><font size="4">hello</font></font>
     RefPtr<Range> range = Range::create(startNode->document(), start, end);
     Element* editableRoot = startNode->rootEditableElement();
     if (startNode != editableRoot) {
-        while (editableRoot && startNode->parentNode() != editableRoot && isNodeVisiblyContainedWithin(startNode->parentNode(), range.get()))
-            startNode = startNode->parentNode();
+        Node* parentNode = startNode->parentNode();

[ojan, 2014/01/06 18:55:41]

I'm not sure this code is any cleaner and I'd be surprised if this performed any
differently.

[vanihegde, 2014/01/07 08:30:46]

Reverting.

+        while (editableRoot && parentNode != editableRoot && isNodeVisiblyContainedWithin(parentNode, range.get())) {
+            startNode = parentNode;
+            parentNode = startNode->parentNode();
+        }
     }
 
     applyInlineStyleToNodeRange(style, startNode, pastEndNode);
 }
 
 static bool containsNonEditableRegion(Node& node)
 {
     if (!node.rendererIsEditable())
         return true;
 
@@ skipping 616 matching lines @@
     }
 
     return false;
 }
 
 void ApplyStyleCommand::surroundNodeRangeWithElement(PassRefPtr<Node> passedStartNode, PassRefPtr<Node> endNode, PassRefPtr<Element> elementToInsert)
 {
     ASSERT(passedStartNode);
     ASSERT(endNode);
     ASSERT(elementToInsert);
-    RefPtr<Node> startNode = passedStartNode;
+    RefPtr<Node> node = passedStartNode;
     RefPtr<Element> element = elementToInsert;
 
-    insertNodeBefore(element, startNode);
+    insertNodeBefore(element, node);
 
-    RefPtr<Node> node = startNode;
     while (node) {
         RefPtr<Node> next = node->nextSibling();
         if (node->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable)) {
             removeNode(node);
             appendNode(node, element);
         }
         if (node == endNode)
             break;
         node = next;
     }
@@ skipping 191 matching lines @@
         String textToMove = nextText->data();
         insertTextIntoNode(childText, childText->length(), textToMove);
         removeNode(next);
         // don't move child node pointer. it may want to merge with more text nodes.
     }
 
     updateStartEnd(newStart, newEnd);
 }
 
 }