Element::recalcStyle() overly reattach()-es InsertionPoints.

Source/core/dom/Text.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
  *
@@ skipping 258 matching lines @@
 
     return new (arena) RenderText(this, dataImpl());
 }
 
 void Text::attach(const AttachContext& context)
 {
     createTextRendererIfNeeded();
     CharacterData::attach(context);
 }
 
+class ClearNeedsStyleRecalcScope {
+public:
+    ClearNeedsStyleRecalcScope(Node* node) : m_node(node) { }
+    ~ClearNeedsStyleRecalcScope() { m_node->clearNeedsStyleRecalc(); }

[esprehn, 2013/06/14 08:32:29]

I'd prefer you just put the clearNeedsStyleRecalc() calls in the function
itself.

[Hajime Morrita, 2013/06/14 09:59:14]

Done.

+private:
+    Node* m_node;
+};
+
 void Text::recalcTextStyle(StyleChange change)

[esprehn, 2013/06/14 08:32:29]

I don't understand why you changed this function, your new code appears to do
the exact same thing.

[Hajime Morrita, 2013/06/14 09:59:14]

There is a case there change == NoChange but needsStyleRecalc() is true.
The old code doesn't ask to the resolver in that case. New code does.

 {
+    ClearNeedsStyleRecalcScope scope(this);
     RenderText* renderer = toRenderText(this->renderer());
 
-    if (change != NoChange && renderer)
-        renderer->setStyle(document()->styleResolver()->styleForText(this));
+    if (!renderer) {
+        if (needsStyleRecalc())
+            reattach();
+        return;
+    }
 
     if (needsStyleRecalc()) {
-        if (renderer)
-            renderer->setText(dataImpl());
-        else
-            reattach();
+        renderer->setStyle(document()->styleResolver()->styleForText(this));
+        renderer->setText(dataImpl());
+        return;

[esprehn, 2013/06/14 08:32:29]

Remove this return and make the below if () an else if and then you can put the
clearNeedsStyleRecalc() call as the last line of the function.

[Hajime Morrita, 2013/06/14 09:59:14]

Done.

     }
-    clearNeedsStyleRecalc();
+
+    if (change != NoChange)
+        renderer->setStyle(document()->styleResolver()->styleForText(this));
 }
 
 void Text::updateTextRenderer(unsigned offsetOfReplacedData, unsigned lengthOfReplacedData)
 {
     if (!attached())
         return;
     RenderText* textRenderer = toRenderText(renderer());
     if (!textRenderer || !textRendererIsNeeded(NodeRenderingContext(this, textRenderer->style()))) {
         reattach();
         return;
@@ skipping 38 matching lines @@
             result.appendLiteral("; ");
         result.appendLiteral("value=");
         result.append(s);
     }
 
     strncpy(buffer, result.toString().utf8().data(), length - 1);
 }
 #endif
 
 } // namespace WebCore