Renamed Node::attach to Node::attachLayoutTree.

third_party/WebKit/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 325 matching lines @@
 {
     if (isSVGText(this))
         return new LayoutSVGInlineText(this, dataImpl());
 
     if (style.hasTextCombine())
         return new LayoutTextCombine(this, dataImpl());
 
     return new LayoutText(this, dataImpl());
 }
 
-void Text::attach(const AttachContext& context)
+void Text::attachLayoutTree(const AttachContext& context)
 {
     if (ContainerNode* layoutParent = LayoutTreeBuilderTraversal::parent(*this)) {
         if (LayoutObject* parentLayoutObject = layoutParent->layoutObject()) {
             if (textLayoutObjectIsNeeded(*parentLayoutObject->style(), *parentLayoutObject))
                 LayoutTreeBuilderForText(*this, parentLayoutObject).createLayoutObject();
         }
     }
-    CharacterData::attach(context);
+    CharacterData::attachLayoutTree(context);
 }
 
 void Text::reattachIfNeeded(const AttachContext& context)
 {
     bool layoutObjectIsNeeded = false;
     ContainerNode* layoutParent = LayoutTreeBuilderTraversal::parent(*this);
     if (layoutParent) {
         if (LayoutObject* parentLayoutObject = layoutParent->layoutObject()) {
             if (textLayoutObjectIsNeeded(*parentLayoutObject->style(), *parentLayoutObject))
                 layoutObjectIsNeeded = true;
         }
     }
 
     if (layoutObjectIsNeeded == !!layoutObject())
         return;
 
     // The following is almost the same as Node::reattach() except that we create a layoutObject only if needed.
     // Not calling reattach() to avoid repeated calls to Text::textLayoutObjectIsNeeded().
     AttachContext reattachContext(context);
     reattachContext.performingReattach = true;
 
     if (getStyleChangeType() < NeedsReattachStyleChange)
         detach(reattachContext);
     if (layoutObjectIsNeeded)
         LayoutTreeBuilderForText(*this, layoutParent->layoutObject()).createLayoutObject();
-    CharacterData::attach(reattachContext);
+    CharacterData::attachLayoutTree(reattachContext);
 }
 
 void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling)
 {
     if (LayoutTextItem layoutItem = LayoutTextItem(this->layoutObject())) {
         if (change != NoChange || needsStyleRecalc())
             layoutItem.setStyle(document().ensureStyleResolver().styleForText(this));
         if (needsStyleRecalc())
             layoutItem.setText(dataImpl());
         clearNeedsStyleRecalc();
@@ skipping 67 matching lines @@
             result.append("; ");
         result.append("value=");
         result.append(s);
     }
 
     strncpy(buffer, result.toString().utf8().data(), length - 1);
 }
 #endif
 
 } // namespace blink