Revert 157422 "Remove lots of code related synchronously attaching"

Source/core/dom/Node.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 969 matching lines @@
             node->clearAttached();
             node->clearChildNeedsStyleRecalc();
 
             for (ShadowRoot* shadowRoot = node->youngestShadowRoot(); shadowRoot; shadowRoot = shadowRoot->olderShadowRoot())
                 detachNode(shadowRoot, context);
 
             node = NodeTraversal::next(node, root);
             continue;
         }
         // Handle normal reattaches from style recalc (ex. display type changes)
+        // or descendants of lazy attached nodes that got actually attached, for example,
+        // by innerHTML or editing.
+        // FIXME: innerHTML and editing should also lazyAttach.
         if (node->attached())
             node->detach(context);
         node = NodeTraversal::nextSkippingChildren(node, root);
     }
 }
 
 void Node::reattach(const AttachContext& context)
 {
+    ASSERT(document().inStyleRecalc());
     AttachContext reattachContext(context);
     reattachContext.performingReattach = true;
 
     detachNode(this, reattachContext);
     attach(reattachContext);
 }
 
 void Node::attach(const AttachContext&)
 {
-    ASSERT(document().inStyleRecalc());
     ASSERT(!attached());
     ASSERT(!renderer() || (renderer()->style() && (renderer()->parent() || renderer()->isRenderView())));
 
+    // If this node got a renderer it may be the previousRenderer() of sibling text nodes and thus affect the
+    // result of Text::textRendererIsNeeded() for those nodes.
+    // FIXME: This loop is no longer required once we lazy attach all the time.
+    if (renderer() && !document().inStyleRecalc()) {
+        for (Node* next = nextSibling(); next; next = next->nextSibling()) {
+            if (next->renderer())
+                break;
+            if (!next->attached())
+                break; // Assume this means none of the following siblings are attached.
+            if (!next->isTextNode())
+                continue;
+            ASSERT(!next->renderer());
+            toText(next)->reattach();
+            // If we again decided not to create a renderer for next, we can bail out the loop,
+            // because it won't affect the result of Text::textRendererIsNeeded() for the rest
+            // of sibling nodes.
+            if (!next->renderer())
+                break;
+        }
+    }
+
     setAttached();
     clearNeedsStyleRecalc();
 
     if (Document* doc = documentInternal()) {
         if (AXObjectCache* cache = doc->axObjectCache())
             cache->updateCacheAfterNodeIsAttached(this);
     }
 }
 
 #ifndef NDEBUG
@@ skipping 1658 matching lines @@
         node->showTreeForThis();
 }
 
 void showNodePath(const WebCore::Node* node)
 {
     if (node)
         node->showNodePathForThis();
 }
 
 #endif